- Devel - libvirt List Archives

[libvirt] [PATCH 7/8] virsh: support single quote
by Lai Jiangshan 13 Oct '10

13 Oct '10

Some use may type command like this at the virsh shell: virsh # somecmd 'some arg' because some users often use single quote in linux shell. Signed-off-by: Lai Jiangshan <laijs(a)cn.fujitsu.com> --- diff --git a/tools/virsh.c b/tools/virsh.c index b96071d..a5b438b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10213,6 +10213,7 @@ static int vshCommandArgvParse(vshControl *ctl, int nargs, char **argv) static int vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res) { + bool single_quote = false; bool double_quote = false; int sz = 0; char *p = parser->pos, *q; @@ -10232,14 +10233,23 @@ vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res) copy: while (*p) { /* end of token is blank space or ';' */ - if (!double_quote && (*p == ' ' || *p == '\t' || *p == ';')) + if (!double_quote && !single_quote + && (*p == ' ' || *p == '\t' || *p == ';')) break; - if (*p == '\\') { /* escape */ + if (!double_quote && *p == '\'') { /* single quote */ + single_quote = !single_quote; + p++; + continue; + } else if (!single_quote && *p == '\\') { /* escape */ + /* + * The same as the bash, a \ in "" is an escaper, + * but a \ in '' is not an escaper. + */ p++; if (*p == '\0') break; - } else if (*p == '"') { /* double quote */ + } else if (!single_quote && *p == '"') { /* double quote */ double_quote = !double_quote; p++; continue;

2 1

[libvirt] [PATCH 6/8] virsh: add escaper \ for command string parsing
by Lai Jiangshan 13 Oct '10

13 Oct '10

add escaper \ for command string parsing, example: virsh # cd /path/which/have/a/double\"quote Signed-off-by: Lai Jiangshan <laijs(a)cn.fujitsu.com> --- diff --git a/tools/virsh.c b/tools/virsh.c index 9fd0602..b96071d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10235,7 +10235,11 @@ copy: if (!double_quote && (*p == ' ' || *p == '\t' || *p == ';')) break; - if (*p == '"') { + if (*p == '\\') { /* escape */ + p++; + if (*p == '\0') + break; + } else if (*p == '"') { /* double quote */ double_quote = !double_quote; p++; continue;

2 1

[libvirt] [PATCH V3 0/8] virsh: rework command parsing
by Lai Jiangshan 13 Oct '10

13 Oct '10

Old virsh command parsing mashes all the args back into a string and miss the quotes, this patches fix it. It is also needed for introducing qemu-monitor-command which is very useful. This patches add vrshCommandParser abstraction to parser the args. For command string, we use vshCommandStringParse() For command argument vector, we use vshCommandArgvParse() And the usage was changed: old: virsh [options] [commands] new: virsh [options]... [<command_string>] virsh [options]... <command> [args...] So we still support commands like: # virsh "define D.xml; dumpxml D" "define D.xml; dumpxml D" was parsed as a commands-string. and support commands like: # virsh qemu-monitor-command f13guest "info cpus" we will not mash them into a string, we use new argv parser for it. But we don't support the command like: # virsh "define D.xml; dumpxml" D "define D.xml; dumpxml" was parsed as a command-name, but we have no such command-name. Misc changed behavior: 1) support single quote 2) support escape '\' 3) a better double quoting support, the following commands are now supported: virsh # dumpxml --"update-cpu" vm1 virsh # dumpxml --update-cpu vm"1" 4) better handling the boolean options, in old code the following commands are equivalent: virsh # dumpxml --update-cpu=vm1 virsh # dumpxml --update-cpu vm1 after this patch applied, the first one will become illegal. 5) support "--" The idea of this patch is from Daniel P. Berrange. changed from V1: changed the usage as Eric Blake suggested. changed from V2 new vrshCommandParser abstraction apply Eric Blake's comments. Signed-off-by: Lai Jiangshan <laijs(a)cn.fujitsu.com> --- virsh.c | 259 +++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 152 insertions(+), 107 deletions(-) --- I was preparing for linuxcon japan and attended it and took a long vacation after it, very late for V3.

3 4

[libvirt] [PATCH 3/8] virsh: better handling the boolean option
by Lai Jiangshan 13 Oct '10

13 Oct '10

