- Devel - libvirt List Archives

[libvirt] [PATCHv3 0/8] add command numatune
by Hu Tao 20 Dec '11

20 Dec '11

This series adds a new command numatune to get/set numatune parameters. Besides libnuma, cpuset cgroup parameters are also set according to numatune parameters. But for now, only cpuset.mems is supported. Hu Tao (8): Add functions to set/get cgroup cpuset parameters use cpuset to manage numa add new API virDomain{G,S}etNumaParameters Implement main entries of virDomain{G,S}etNumaParameters Add virDomain{G,S}etNumaParameters support to the remote driver Implement virDomain{G,S}etNumaParameters for the qemu driver add new command numatune to virsh Add document for new command numatune. daemon/remote.c | 64 ++++++++ include/libvirt/libvirt.h.in | 23 +++ python/generator.py | 2 + src/driver.h | 15 ++ src/libvirt.c | 113 ++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 6 + src/qemu/qemu_cgroup.c | 19 +++ src/qemu/qemu_driver.c | 334 ++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 50 +++++++ src/remote/remote_protocol.x | 24 +++- src/remote_protocol-structs | 16 ++ src/util/cgroup.c | 32 ++++ src/util/cgroup.h | 3 + tools/virsh.c | 181 +++++++++++++++++++++++ tools/virsh.pod | 13 ++ 16 files changed, 896 insertions(+), 1 deletions(-) -- 1.7.3.1

3 35

[libvirt] [PATCH] console: plug memory leaks
by ajia＠redhat.com 20 Dec '11

20 Dec '11

From: Alex Jia <ajia(a)redhat.com> Using 'virReallocN' to allocate memory on virConsoleEventOnStdin, virConsoleEventOnStdout and virConsoleEventOnStream, however, the cleanup function virConsoleShutdown hasn't released these memory. * tools/console.c: fix memory leaks on virConsoleShutdown. https://bugzilla.redhat.com/show_bug.cgi?id=767488 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/console.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/console.c b/tools/console.c index e6118a0..86376e4 100644 --- a/tools/console.c +++ b/tools/console.c @@ -101,6 +101,12 @@ virConsoleShutdown(virConsolePtr con) virStreamAbort(con->st); virStreamFree(con->st); } + if (con->streamToTerminal.data) { + VIR_FREE(con->streamToTerminal.data); + } + if (con->terminalToStream.data) { + VIR_FREE(con->terminalToStream.data); + } if (con->stdinWatch != -1) virEventRemoveHandle(con->stdinWatch); if (con->stdoutWatch != -1) -- 1.7.1

3 2

[libvirt] [PATCHv4 0/6] add numatune command
by Eric Blake 20 Dec '11

20 Dec '11

Not quite polished - see my complaints that will require a v5: https://www.redhat.com/archives/libvir-list/2011-December/msg00843.html I'm hoping Hu can help cover the remaining points, as I've already spent quite a bit of time cleaning it up to here. Hu Tao (6): Add functions to set/get cgroup cpuset parameters use cpuset to manage numa add new API virDomain{G, S}etNumaParameters Add virDomain{G, S}etNumaParameters support to the remote driver Implement virDomain{G, S}etNumaParameters for the qemu driver add new command numatune to virsh daemon/remote.c | 64 ++++++++++ include/libvirt/libvirt.h.in | 39 ++++++ python/generator.py | 2 + src/conf/domain_conf.h | 8 -- src/driver.h | 15 +++ src/libvirt.c | 129 +++++++++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 6 + src/qemu/qemu_cgroup.c | 19 +++ src/qemu/qemu_driver.c | 262 ++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 50 ++++++++ src/remote/remote_protocol.x | 24 ++++- src/remote_protocol-structs | 22 ++++ src/util/cgroup.c | 32 +++++ src/util/cgroup.h | 3 + tools/virsh.c | 159 +++++++++++++++++++++++++ tools/virsh.pod | 19 +++ 17 files changed, 846 insertions(+), 9 deletions(-) -- 1.7.7.4

2 10

[libvirt] [PATCH] virsh: Fix a regression of detaching device
by Osier Yang 20 Dec '11

20 Dec '11