in old code the following commands are equivalent: virsh # dumpxml --update-cpu=vm1 virsh # dumpxml --update-cpu vm1 because the old code split the option argument into 2 parts: --update-cpu=vm1 is split into update-cpu and vm1, and update-cpu is a boolean option, so the parser takes vm1 as another argument, very strange. after this patch applied, the first one will become illegal. To achieve this, we don't parse/check options when parsing command sting, but check options when parsing a command argument. And the argument is not split when parsing command sting. Signed-off-by: Lai Jiangshan <laijs(a)cn.fujitsu.com> --- diff --git a/tools/virsh.c b/tools/virsh.c index 1e95023..f97ee42 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10164,14 +10164,12 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) */ #define VSH_TK_ERROR -1 #define VSH_TK_NONE 0 -#define VSH_TK_OPTION 1 -#define VSH_TK_DATA 2 -#define VSH_TK_END 3 +#define VSH_TK_DATA 1 +#define VSH_TK_END 2 static int vshCommandGetToken(vshControl *ctl, char *str, char **end, char **res) { - int tk = VSH_TK_NONE; bool double_quote = false; int sz = 0; char *p = str, *q; @@ -10196,22 +10194,6 @@ copy: if (!double_quote && (*p == ' ' || *p == '\t' || *p == ';')) break; - /* end of option name could be '=' */ - if (tk == VSH_TK_OPTION && *p == '=') { - p++; /* skip '=' */ - break; - } - - if (tk == VSH_TK_NONE) { - if (*p == '-' && *(p + 1) == '-' && *(p + 2) - && c_isalnum(*(p + 2))) { - tk = VSH_TK_OPTION; - p += 2; - } else { - tk = VSH_TK_DATA; - } - } - if (*p == '"') { double_quote = !double_quote; p++; @@ -10237,7 +10219,7 @@ copy: *(*res + sz) = '\0'; *end = p; - return tk; + return VSH_TK_DATA; } static int @@ -10296,18 +10278,28 @@ vshCommandParse(vshControl *ctl, char *cmdstr) goto syntaxError; /* ... or ignore this command only? */ } VIR_FREE(tkdata); - } else if (tk == VSH_TK_OPTION) { - if (!(opt = vshCmddefGetOption(cmd, tkdata))) { + } else if (*tkdata == '-' && *(tkdata + 1) == '-' && *(tkdata + 2) + && c_isalnum(*(tkdata + 2))) { + char *optstr = strchr(tkdata + 2, '='); + if (optstr) { + *optstr = '\0'; /* conver the '=' to '\0' */ + optstr = vshStrdup(ctl, optstr + 1); + } + if (!(opt = vshCmddefGetOption(cmd, tkdata + 2))) { vshError(ctl, _("command '%s' doesn't support option --%s"), - cmd->name, tkdata); + cmd->name, tkdata + 2); + VIR_FREE(optstr); goto syntaxError; } - VIR_FREE(tkdata); /* option name */ + VIR_FREE(tkdata); if (opt->type != VSH_OT_BOOL) { /* option data */ - tk = vshCommandGetToken(ctl, str, &end, &tkdata); + if (optstr) + tkdata = optstr; + else + tk = vshCommandGetToken(ctl, str, &end, &tkdata); str = end; if (tk == VSH_TK_ERROR) goto syntaxError; @@ -10319,6 +10311,14 @@ vshCommandParse(vshControl *ctl, char *cmdstr) VSH_OT_INT ? _("number") : _("string")); goto syntaxError; } + } else { + tkdata = NULL; + if (optstr) { + vshError(ctl, _("invalid '=' after option --%s"), + opt->name); + VIR_FREE(optstr); + goto syntaxError; + } } } else if (tk == VSH_TK_DATA) { if (!(opt = vshCmddefGetData(cmd, data_ct++))) { @@ -10344,8 +10344,8 @@ vshCommandParse(vshControl *ctl, char *cmdstr) vshDebug(ctl, 4, "%s: %s(%s): %s\n", cmd->name, opt->name, - tk == VSH_TK_OPTION ? _("OPTION") : _("DATA"), - arg->data); + opt->type != VSH_OT_BOOL ? _("optdata") : _("bool"), + opt->type != VSH_OT_BOOL ? arg->data : _("(none)")); } if (!str) break;

2 1

[libvirt] [PATCH 2/8] virsh: allow zero length arguments
by Lai Jiangshan 13 Oct '10

13 Oct '10

the following command is allowed at shell, we also make it allowed at virsh shel. # somecmd "" Signed-off-by: Lai Jiangshan <laijs(a)cn.fujitsu.com> --- diff --git a/tools/virsh.c b/tools/virsh.c index 7b6f2b6..1e95023 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10175,7 +10175,6 @@ vshCommandGetToken(vshControl *ctl, char *str, char **end, char **res) bool double_quote = false; int sz = 0; char *p = str, *q; - char *tkstr = NULL; *end = NULL; @@ -10211,7 +10210,6 @@ copy: } else { tk = VSH_TK_DATA; } - tkstr = p; /* begin of token */ } if (*p == '"') { @@ -10229,10 +10227,6 @@ copy: vshError(ctl, "%s", _("missing \"")); return VSH_TK_ERROR; } - if (tkstr == NULL || *tkstr == '\0' || p == NULL) - return VSH_TK_END; - if (sz == 0) - return VSH_TK_END; if (!*res) { *res = vshMalloc(ctl, sz + 1);

2 1

[libvirt] [PATCH] cpu: Remove redundant features
by Jiri Denemark 13 Oct '10

13 Oct '10

Some features provided by the recently added CPU models were mentioned twice for each model. This was a result of automatic generation of the XML from qemu's CPU configuration file without noticing this redundancy. --- src/cpu/cpu_map.xml | 84 --------------------------------------------------- 1 files changed, 0 insertions(+), 84 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 986c61d..edbb21c 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -357,284 +357,200 @@ <model name='Conroe'> <vendor>Intel</vendor> <feature name='sse2'/> <feature name='sse'/> <feature name='fxsr'/> <feature name='mmx'/> <feature name='pat'/> <feature name='cmov'/> <feature name='pge'/> <feature name='sep'/> <feature name='apic'/> <feature name='cx8'/> <feature name='mce'/> <feature name='pae'/> <feature name='msr'/> <feature name='tsc'/> <feature name='pse'/> <feature name='de'/> <feature name='fpu'/> <feature name='mtrr'/> <feature name='clflush'/> <feature name='mca'/> <feature name='pse36'/> <feature name='pni'/> <feature name='ssse3'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> <feature name='lm'/> <feature name='syscall'/> <feature name='nx'/> <feature name='lahf_lm'/> </model> <model name='Penryn'> <vendor>Intel</vendor> <feature name='sse2'/> <feature name='sse'/> <feature name='fxsr'/> <feature name='mmx'/> <feature name='pat'/> <feature name='cmov'/> <feature name='pge'/> <feature name='sep'/> <feature name='apic'/> <feature name='cx8'/> <feature name='mce'/> <feature name='pae'/> <feature name='msr'/> <feature name='tsc'/> <feature name='pse'/> <feature name='de'/> <feature name='fpu'/> <feature name='mtrr'/> <feature name='clflush'/> <feature name='mca'/> <feature name='pse36'/> <feature name='pni'/> <feature name='cx16'/> <feature name='ssse3'/> <feature name='sse4.1'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> <feature name='lm'/> <feature name='syscall'/> <feature name='nx'/> <feature name='lahf_lm'/> </model> <model name='Nehalem'> <vendor>Intel</vendor> <feature name='sse2'/> <feature name='sse'/> <feature name='fxsr'/> <feature name='mmx'/> <feature name='pat'/> <feature name='cmov'/> <feature name='pge'/> <feature name='sep'/> <feature name='apic'/> <feature name='cx8'/> <feature name='mce'/> <feature name='pae'/> <feature name='msr'/> <feature name='tsc'/> <feature name='pse'/> <feature name='de'/> <feature name='fpu'/> <feature name='mtrr'/> <feature name='clflush'/> <feature name='mca'/> <feature name='pse36'/> <feature name='pni'/> <feature name='cx16'/> <feature name='ssse3'/> <feature name='sse4.1'/> <feature name='sse4.2'/> <feature name='popcnt'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> <feature name='lm'/> <feature name='syscall'/> <feature name='nx'/> <feature name='lahf_lm'/> </model> <model name='Opteron_G1'> <vendor>AMD</vendor> <feature name='sse2'/> <feature name='sse'/> <feature name='fxsr'/> <feature name='mmx'/> <feature name='pat'/> <feature name='cmov'/> <feature name='pge'/> <feature name='sep'/> <feature name='apic'/> <feature name='cx8'/> <feature name='mce'/> <feature name='pae'/> <feature name='msr'/> <feature name='tsc'/> <feature name='pse'/> <feature name='de'/> <feature name='fpu'/> <feature name='mtrr'/> <feature name='clflush'/> <feature name='mca'/> <feature name='pse36'/> <feature name='pni'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> <feature name='lm'/> <feature name='syscall'/> <feature name='nx'/> </model> <model name='Opteron_G2'> <vendor>AMD</vendor> <feature name='sse2'/> <feature name='sse'/> <feature name='fxsr'/> <feature name='mmx'/> <feature name='pat'/> <feature name='cmov'/> <feature name='pge'/> <feature name='sep'/> <feature name='apic'/> <feature name='cx8'/> <feature name='mce'/> <feature name='pae'/> <feature name='msr'/> <feature name='tsc'/> <feature name='pse'/> <feature name='de'/> <feature name='fpu'/> <feature name='mtrr'/> <feature name='clflush'/> <feature name='mca'/> <feature name='pse36'/> <feature name='pni'/> <feature name='cx16'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> <feature name='lm'/> <feature name='syscall'/> <feature name='nx'/> <feature name='rdtscp'/> <feature name='svm'/> <feature name='lahf_lm'/> </model> <model name='Opteron_G3'> <vendor>AMD</vendor> <feature name='sse2'/> <feature name='sse'/> <feature name='fxsr'/> <feature name='mmx'/> <feature name='pat'/> <feature name='cmov'/> <feature name='pge'/> <feature name='sep'/> <feature name='apic'/> <feature name='cx8'/> <feature name='mce'/> <feature name='pae'/> <feature name='msr'/> <feature name='tsc'/> <feature name='pse'/> <feature name='de'/> <feature name='fpu'/> <feature name='mtrr'/> <feature name='clflush'/> <feature name='mca'/> <feature name='pse36'/> <feature name='pni'/> <feature name='cx16'/> <feature name='monitor'/> <feature name='popcnt'/> - <feature name='fxsr'/> - <feature name='mmx'/> - <feature name='pat'/> - <feature name='cmov'/> - <feature name='pge'/> - <feature name='apic'/> - <feature name='cx8'/> - <feature name='mce'/> - <feature name='pae'/> - <feature name='msr'/> - <feature name='tsc'/> - <feature name='pse'/> - <feature name='de'/> - <feature name='fpu'/> <feature name='lm'/> <feature name='syscall'/> <feature name='nx'/> <feature name='rdtscp'/> <feature name='svm'/> <feature name='sse4a'/> <feature name='abm'/> <feature name='misalignsse'/> <feature name='lahf_lm'/> </model> </arch> </cpus> -- 1.7.3.1