Since for node <address>, the values for attrs "domain", "bus", "slot", "function" are all converted to heximal when parsing the XML. However commit ea7182c29 tries to examine if the device represented by the XML from user exists in the domain XML earlier before the XML parsing, and thus if the user use different base to represent the device address, e.g. <address type='pci' domain='0' bus='0' slot='7'/> vshCompleteXMLFromDomain won't find the device, and quit with error "no such device" even if the device does exist. --- tools/virsh.c | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3654589..5c78995 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -12107,12 +12107,14 @@ vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) { xmlNodePtr child1, child2; xmlAttrPtr attr; - char *prop1, *prop2; + char *prop1 = NULL; + char *prop2 = NULL; bool found; bool visited; bool ret = false; long n1_child_size, n2_child_size, n1_iter; - virBitmapPtr bitmap; + virBitmapPtr bitmap = NULL; + unsigned int prop1_ui, prop2_ui; if (!n1 && !n2) return true; @@ -12129,13 +12131,36 @@ vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) if (attr->type == XML_ATTRIBUTE_NODE) { prop1 = virXMLPropString(n1, (const char *) attr->name); prop2 = virXMLPropString(n2, (const char *) attr->name); - if (STRNEQ_NULLABLE(prop1, prop2)) { - xmlFree(prop1); - xmlFree(prop2); - return false; + + if (STREQ((const char *)n2->name, "address") && + prop1 && prop2 && + (STREQ((const char *)attr->name, "domain") || + STREQ((const char *)attr->name, "bus") || + STREQ((const char *)attr->name, "slot") || + STREQ((const char *)attr->name, "function"))) { + if (virStrToLong_ui(prop1, NULL, 0, &prop1_ui) < 0) { + vshError(NULL, _("can't parse value for %s"), attr->name); + goto cleanup; + } + + if (virStrToLong_ui(prop2, NULL, 0, &prop2_ui) < 0) { + vshError(NULL, _("can't parse value for %s"), attr->name); + goto cleanup; + } + + if (prop1_ui != prop2_ui) { + goto cleanup; + } + } else { + if (STRNEQ_NULLABLE(prop1, prop2)) { + goto cleanup; + } } + xmlFree(prop1); + prop1 = NULL; xmlFree(prop2); + prop2 = NULL; } attr = attr->next; } @@ -12207,6 +12232,10 @@ vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) ret = true; cleanup: + if (prop1) + xmlFree(prop1); + if (prop2) + xmlFree(prop2); virBitmapFree(bitmap); return ret; } -- 1.7.7.3

2 3

[libvirt] [PATCH] virsh: simply printing of typed parameters
by Eric Blake 20 Dec '11

20 Dec '11