2 2

[libvirt] [PATCH 00/12] vcpus: initial implemantation of <vcpu current=x>.
by Eric Blake 12 Oct '10

12 Oct '10

As promised, here's my first round of patches to make <vcpu> support add the ability to persistently remember if a domain should have fewer vcpus at boot than the maximum allowed for hot-plugging. Patches 1-10 are pretty well tested, 11 may need some tweaking to get the semantics right, and 12 is mainly for RFC, since I need help finishing off the series. Eric Blake (12): vcpu: improve cpuset attribute vcpu: add current attribute to <vcpu> element vcpu: add new public API vcpu: define internal driver API vcpu: implement the public APIs vcpu: implement the remote protocol vcpu: make old API trivially wrap to new API vcpu: support maxvcpu in domain_conf vcpu: add virsh support vcpu: improve vcpu support in qemu command line vcpu: complete vcpu support in qemu driver food for thought daemon/remote.c | 53 +++++++ daemon/remote_dispatch_args.h | 2 + daemon/remote_dispatch_prototypes.h | 16 ++ daemon/remote_dispatch_ret.h | 1 + daemon/remote_dispatch_table.h | 10 ++ docs/formatdomain.html.in | 17 ++- docs/schemas/domain.rng | 14 ++- include/libvirt/libvirt.h.in | 14 ++ src/conf/domain_conf.c | 41 ++++-- src/conf/domain_conf.h | 3 +- src/driver.h | 9 + src/esx/esx_driver.c | 30 ++++- src/esx/esx_vmx.c | 24 ++- src/libvirt.c | 125 +++++++++++++++- src/libvirt_public.syms | 6 + src/lxc/lxc_driver.c | 2 + src/opennebula/one_conf.c | 11 +- src/opennebula/one_driver.c | 2 + src/openvz/openvz_conf.c | 7 +- src/openvz/openvz_driver.c | 47 +++++- src/phyp/phyp_driver.c | 32 ++++- src/qemu/qemu_conf.c | 19 ++- src/qemu/qemu_driver.c | 119 +++++++++++++-- src/remote/remote_driver.c | 55 +++++++ src/remote/remote_protocol.c | 33 ++++ src/remote/remote_protocol.h | 26 +++ src/remote/remote_protocol.x | 19 +++- src/remote_protocol-structs | 12 ++ src/test/test_driver.c | 34 ++++- src/uml/uml_driver.c | 2 + src/vbox/vbox_tmpl.c | 46 +++++- src/xen/xen_driver.c | 32 ++++- src/xen/xend_internal.c | 15 ++- src/xen/xm_internal.c | 15 ++- src/xenapi/xenapi_driver.c | 60 +++++++- src/xenapi/xenapi_utils.c | 6 +- tests/qemuargv2xmltest.c | 2 + tests/qemuxml2argvdata/qemuxml2argv-smp.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 28 ++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml | 22 +++ tools/virsh.c | 211 +++++++++++++++++++++++--- tools/virsh.pod | 28 ++++- 44 files changed, 1140 insertions(+), 115 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-smp.xml create mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml -- 1.7.2.3

5 42

[libvirt] [PATCH] util: add missing export
by Eric Blake 12 Oct '10

12 Oct '10

Commit 1fe2927a3 forgot to export a symbol. * src/libvirt_private.syms (virHexToBin): Add. * src/.gitignore: Ignore temporary file. --- src/.gitignore | 1 + src/libvirt_private.syms | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/.gitignore b/src/.gitignore index 7ea8d89..a619643 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -14,4 +14,5 @@ libvirt.syms libvirt_qemu.def *.i *.s +remote_protocol-structs-t virt-aa-helper diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 301b0ef..1d94b12 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -668,6 +668,7 @@ virFileResolveLink; saferead; safewrite; safezero; +virHexToBin; virMacAddrCompare; virEnumFromString; virEnumToString; -- 1.7.2.3

2 2

[libvirt] [PATCH 0/4] xen: Fix device hot(un)plug
by Jiri Denemark 12 Oct '10

12 Oct '10

Jiri Denemark (4): xen: Make xenDaemon*DeviceFlags errors less confusing xen: Fix logic bug in xenDaemon*DeviceFlags xen: xenXMDomain*DeviceFlags should obey all flags xen: Fix virDomain{At,De}tachDevice src/xen/xen_driver.c | 24 ++++++++++++++++----- src/xen/xend_internal.c | 51 ++++++++++++++++++++++++---------------------- src/xen/xm_internal.c | 14 +++++++++++- 3 files changed, 57 insertions(+), 32 deletions(-) -- 1.7.3.1

3 16

[libvirt] About the qemu networking
by 杨树林 12 Oct '10

12 Oct '10

Dear libvirt team, I am testing the qemu with libvit networking, and I have a question. First, I connected the switch and server via Ethernet, the link encapsulation is 802.1q (eth1 is trunk link) When I use sub-interface eth1.12 for vlan12,br12 bridged to eth1.12, and then using tap0 ..tapN, the qemu guest networking works fine. But when I use br1 bridged to eth1 without sub-interface, also use tap0… tapn , it does not work. The topology as below: This works fine This doest not work Eth1 (trunk) eth1(trunk) | | | -------------- ----------------- | | | br1 Eth1.12 eth1.13 … | | | _______________ br12 br13 | | | | | … | | | tap0 tapn --------- ---------- | | | ... | | | | | Tap0 … tapn tapn+1 tapm Is the second solution works ? if works? What should I do to ? Thanks very much, I am look forward to hear from you. Best Regards 杨树林技术保障中心网络工程师 snda 上海盛大网络发展有限公司上海浦东新区碧波路690号1号楼邮编：201203 电话：021-50504740-896570 传真：021-50504740-895746 Email：yangshulin(a)shandagames.com 网址：http://www.snda.com

1 0