No need to repeat code for formatting typed parameters. * tools/virsh.c (vshGetTypedParamValue): Support strings. (cmdSchedinfo, cmdBlkiotune, cmdMemtune, cmdBlkdeviotune): Use it for less code. --- tools/virsh.c | 134 +++++++++------------------------------------------------ 1 files changed, 21 insertions(+), 113 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3654589..a3ec7e9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2975,28 +2975,9 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) ret_val = true; for (i = 0; i < nparams; i++) { - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint(ctl, "%-15s: %u\n", params[i].field, params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint(ctl, "%-15s: %lld\n", params[i].field, params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - vshPrint(ctl, "%-15s: %llu\n", params[i].field, params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint(ctl, "%-15s: %f\n", params[i].field, params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.b); - break; - default: - vshPrint(ctl, "not implemented scheduler parameter type\n"); - } + char *str = vshGetTypedParamValue(ctl, &params[i]); + vshPrint(ctl, "%-15s: %s\n", params[i].field, str); + VIR_FREE(str); } } @@ -4935,38 +4916,9 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) } for (i = 0; i < nparams; i++) { - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint(ctl, "%-15s: %u\n", params[i].field, - params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint(ctl, "%-15s: %lld\n", params[i].field, - params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - vshPrint(ctl, "%-15s: %llu\n", params[i].field, - params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint(ctl, "%-15s: %f\n", params[i].field, - params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.b); - break; - case VIR_TYPED_PARAM_STRING: - vshPrint(ctl, "%-15s: %s\n", params[i].field, - params[i].value.s); - break; - default: - vshPrint(ctl, "unimplemented blkio parameter type\n"); - } + char *str = vshGetTypedParamValue(ctl, &params[i]); + vshPrint(ctl, "%-15s: %s\n", params[i].field, str); + VIR_FREE(str); } } else { /* set the blkio parameters */ @@ -5112,36 +5064,13 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) } for (i = 0; i < nparams; i++) { - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint(ctl, "%-15s: %u\n", params[i].field, - params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint(ctl, "%-15s: %lld\n", params[i].field, - params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - if (params[i].value.ul == VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) - vshPrint(ctl, "%-15s: unlimited\n", params[i].field); - else - vshPrint(ctl, "%-15s: %llu kB\n", params[i].field, - params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint(ctl, "%-15s: %f\n", params[i].field, - params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.b); - break; - default: - vshPrint(ctl, "unimplemented memory parameter type\n"); + if (params[i].type == VIR_TYPED_PARAM_ULLONG && + params[i].value.ul == VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) { + vshPrint(ctl, "%-15s: unlimited\n", params[i].field); + } else { + char *str = vshGetTypedParamValue(ctl, &params[i]); + vshPrint(ctl, "%-15s: %s\n", params[i].field, str); + VIR_FREE(str); } } @@ -6562,34 +6491,9 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) } for (i = 0; i < nparams; i++) { - switch(params[i].type) { - case VIR_TYPED_PARAM_INT: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.i); - break; - case VIR_TYPED_PARAM_UINT: - vshPrint(ctl, "%-15s: %u\n", params[i].field, - params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - vshPrint(ctl, "%-15s: %lld\n", params[i].field, - params[i].value.l); - break; - case VIR_TYPED_PARAM_ULLONG: - vshPrint(ctl, "%-15s: %llu\n", params[i].field, - params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - vshPrint(ctl, "%-15s: %f\n", params[i].field, - params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - vshPrint(ctl, "%-15s: %d\n", params[i].field, - params[i].value.b); - break; - default: - vshPrint(ctl, "unimplemented block I/O throttle parameter type\n"); - } + char *str = vshGetTypedParamValue(ctl, &params[i]); + vshPrint(ctl, "%-15s: %s\n", params[i].field, str); + VIR_FREE(str); } ret = true; @@ -17086,8 +16990,12 @@ vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) ret = virAsprintf(&str, "%s", item->value.b ? _("yes") : _("no")); break; + case VIR_TYPED_PARAM_STRING: + str = vshStrdup (ctl, item->value.s); + ret = str ? 0 : -1; + default: - vshError(ctl, _("unimplemented block statistics parameter type")); + vshError(ctl, _("unimplemented parameter type %d"), item->type); } if (ret < 0) -- 1.7.7.4

2 2

[libvirt] polkit-auth question
by Jim Fehlig 19 Dec '11

19 Dec '11

While debugging a PolicyKit issue I noticed that libvirt would proceed with authentication even though polkit-auth failed: testusr@xen134:~> virsh list --all Attempting to obtain authorization for org.libvirt.unix.manage. polkit-grant-helper: given auth type (8 -> yes) is bogus Failed to obtain authorization for org.libvirt.unix.manage. Id Name State ---------------------------------- 0 Domain-0 running - sles11sp1-pv shut off Hmm, authorization failed but domains listed anyway. testusr@xen134:~> virsh start sles11sp1-pv Attempting to obtain authorization for org.libvirt.unix.manage. polkit-grant-helper: given auth type (8 -> yes) is bogus Failed to obtain authorization for org.libvirt.unix.manage. Domain sles11sp1-pv started Ok, authorization failed but testusr was able to start the domain! Checking virConnectAuthGainPolkit() in src/libvirt.c cmd = virCommandNewArgList(POLKIT_AUTH, "--obtain", privilege, NULL); if (virCommandRun(cmd, &status) < 0 || status > 1) goto cleanup; Why the check for status > 1? I looked at polkit-auth source in PolicyKit 0.9 and AFAICT it sets its default return code to 1, only changing it to 0 in success code paths. Unfortunately, the polkit-auth docs make no mention of return codes. Thanks, Jim

1 0

[libvirt] [PATCH] docs: document <qemu:commandline> xml
by Eric Blake 19 Dec '11

19 Dec '11

Even though we technically don't support <qemu:commandline> (as in, if you mis-use things, you get to keep the pieces), we should at least document how to use it. * docs/drvqemu.html.in (qemucommand): New section. --- I wrote this in response to an IRC comment lamenting that the only existing documentation was reading the examples in the testsuite. docs/drvqemu.html.in | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 4da3817..d6effb5 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -513,6 +513,67 @@ $ virsh domxml-to-native qemu-argv demo.xml -serial none -parallel none -usb </pre> + <h2><a name="qemucommand">Pass-through of arbitrary qemu + commands</a></h2> + + <p>Libvirt provides an optional + library <code>libvirt-qemu.so</code> for dealing specifically + with qemu. This library is <b>unsupported</b>, in that it is + not guaranteed to have a stable API, and that mis-using the + library may result in inconsistent state the crashes libvirtd. + However, when used correctly, this library allows testing + specific qemu features that have not yet been ported to the + generic libvirt XML and API interfaces. + </p> + <p>The library provides two + API: <code>virDomainQemuMonitorCommand</code>, for sending an + arbitrary monitor command (in either HMP or QMP format) to a + qemu guest (<span class="since">Since 0.8.3</span>), + and <code>virDomainQemuAttach</code>, for registering a qemu + domain that was manually started so that it can then be managed + by libvirtd (<span class="since">Since 0.9.4</span>). + </p> + <p>Additionally, the following XML additions allow fine-tuning of + the command line given to qemu when starting a domain + (<span class="since">Since 0.8.3</span>). In order to use the + XML additions, it is necessary to issue an XML namespace request + (the special <code>xmlns:<i>name</i></code> attribute) that + pulls in <code>http://libirt.org/schemas/domain/qemu/1.0</code>; + typically, the namespace is given the name + of <code>qemu</code>. With the namespace in place, it is then + possible to add an element <code><qemu:commandline></code> + under <code>driver</code>, with the following sub-elements + repeated as often as needed: + <dl> + <dt><code>qemu:arg</code></dt> + <dd>Add an additional command-line argument to the qemu + process when starting the domain, given by the value of the + attribute <code>value</code>. + </dd> + <dt><code>qemu:env</code></dt> + <dd>Add an additional environment variable to the qemu + process when starting the domain, given with the name-value + pair recorded in the attributes <code>name</code> + and <code>value</code>.</dd> + </dl> + + <p>Example:</p><pre> +<domain type='qemu' xmlns:qemu='http://libirt.org/schemas/domain/qemu/1.0'> + <name>QEmu-fedora-i686</name> + <memory>219200</memory> + <os> + <type arch='i686' machine='pc'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + </devices> + <qemu:commandline> + <qemu:arg value='-newarg'/> + <qemu:env name='QEMU_ENV' value='VAL'/> + </qemu:commandline> +</domain> +</pre> + <h2><a name="xmlconfig">Example domain XML config</a></h2> <h3>QEMU emulated guest on x86_64</h3> -- 1.7.7.4

2 2

[libvirt] [PATCH] python: plug memory leak on libvirt_virConnectOpenAuth
by ajia＠redhat.com 19 Dec '11

19 Dec '11

From: Alex Jia <ajia(a)redhat.com> * Detected by valgrind. Leak introduced in commit 5ab109f. * python/libvirt-override.c: avoid memory leak on libvirt_virConnectOpenAuth. * How to reproduce? % valgrind -v --leak-check=full virt-clone --print-xml Note: it can hit the issue although options are incomplete. * Actual valgrind result: ==1801== 12 bytes in 1 blocks are definitely lost in loss record 25 of 3,270 ==1801== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==1801== by 0xCF1F60E: libvirt_virConnectOpenAuth (libvirt-override.c:1507) ==1801== by 0x3AFEEDE7F3: PyEval_EvalFrameEx (ceval.c:3794) ==1801== by 0x3AFEEDF99E: PyEval_EvalFrameEx (ceval.c:3880) ==1801== by 0x3AFEEDF99E: PyEval_EvalFrameEx (ceval.c:3880) ==1801== by 0x3AFEEDF99E: PyEval_EvalFrameEx (ceval.c:3880) ==1801== by 0x3AFEEDF99E: PyEval_EvalFrameEx (ceval.c:3880) ==1801== by 0x3AFEEE0466: PyEval_EvalCodeEx (ceval.c:3044) ==1801== by 0x3AFEEE0541: PyEval_EvalCode (ceval.c:545) ==1801== by 0x3AFEEFB88B: run_mod (pythonrun.c:1351) ==1801== by 0x3AFEEFB95F: PyRun_FileExFlags (pythonrun.c:1337) ==1801== by 0x3AFEEFCE4B: PyRun_SimpleFileExFlags (pythonrun.c:941) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 4aee628..8a643a3 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1520,6 +1520,7 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { c_retval = virConnectOpenAuth(name, &auth, flags); LIBVIRT_END_ALLOW_THREADS; + free(auth.credtype); py_retval = libvirt_virConnectPtrWrap((virConnectPtr) c_retval); return(py_retval); } -- 1.7.1

3 2

[libvirt] [PATCH 0/2] Introduce two new virsh commands
by Osier Yang 19 Dec '11

19 Dec '11

These two patches is to introduce two new virsh commands, one is eject-media, which is to eject media from CD or floppy drive, the other is insert-media, which is to insert media into CD or floppy drive. There are commands existed can be used to eject/insert media, such as "update-device", but it's not quite easy to use. That's the original intention of these patches. Both of the two commands only allow to operate on CDROM or floppy disk. [PATCH 1/2] virsh: Introduce two new commands to insert or eject media [PATCH 2/2] doc: Add docs for two new introduced commands Regards Osier

3 6

[libvirt] [PATCH] Fix typo in storage pool documentation
by Christophe Fergeau 19 Dec '11

19 Dec '11

Remove 2 words that shouldn't be here. --- docs/formatstorage.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index f13ca6a..0dcf6df 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -13,7 +13,7 @@ volumes. Some may have constraints on volume size, or placement. </p> <p> - The is the top level tag for a storage pool document is 'pool'. It has + The top level tag for a storage pool document is 'pool'. It has a single attribute <code>type</code>, which is one of <code>dir</code>, <code>fs</code>,<code>netfs</code>,<code>disk</code>,<code>iscsi</code>, <code>logical</code>. This corresponds to the storage backend drivers -- 1.7.7.4

2 1