- Devel - libvirt List Archives

[libvirt] Virt io blk buffer
by Pankaj Rawat 24 Feb '12

24 Feb '12

Hi all Can any one tell what is the default Vitio blk IO Buffer size And can we change it ? if yes how? DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

2 1

[libvirt] New QMP event interface (was Re: [Qemu-devel] [PATCH 5/5] qmp: add DEVICE_TRAY_MOVED event)
by Anthony Liguori 24 Feb '12

24 Feb '12

On 02/24/2012 10:56 AM, Luiz Capitulino wrote: > On Fri, 24 Feb 2012 10:44:11 -0600 > Anthony Liguori<anthony(a)codemonkey.ws> wrote: > >>> I'm asking because the conversion of events to the qapi is not too far away, >>> but I think that using QOM will somewhat deprecate the code you have in the >>> glib branch (besides having to wait for 1.2)? >> >> I have some vague ideas about what to do here. One thought would be to have a >> standard notifier mechanism in Object that was advertised as a property type. >> We could then provide an interface via QMP to [un]subscribe to a notifier property. > > This seems to be a good match with your previous ideas, implemented in the glib > branch. But then subsystems/devices emitting events will have to be converted > to QOM first... Well we need to keep the old events for compatibility, so it's really just about new events. I think that by end of 1.2, we would have all non-qdev subsystems converted to QOM also so this shouldn't be a problem in practice. > >> I won't get to this until the 1.2 time frame though. My goals for 1.1 are to >> get qbus conversions merged and refactor IRQs/MemoryRegions to use QOM. If time >> permits, also refactor the PC to better use QOM. >> >> If someone wants to tackle events in QOM, I'd be happy to provide some >> suggestions on where to start. > > I'd like to hear about it, but I'm not sure when I'll start working on it. I've only thought about this roughly, but the problems that need to be solved are: 1) Have an object property that corresponds to a NotifierList (easy) 2) Figure out what it means to "get" and "set" a NotifierList. I think perhaps we could somehow turn this into subscribe/unsubscribe... We could take a plan9-like approach where "get" would return the canonical path of a new object that corresponded to a subscription to the event. This is nice because unsubscribing then just becomes a matter of destroying the subscription object. Once you had this subscription object, I think we would want a mechanism to "connect" the subscription with either a native function pointer or some mechanism that would let us translate that to QMP. Maybe we only connect with a native function pointer and use QAPI generation code to build a native function pointer that spits out a marshalled QObject. 3) We would need to think through the QMP interface for all of this. Given a path, we want to be able to subscribe to an event and unsubscribe from an event. We need to unsubscribe all subscribed events when the connection is lost. It would be nice to have convenience interfaces for doing things like subscribing to any event on a given type too including yet to be created objects. Cc'ing libvirt here to see if they have any additional requirements. Regards, Anthony Liguori

1 0

[libvirt] [PATCH] Improve error reporting when virsh console is run without a TTY
by Daniel P. Berrange 24 Feb '12

24 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> If attempting to run ssh root@somehost virsh console someguest You'll get an error 2012-02-15 13:11:47.683+0000: 4765: info : libvirt version: 0.9.10, package: 1.fc18 (Unknown, 2012-02-15-11:48:57, lettuce.camlab.fab.redhat.com) 2012-02-15 13:11:47.683+0000: 4765: error : vshRunConsole:320 : unable to get tty attributes: Invalid argument Connected to domain f16x86_64 Escape character is ^] There are several problems here - The actual error message is bad for users - We shouldn't rely on VIR_ERROR for this case - The prompt makes it look like we still connected because we didn't flush stdout. * virsh.c: Flush stdout before starting console and check for a valid tty --- tools/virsh.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 3be86ed..b97a888 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -838,8 +838,14 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *name) goto cleanup; } + if (!isatty(STDIN_FILENO)) { + vshError(ctl, "%s", _("Cannot run interactive console without a controlling TTY")); + goto cleanup; + } + vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom)); vshPrintExtra(ctl, _("Escape character is %s\n"), ctl->escapeChar); + fflush(stdout); if (vshRunConsole(dom, name, ctl->escapeChar) == 0) ret = true; -- 1.7.7.6

2 1

[libvirt] [PATCH] Workaround python header file insanity
by Daniel P. Berrange 24 Feb '12

24 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The /usr/include/python/pyconfig.h file pollutes the global namespace with a huge number of HAVE_XXX and WITH_XXX defines. These change what we detected in our own config.h In particular if you try to build without DTrace, python's headers turn it back on with predictable fail. THe hack to workaround this is to rename WITH_DTRACE to WITH_DTRACE_PROBES to avoid the namespace clash --- configure.ac | 4 ++-- daemon/Makefile.am | 2 +- src/Makefile.am | 4 ++-- src/internal.h | 2 +- tests/Makefile.am | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 732f4fe..262e63b 100644 --- a/configure.ac +++ b/configure.ac @@ -1378,10 +1378,10 @@ if test "$with_dtrace" != "no" ; then with_dtrace=yes fi if test "$with_dtrace" = "yes"; then - AC_DEFINE_UNQUOTED([WITH_DTRACE], 1, [whether DTrace static probes are available]) + AC_DEFINE_UNQUOTED([WITH_DTRACE_PROBES], 1, [whether DTrace static probes are available]) fi fi -AM_CONDITIONAL([WITH_DTRACE], [test "$with_dtrace" != "no"]) +AM_CONDITIONAL([WITH_DTRACE_PROBES], [test "$with_dtrace" != "no"]) dnl NUMA lib diff --git a/daemon/Makefile.am b/daemon/Makefile.am index e2c1357..db4abf5 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -109,7 +109,7 @@ libvirtd_LDADD = \ $(SASL_LIBS) \ $(POLKIT_LIBS) -if WITH_DTRACE +if WITH_DTRACE_PROBES libvirtd_LDADD += ../src/probes.o endif diff --git a/src/Makefile.am b/src/Makefile.am index d5f52a0..9b1921d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1284,7 +1284,7 @@ libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS) # picked out for us. libvirt_la_DEPENDENCIES = $(libvirt_la_BUILT_LIBADD) $(LIBVIRT_SYMBOL_FILE) -if WITH_DTRACE +if WITH_DTRACE_PROBES libvirt_la_BUILT_LIBADD += probes.o libvirt_la_DEPENDENCIES += probes.o nodist_libvirt_la_SOURCES = probes.h @@ -1521,7 +1521,7 @@ libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(RT_LIBS) \ ../gnulib/lib/libgnu.la -if WITH_DTRACE +if WITH_DTRACE_PROBES libvirt_lxc_LDADD += probes.o endif if WITH_SECDRIVER_SELINUX diff --git a/src/internal.h b/src/internal.h index fabcb52..3408541 100644 --- a/src/internal.h +++ b/src/internal.h @@ -247,7 +247,7 @@ # define VIR_DIV_UP(value, size) (((value) + (size) - 1) / (size)) -# if WITH_DTRACE +# if WITH_DTRACE_PROBES # ifndef LIBVIRT_PROBES_H # define LIBVIRT_PROBES_H # include "probes.h" diff --git a/tests/Makefile.am b/tests/Makefile.am index 3fb9e2f..9974c2f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -29,7 +29,7 @@ INCLUDES += \ endif PROBES_O = -if WITH_DTRACE +if WITH_DTRACE_PROBES PROBES_O += ../src/probes.o endif -- 1.7.7.6

2 1

[libvirt] [PATCH] Fixed URI parsing
by Martin Kletzander 24 Feb '12

24 Feb '12

Function virParseURI was added. This function is wrapper around xmlParseURI. In this wrapper we are fixing what doesn't seems to be fixed in libxml2 in the near future. The wrapper is written in such way that if anything gets fixed in libxml2, it'll still work. File changes: - src/util/xml.h -- declaration - src/util/xml.c -- definition - src/libvirt_private.syms -- symbol export - all others -- function call fixed and include added --- src/esx/esx_driver.c | 3 ++- src/libvirt.c | 10 ++++++---- src/libvirt_private.syms | 1 + src/libxl/libxl_driver.c | 3 ++- src/lxc/lxc_driver.c | 3 ++- src/openvz/openvz_driver.c | 3 ++- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 5 +++-- src/remote/remote_driver.c | 3 ++- src/uml/uml_driver.c | 3 ++- src/util/xml.c | 37 +++++++++++++++++++++++++++++++++++++ src/util/xml.h | 3 +++ src/vbox/vbox_tmpl.c | 3 ++- src/vmx/vmx.c | 3 ++- src/xen/xen_driver.c | 2 +- src/xen/xend_internal.c | 3 ++- 16 files changed, 70 insertions(+), 17 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f5e1cc7..4375432 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -44,6 +44,7 @@ #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" +#include "xml.h" #define VIR_FROM_THIS VIR_FROM_ESX @@ -3976,7 +3977,7 @@ esxDomainMigratePerform(virDomainPtr domain, } /* Parse migration URI */ - parsedUri = xmlParseURI(uri); + parsedUri = virParseURI(uri); if (parsedUri == NULL) { virReportOOMError(); diff --git a/src/libvirt.c b/src/libvirt.c index 8035add..eeca680 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -44,6 +44,7 @@ #include "command.h" #include "virnodesuspend.h" #include "virrandom.h" +#include "xml.h" #ifndef WITH_DRIVER_MODULES # ifdef WITH_TEST @@ -1117,8 +1118,9 @@ do_open (const char *name, if (STRCASEEQ(name, "xen")) name = "xen:///"; - /* Convert xen:// -> xen:/// because xmlParseURI cannot parse the - * former. This allows URIs such as xen://localhost to work. + /* Convert xen:// -> xen:/// because xmlParseURI (and thus virParseURI + * as well) cannot parse the former. This allows URIs such as + * xen://localhost to work. */ if (STREQ (name, "xen://")) name = "xen:///"; @@ -1127,7 +1129,7 @@ do_open (const char *name, virConnectOpenResolveURIAlias(name, &alias) < 0) goto failed; - ret->uri = xmlParseURI (alias ? alias : name); + ret->uri = virParseURI (alias ? alias : name); if (!ret->uri) { virLibConnError(VIR_ERR_INVALID_ARG, _("could not parse connection URI %s"), @@ -4964,7 +4966,7 @@ virDomainMigratePeer2Peer (virDomainPtr domain, return -1; } - tempuri = xmlParseURI(dconnuri); + tempuri = virParseURI(dconnuri); if (!tempuri) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); virDispatchError(domain->conn); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a5f9433..7975f94 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1425,6 +1425,7 @@ virTypedParameterAssign; # xml.h +virParseURI; virXMLChildElementCount; virXMLParseHelper; virXMLPropString; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6cfc5eb..f1ef5fb 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -44,6 +44,7 @@ #include "libxl_conf.h" #include "xen_xm.h" #include "virtypedparam.h" +#include "xml.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -1043,7 +1044,7 @@ libxlOpen(virConnectPtr conn, if (libxl_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("xen:///"); + conn->uri = virParseURI("xen:///"); if (!conn->uri) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b712da4..9c3c005 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -59,6 +59,7 @@ #include "virnodesuspend.h" #include "virtime.h" #include "virtypedparam.h" +#include "xml.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -138,7 +139,7 @@ static virDrvOpenStatus lxcOpen(virConnectPtr conn, if (lxc_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("lxc:///"); + conn->uri = virParseURI("lxc:///"); if (!conn->uri) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 833a98d..47fad74 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -56,6 +56,7 @@ #include "virfile.h" #include "logging.h" #include "command.h" +#include "xml.h" #define VIR_FROM_THIS VIR_FROM_OPENVZ @@ -1335,7 +1336,7 @@ static virDrvOpenStatus openvzOpen(virConnectPtr conn, if (access("/proc/vz", W_OK) < 0) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("openvz:///system"); + conn->uri = virParseURI("openvz:///system"); if (conn->uri == NULL) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45c4100..5ff1313 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -857,7 +857,7 @@ static virDrvOpenStatus qemudOpen(virConnectPtr conn, if (qemu_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI(qemu_driver->privileged ? + conn->uri = virParseURI(qemu_driver->privileged ? "qemu:///system" : "qemu:///session"); if (!conn->uri) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 12cfbde..35a2ebc 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -45,6 +45,7 @@ #include "virtime.h" #include "locking/domain_lock.h" #include "rpc/virnetsocket.h" +#include "xml.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -1773,10 +1774,10 @@ static int doNativeMigrate(struct qemud_driver *driver, virReportOOMError(); return -1; } - uribits = xmlParseURI(tmp); + uribits = virParseURI(tmp); VIR_FREE(tmp); } else { - uribits = xmlParseURI(uri); + uribits = virParseURI(uri); } if (!uribits) { qemuReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e068126..116cf12 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -47,6 +47,7 @@ #include "command.h" #include "intprops.h" #include "virtypedparam.h" +#include "xml.h" #define VIR_FROM_THIS VIR_FROM_REMOTE @@ -719,7 +720,7 @@ doRemoteOpen (virConnectPtr conn, goto failed; VIR_DEBUG("Auto-probed URI is %s", uriret.uri); - conn->uri = xmlParseURI(uriret.uri); + conn->uri = virParseURI(uriret.uri); VIR_FREE(uriret.uri); if (!conn->uri) { virReportOOMError(); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index a4cf945..f1e290a 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -63,6 +63,7 @@ #include "configmake.h" #include "virnetdevtap.h" #include "virnodesuspend.h" +#include "xml.h" #define VIR_FROM_THIS VIR_FROM_UML @@ -1138,7 +1139,7 @@ static virDrvOpenStatus umlOpen(virConnectPtr conn, if (uml_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI(uml_driver->privileged ? + conn->uri = virParseURI(uml_driver->privileged ? "uml:///system" : "uml:///session"); if (!conn->uri) { diff --git a/src/util/xml.c b/src/util/xml.c index b426653..982ce9a 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -800,6 +800,43 @@ error: goto cleanup; } +/** + * virParseURI: + * @uri: URI to parse + * + * Wrapper for xmlParseURI + * + * Unfortunately there are few things that should be managed after + * parsing the URI. First example is removing the square brackets + * around IPv6 addresses. + * + * @returns the parsed uri object with some fixes + */ +xmlURIPtr +virParseURI(const char *uri) +{ + xmlURIPtr ret = xmlParseURI(uri); + + /* First check: does it even make sense to jump inside */ + if (ret != NULL && ret->server != NULL && ret->server[0] == '[') { + size_t last = strlen(ret->server) - 1; /* Index of last char */ + + /* We want to modify the server string only if there are + * square brackets on both ends and inside there is IPv6 + * address. Otherwise we could make a mistake by modifying + * something else than IPv6 address. */ + if (ret->server[last] == ']' && strchr(ret->server, ':')) { + for (size_t i = 0; i < last; i++) + ret->server[i] = ret->server[i + 1]; + + ret->server[last - 1] = '\0'; + } + /* Even after such modification, it is completely ok to free + * the uri with xmlFreeURI() */ + } + + return ret; +} static int virXMLEmitWarning(int fd, const char *name, diff --git a/src/util/xml.h b/src/util/xml.h index a3750fa..c0fbbca 100644 --- a/src/util/xml.h +++ b/src/util/xml.h @@ -10,6 +10,7 @@ # include <libxml/parser.h> # include <libxml/tree.h> # include <libxml/xpath.h> +# include <libxml/uri.h> int virXPathBoolean(const char *xpath, xmlXPathContextPtr ctxt); @@ -61,6 +62,8 @@ xmlDocPtr virXMLParseHelper(int domcode, const char *url, xmlXPathContextPtr *pctxt); +xmlURIPtr virParseURI(const char *uri); + /** * virXMLParse: * @filename: file to parse, or NULL for string parsing diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index b168c7d..11fa995 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -56,6 +56,7 @@ #include "configmake.h" #include "virfile.h" #include "fdstream.h" +#include "xml.h" /* This one changes from version to version. */ #if VBOX_API_VERSION == 2002 @@ -980,7 +981,7 @@ static virDrvOpenStatus vboxOpen(virConnectPtr conn, virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); if (conn->uri == NULL) { - conn->uri = xmlParseURI(uid ? "vbox:///session" : "vbox:///system"); + conn->uri = virParseURI(uid ? "vbox:///session" : "vbox:///system"); if (conn->uri == NULL) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 1fdbd50..866b150 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -33,6 +33,7 @@ #include "logging.h" #include "uuid.h" #include "vmx.h" +#include "xml.h" /* @@ -2610,7 +2611,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, (*def)->target.port = port; (*def)->source.type = VIR_DOMAIN_CHR_TYPE_TCP; - parsedUri = xmlParseURI(fileName); + parsedUri = virParseURI(fileName); if (parsedUri == NULL) { virReportOOMError(); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 94cafde..c101e11 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -270,7 +270,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) if (!xenUnifiedProbe()) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("xen:///"); + conn->uri = virParseURI("xen:///"); if (!conn->uri) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 5c3838f..e346f5f 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -46,6 +46,7 @@ #include "memory.h" #include "count-one-bits.h" #include "virfile.h" +#include "xml.h" /* required for cpumap_t */ #include <xen/dom0_ops.h> @@ -3224,7 +3225,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, * "hostname", "hostname:port" or "xenmigr://hostname[:port]/". */ if (strstr (uri, "//")) { /* Full URI. */ - xmlURIPtr uriptr = xmlParseURI (uri); + xmlURIPtr uriptr = virParseURI (uri); if (!uriptr) { virXendError(VIR_ERR_INVALID_ARG, "%s", _("xenDaemonDomainMigrate: invalid URI")); -- 1.7.3.4

5 11

[libvirt] RFC: Post-install behavior of libvirt(-client)
by Martin Kletzander 24 Feb '12

24 Feb '12

Hello everyone, I have a small bug #786770 [1] assigned and I discussed this with few people from our team but I'm still not sure what should be the proper fix for this bug. To sumarize the bug, the problem described and discussed there [1] is that when there's a fresh installation of RHEL system with libvirt-client, there are some error messages displayed. These messages are generated by the part of %post client script where we are running this: if [ $1 -ge 1 ]; then level=$(/sbin/runlevel | /bin/cut -d ' ' -f 2) if /sbin/chkconfig --levels $level libvirt-guests; then # this doesn't do anything but allowing for libvirt-guests to be # stopped on the first shutdown /sbin/service libvirt-guests start > /dev/null 2>&1 || true fi fi The messages are generated because "/sbin/runlevel" returns "unknown" in chrooted installation environment. But there's more to that. While looking at this part of code, I wonder what we are trying to do here :) There are some problems, let me revise: - 1st parameter of this script is 1 for install and 2 for upgrade, thus "[ $1 -ge 1 ]" is always true - we are trying to get the current runlevel and then check if libvirt-guests is enabled in this runlevel. As mentioned before, the latter doesn't work because we are using command "/sbin/runlevel" there. There is another option, but unfortunately, running "/sbin/chkconfig libvirt-guests" fails as well. Both of these are trying to get current runlevel from "/var/run/utmp" which is empty in the chrooted env during installation. Thinking about this a little more, I see two more "unconsistencies" let's say: - we are starting libvirt-guests if it is enabled (rpm post script should not start services) - we don't check if libvirtd is running, so during shutdown we can get even more error messages that the script is not able to connect to libvirt etc. So I'm wondering if I can just remove the starting part (because if someone wants to use it after first install, he has to start libvirtd anyway and then should know to start libvirt-guests as well) or if I have to come up with some totally different solution how to do this. Maybe I'm missing something here or I don't understand it correctly, any correction is appreciated. Thanks in advance for all suggestions. Have a nice day Martin [1] https://bugzilla.redhat.com/show_bug.cgi?id=786770

3 7

[libvirt] [Patch v2] vmx: Better Workstation vmx handling
by Jean-Baptiste Rouault 24 Feb '12

24 Feb '12

This patch adds support for more network configurations in vmx files. Changes since v1: Adapt virVMXFormatEthernet() to handle empty bridge names and user interface type. Add new test cases to vmx2xmltest and xml2vmxtest. Jean-Baptiste Rouault (1): vmx: Better Workstation vmx handling src/vmx/vmx.c | 39 ++++++++++++------ tests/vmx2xmldata/vmx2xml-ethernet-nat.vmx | 6 +++ tests/vmx2xmldata/vmx2xml-ethernet-nat.xml | 21 ++++++++++ tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.vmx | 52 ++++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml | 35 ++++++++++++++++ tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.vmx | 52 ++++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml | 36 ++++++++++++++++ tests/vmx2xmltest.c | 4 ++ tests/xml2vmxdata/xml2vmx-ethernet-nat.vmx | 14 ++++++ tests/xml2vmxdata/xml2vmx-ethernet-nat.xml | 13 ++++++ tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx | 22 ++++++++++ tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml | 29 +++++++++++++ tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx | 22 ++++++++++ tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml | 30 ++++++++++++++ tests/xml2vmxtest.c | 4 ++ 15 files changed, 366 insertions(+), 13 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-nat.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-nat.xml create mode 100644 tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml create mode 100644 tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-nat.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-nat.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml -- 1.7.9

2 2

[libvirt] Add GSoC project ideas to the wiki!
by Stefan Hajnoczi 24 Feb '12

24 Feb '12

This is a reminder that QEMU will apply for Google Summer of Code 2012 and we need project ideas and mentors. Libvirt and kvm.ko projects are also welcome! http://wiki.qemu.org/Google_Summer_of_Code_2012 Please add yourself to the wiki now if you want to mentor a project this summer. I will file our application next week. Thanks, Stefan

2 2

[libvirt] [PATCH 1/1] Add a few additional comments to bugs.html
by Dave Allan 24 Feb '12

24 Feb '12

Clarified that "bugs" in this context means any change to libvirt, whether called a bug, feature, etc. Noted the existence of the Fedora virt preview repo as a way of trying out newer prebuilt packages. Noted that you don't need to be subscribed to the list to post. --- docs/bugs.html.in | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 39b6725..cc73439 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -13,6 +13,15 @@ check below for distribution specific bug reporting policies first. </p> + <p> + Please note that although this page is called bug reporting, the + advice here applies to any change you feel should be made in + libvirt, whether it is called a bug, feature, documentation + change or any other kind of modification. (Coding Horror has an + interesting discussion of + <a href="http://www.codinghorror.com/blog/2008/11/thats-not-a-bug-its-a-feature-requ…">some + different takes on that categorization</a>.) + </p> <h2><a name="general">General libvirt bug reports</a></h2> @@ -39,7 +48,8 @@ ask questions on the list, as others may know of existing solutions or be interested in collaborating with you on finding a solution. Patches are always appreciated, and it's likely - that someone else has the same problem you do! + that someone else has the same problem you do! You don't need + to subscribe to the list to post. </p> <p> If you decide to write code, though, before you begin please @@ -59,13 +69,23 @@ <h2><a name="distribution">Linux Distribution specific bug reports</a></h2> <ul> <li> + <p> If you are using binaries from <strong>Fedora</strong>, enter tickets against the <code>Fedora</code> product and the <code>libvirt</code> component. + </p> <ul> <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Fedora">View Fedora libvirt tickets</a></li> <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&compon…">New Fedora libvirt ticket</a></li> </ul> + <p> + If you're willing to try out bleeding edge code but don't + want to build libvirt yourself, consider installing packages + from + the <a href="http://fedoraproject.org/wiki/Virtualization_Preview_Repository">Fedora + Virt Preview Repository</a> to see if your problem has been + fixed already. + </p> </li> <li> <p> -- 1.7.7.6

1 0

[libvirt] [PATCH] Misleading error message when name is missing
by Benjamin Cama 24 Feb '12

24 Feb '12

Hi, [forwarding this here from RH bug #796732] When creating a network (virsh net-create) with an erroneous XML containing an empty <name> element, the error message is misleading: error: Failed to create network from foo.xml error: missing domain name information It took me a bit of time to figure out that it was the *network* name that was missing (I generate this xml and didn't look at it, first). I realized that the same message is used for missing name when creating a domain, network, or device node. Attached patch (warning: against a completly different git than yours, don't pay attention to wrong shas) thus make this message more generic. Regards, Benjamin PS: please Cc me, I'm not subscribed

2 2

[libvirt] [PATCH 1/1] Update bug reporting page
by Dave Allan 23 Feb '12

23 Feb '12

Remove suggestion that people file bugs against RHEL 5 and add a suggestion that people increase the visibility of their bugs by mentioning them on libvir-list. --- docs/bugs.html.in | 83 ++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 57 insertions(+), 26 deletions(-) diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 560dfa4..39b6725 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -9,22 +9,47 @@ <h2><a name="bugzilla">Bug Tracking</a></h2> <p> - The <a href="http://bugzilla.redhat.com">Red Hat Bugzilla Server</a> - should be used to report bugs and request features in libvirt. - Before submitting a ticket, check the existing tickets to see if - the bug/feature is already tracked. + If you are using libvirt binaries from a Linux distribution + check below for distribution specific bug reporting policies + first. </p> <h2><a name="general">General libvirt bug reports</a></h2> <p> - If you are using official libvirt binaries from a Linux distribution - check below for distribution specific bug reporting policies first. + The <a href="http://bugzilla.redhat.com">Red Hat Bugzilla Server</a> + should be used to report bugs and request features in libvirt. + Before submitting a ticket, check the existing tickets to see if + the bug/feature is already tracked. + For general libvirt bug reports, from self-built releases, GIT snapshots and any other non-distribution supported builds, enter tickets under the <code>Virtualization Tools</code> product and the <code>libvirt</code> component. </p> + <p> + It's always a good idea to file bug reports, as the process of + filing the report always makes it easier to describe the + problem, and the bug number provides a quick way of referring to + the problem. However, not everybody in the community pays + attention to bugzilla, so after you file a bug, asking questions + and submitting patches on <a href="contact.html">the libvirt + mailing lists</a> will increase your bug's visibility and + encourage people to think about your problem. Don't hesitate to + ask questions on the list, as others may know of existing + solutions or be interested in collaborating with you on finding + a solution. Patches are always appreciated, and it's likely + that someone else has the same problem you do! + </p> + <p> + If you decide to write code, though, before you begin please + read the <a href="hacking.html">contributor guidelines</a>, + especially the first point: "Discuss any large changes on the + mailing list first. Post patches early and listen to feedback." + Few development experiences are more discouraging than spending + a bunch of time writing a patch only to have someone point out a + better approach on list. + </p> <ul> <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Virtua…">View libvirt tickets</a></li> @@ -34,26 +59,37 @@ <h2><a name="distribution">Linux Distribution specific bug reports</a></h2> <ul> <li> - If you are using official binaries from a <strong>Fedora distribution</strong>, enter - tickets against the <code>Fedora</code> product and the <code>libvirt</code> - component. + If you are using binaries from <strong>Fedora</strong>, enter + tickets against the <code>Fedora</code> product and + the <code>libvirt</code> component. <ul> <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Fedora">View Fedora libvirt tickets</a></li> <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&compon…">New Fedora libvirt ticket</a></li> </ul> </li> <li> - If you are using official binaries from <strong>Red Hat Enterprise Linux distribution</strong>, - tickets against the <code>Red Hat Enterprise Linux 5</code> product and - the <code>libvirt</code> component. - <ul> - <li><a href="http://bugzilla.redhat.com/buglist.cgi?component=libvirt&product=Red%20…">View Red Hat Enterprise Linux libvirt tickets</a></li> - <li><a href="http://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Red%20Hat%20Enter…">New Red Hat Enterprise Linux libvirt ticket</a></li> - </ul> + <p> + If you are using binaries from <strong>Red Hat Enterprise + Linux</strong>, enter tickets against the Red Hat Enterprise + Linux product that you're using (e.g., Red Hat Enterprise + Linux 6) and the <code>libvirt</code> component. Red Hat + bugzilla has <a href="http://bugzilla.redhat.com">additional guidance</a> about getting support if + you are a Red Hat customer. + </p> </li> <li> - If you are using official binaries from another Linux distribution first - follow their own bug reporting guidelines. + <p> + If you are using binaries from another Linux distribution + first follow their own bug reporting guidelines. + </p> + </li> + <li> + <p> + Finally, if you are a contributor to another Linux + distribution and would like to have your procedure for + filing bugs mentioned here, please mail the libvirt + development list. + </p> </li> </ul> @@ -81,18 +117,18 @@ If the bug leads to a tool linked to libvirt crash, then the best is to provide a backtrace along with the scenario used to get the crash, the simplest is to run the program under gdb, reproduce the - steps leading to the crash and then issue a gdb "bt" command to + steps leading to the crash and then issue a gdb "bt -a" command to get the stack trace, attach it to the bug. Note that for the data to be really useful libvirt debug informations must be present for example by installing libvirt debuginfo package on Fedora or Red Hat Enterprise Linux (with debuginfo-install libvirt) prior to running gdb.</p> <p> - It may also happen that the libvirt daemon itself crashes or get stuck, + It may also happen that the libvirt daemon itself crashes or gets stuck, in the first case run it (as root) under gdb, and reproduce the sequence leading to the crash, similary to a normal program provide the "bt" backtrace information to where gdb will have stopped.<br/> - But if libvirtd get stuck, for example seems to stop processing + But if libvirtd gets stuck, for example seems to stop processing commands, try to attach to the faulty daemon and issue a gdb command "thread apply all bt" to show all the threads backtraces, as in:</p> <pre> # ps -o etime,pid `pgrep libvirt` @@ -106,10 +142,5 @@ (gdb) </pre> - <p> - If requesting a new feature attach any available patch to the ticket - and also email the patch to the libvirt mailing list for discussion - </p> - </body> </html> -- 1.7.7.6

2 1

[libvirt] [PATCH] qemu: nicer error message on failed graceful destroy
by Eric Blake 23 Feb '12

23 Feb '12

https://bugzilla.redhat.com/show_bug.cgi?id=795656 mentions that a graceful destroy request can time out, meaning that the error message is user-visible and should be more appropriate than just internal error. * src/qemu/qemu_driver.c (qemuDomainDestroyFlags): Swap error type. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 717bdf1..c7ca881 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1792,7 +1792,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, */ if (flags & VIR_DOMAIN_DESTROY_GRACEFUL) { if (qemuProcessKill(driver, vm, 0) < 0) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("failed to kill qemu process with SIGTERM")); goto cleanup; } -- 1.7.7.6

2 2

[libvirt] [PATCH v2 0/4] Forbid migration with cache != none
by Jiri Denemark 23 Feb '12

23 Feb '12

Migrating qemu domains with disks using cache != none is unsafe unless the disk images are stored on coherent clustered filesystem. Thus we forbid migrating such domains unless VIR_MIGRATE_UNSAFE flags is used. This series uses similar aproach to forbidding unsafe PCI passthrough or disk format probing when we forbade those by default with the possibility to force them. Domain configuration is only checked on source, which makes migrating affected domains from an old libvirt to the new one possible. Migrating back is impossible since destination libvirtd would complain about unknown flag (the flag is not filtered so it gets to the destination even though it's not really used there). However, users of unknown clustered filesystems now have to always pass the new flag to be able to migrate because libvirtd would think they are doing something unsafe. Perhaps we should provide a system wide (i.e., /etc/libvirt/qemu.conf) tunable which would disable cache mode checking for all domains at once? I was also wondering if we should rather use more specific name for both the error code and flag, such as VIR(_ERR)?_MIGRATE_UNSAFE_CACHE (or ...UNSAFE_DISK) in the case we find other unsafe conditions... Version 2: - add virStorageFileIsClusterFS as suggested by Dan B. Jiri Denemark (4): Add support for unsafe migration virsh: Add --unsafe option to migrate command Introduce virStorageFileIsClusterFS qemu: Forbid migration with cache != none include/libvirt/libvirt.h.in | 2 +- include/libvirt/virterror.h | 1 + src/libvirt.c | 4 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_migration.c | 39 +++++++++++++++++++++++++++++++++++---- src/qemu/qemu_migration.h | 6 ++++-- src/util/storage_file.c | 10 ++++++++++ src/util/storage_file.h | 1 + src/util/virterror.c | 6 ++++++ tools/virsh.c | 4 ++++ tools/virsh.pod | 10 +++++++++- 12 files changed, 78 insertions(+), 9 deletions(-) -- 1.7.8.4

3 12

[libvirt] [PATCH 0/3] make memory use in XML easier to read
by Eric Blake 23 Feb '12

23 Feb '12

As suggested here: https://www.redhat.com/archives/libvir-list/2012-February/msg00954.html Eric Blake (3): xml: output memory unit for clarity xml: drop unenforced minimum memory limit from RNG xml: allow scaled memory on input docs/formatdomain.html.in | 39 ++++- docs/schemas/domaincommon.rng | 27 +++- src/conf/domain_conf.c | 155 ++++++++++++++++---- src/conf/domain_conf.h | 12 +- tests/define-dev-segfault | 4 +- tests/domainschemadata/domain-lxc-simple.xml | 2 +- tests/domainschemadata/portprofile.xml | 2 +- .../qemu-simple-description-title.xml | 4 +- tests/domainschemadata/timers.xml | 4 +- tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 4 +- tests/domainsnapshotxml2xmlout/full_domain.xml | 4 +- tests/domainsnapshotxml2xmlout/metadata.xml | 4 +- tests/openvzutilstest.c | 4 +- tests/qemuargv2xmltest.c | 5 +- .../qemuxml2argv-balloon-device-auto.xml | 4 +- .../qemuxml2argv-balloon-device.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-bios.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 4 +- .../qemuxml2argv-blkiotune-device.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 4 +- .../qemuxml2argv-boot-complex-bootindex.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-complex.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 4 +- ...uxml2argv-boot-menu-disable-drive-bootindex.xml | 4 +- .../qemuxml2argv-boot-menu-disable-drive.xml | 4 +- .../qemuxml2argv-boot-menu-disable.xml | 4 +- .../qemuxml2argv-boot-menu-enable.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml | 4 +- .../qemuxml2argv-channel-guestfwd.xml | 4 +- .../qemuxml2argv-channel-spicevmc-old.xml | 2 +- .../qemuxml2argv-channel-spicevmc.xml | 2 +- .../qemuxml2argv-channel-virtio-auto.xml | 4 +- .../qemuxml2argv-channel-virtio.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-clock-france.xml | 4 +- .../qemuxml2argv-clock-localtime.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 4 +- .../qemuxml2argv-clock-variable.xml | 4 +- .../qemuxml2argv-console-compat-auto.xml | 4 +- .../qemuxml2argv-console-compat-chardev.xml | 4 +- .../qemuxml2argv-console-compat.xml | 4 +- .../qemuxml2argv-console-virtio-many.xml | 4 +- .../qemuxml2argv-console-virtio.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml | 4 +- .../qemuxml2argv-cpu-exact2-nofallback.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml | 4 +- .../qemuxml2argv-cpu-host-kvmclock.xml | 4 +- .../qemuxml2argv-cpu-host-model-fallback.xml | 4 +- .../qemuxml2argv-cpu-host-model-nofallback.xml | 4 +- .../qemuxml2argv-cpu-host-model.xml | 4 +- .../qemuxml2argv-cpu-host-passthrough.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml | 4 +- .../qemuxml2argv-cpu-nofallback.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml | 4 +- .../qemuxml2argv-cpu-qemu-host-passthrough.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml | 4 +- .../qemuxml2argv-cpu-topology1.xml | 4 +- .../qemuxml2argv-cpu-topology2.xml | 4 +- .../qemuxml2argv-cpu-topology3.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 4 +- .../qemuxml2argv-disk-cdrom-empty.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 4 +- .../qemuxml2argv-disk-copy_on_read.xml | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.xml | 4 +- .../qemuxml2argv-disk-drive-boot-disk.xml | 4 +- .../qemuxml2argv-disk-drive-cache-directsync.xml | 4 +- .../qemuxml2argv-disk-drive-cache-unsafe.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-none.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-wb.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-wt.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-none.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 4 +- ...muxml2argv-disk-drive-error-policy-enospace.xml | 4 +- .../qemuxml2argv-disk-drive-error-policy-stop.xml | 4 +- ...rgv-disk-drive-error-policy-wreport-rignore.xml | 4 +- .../qemuxml2argv-disk-drive-fat.xml | 4 +- .../qemuxml2argv-disk-drive-fmt-qcow.xml | 4 +- .../qemuxml2argv-disk-drive-network-nbd.xml | 4 +- .../qemuxml2argv-disk-drive-network-rbd-auth.xml | 4 +- ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 4 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 4 +- .../qemuxml2argv-disk-drive-network-sheepdog.xml | 4 +- .../qemuxml2argv-disk-drive-no-boot.xml | 4 +- .../qemuxml2argv-disk-drive-readonly-disk.xml | 4 +- .../qemuxml2argv-disk-drive-readonly-no-device.xml | 4 +- .../qemuxml2argv-disk-drive-shared.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 4 +- .../qemuxml2argv-disk-ioeventfd.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml | 4 +- .../qemuxml2argv-disk-sata-device.xml | 4 +- .../qemuxml2argv-disk-scsi-device-auto.xml | 4 +- .../qemuxml2argv-disk-scsi-device.xml | 4 +- .../qemuxml2argv-disk-snapshot.xml | 4 +- .../qemuxml2argv-disk-transient.xml | 4 +- .../qemuxml2argv-disk-usb-device.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 4 +- .../qemuxml2argv-encrypted-disk.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 4 +- .../qemuxml2argv-floppy-drive-fat.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml | 4 +- .../qemuxml2argv-graphics-listen-network.xml | 4 +- .../qemuxml2argv-graphics-listen-network2.xml | 4 +- .../qemuxml2argv-graphics-sdl-fullscreen.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 4 +- .../qemuxml2argv-graphics-spice-compression.xml | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 4 +- .../qemuxml2argv-graphics-spice-timeout.xml | 4 +- .../qemuxml2argv-graphics-spice.xml | 4 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 4 +- .../qemuxml2argv-graphics-vnc-socket.xml | 4 +- .../qemuxml2argv-graphics-vnc-tls.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 4 +- .../qemuxml2argv-hostdev-pci-address-device.xml | 4 +- .../qemuxml2argv-hostdev-pci-address.xml | 4 +- .../qemuxml2argv-hostdev-usb-address-device.xml | 4 +- .../qemuxml2argv-hostdev-usb-address.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml | 4 +- .../qemuxml2argv-input-usbmouse-addr.xml | 4 +- .../qemuxml2argv-input-usbmouse.xml | 4 +- .../qemuxml2argv-input-usbtablet.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 4 +- .../qemuxml2argv-machine-aliases1.xml | 4 +- .../qemuxml2argv-machine-aliases2.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.xml | 10 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 4 +- .../qemuxml2argv-misc-no-reboot.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-monitor-json.xml | 4 +- .../qemuxml2argv-multifunction-pci-device.xml | 4 +- .../qemuxml2argv-net-bandwidth.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-client.xml | 4 +- .../qemuxml2argv-net-eth-ifname.xml | 4 +- .../qemuxml2argv-net-eth-names.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-server.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 4 +- .../qemuxml2argv-net-virtio-device.xml | 4 +- .../qemuxml2argv-net-virtio-netdev.xml | 4 +- .../qemuxml2argv-net-virtio-network-portgroup.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-no-shutdown.xml | 4 +- .../qemuxml2argv-nographics-vga.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-nographics.xml | 4 +- .../qemuxml2argv-numatune-memory.xml | 4 +- .../qemuxml2argv-parallel-tcp-chardev.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 4 +- .../qemuxml2argv-pseries-basic.xml | 2 +- .../qemuxml2argv-pseries-vio-address-clash.xml | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.xml | 2 +- .../qemuxml2argv-qemu-ns-no-env.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 4 +- .../qemuxml2argv-restore-v2-fd.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 4 +- .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 4 +- .../qemuxml2argv-seclabel-dynamic-override.xml | 4 +- .../qemuxml2argv-seclabel-dynamic.xml | 4 +- .../qemuxml2argv-seclabel-none.xml | 4 +- .../qemuxml2argv-seclabel-static-relabel.xml | 4 +- .../qemuxml2argv-seclabel-static.xml | 4 +- .../qemuxml2argv-serial-dev-chardev.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 4 +- .../qemuxml2argv-serial-file-chardev.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 4 +- .../qemuxml2argv-serial-many-chardev.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 4 +- .../qemuxml2argv-serial-pty-chardev.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 4 +- .../qemuxml2argv-serial-target-port-auto.xml | 4 +- .../qemuxml2argv-serial-tcp-chardev.xml | 4 +- .../qemuxml2argv-serial-tcp-telnet-chardev.xml | 4 +- .../qemuxml2argv-serial-tcp-telnet.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 4 +- .../qemuxml2argv-serial-udp-chardev.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 4 +- .../qemuxml2argv-serial-unix-chardev.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 4 +- .../qemuxml2argv-serial-vc-chardev.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 4 +- .../qemuxml2argv-smartcard-controller.xml | 4 +- .../qemuxml2argv-smartcard-host-certificates.xml | 4 +- .../qemuxml2argv-smartcard-host.xml | 4 +- ...qemuxml2argv-smartcard-passthrough-spicevmc.xml | 4 +- .../qemuxml2argv-smartcard-passthrough-tcp.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 4 +- .../qemuxml2argv-usb-controller.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml | 4 +- .../qemuxml2argv-usb-ich9-companion.xml | 4 +- .../qemuxml2argv-usb-ich9-ehci-addr.xml | 4 +- .../qemuxml2argv-usb-piix3-controller.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 4 +- .../qemuxml2argv-watchdog-device.xml | 4 +- .../qemuxml2argv-watchdog-dump.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 4 +- .../qemuxml2xmlout-balloon-device-auto.xml | 4 +- .../qemuxml2xmlout-channel-virtio-auto.xml | 4 +- .../qemuxml2xmlout-console-compat-auto.xml | 4 +- .../qemuxml2xmlout-console-virtio.xml | 4 +- .../qemuxml2xmlout-disk-cdrom-empty.xml | 4 +- .../qemuxml2xmlout-disk-scsi-device-auto.xml | 4 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 4 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 4 +- .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 4 +- .../qemuxml2xmlout-serial-target-port-auto.xml | 4 +- .../qemuxmlns-qemu-ns-commandline-ns0.xml | 4 +- .../qemuxmlns-qemu-ns-commandline-ns1.xml | 4 +- .../qemuxmlns-qemu-ns-commandline.xml | 4 +- .../qemuxmlns-qemu-ns-domain-commandline-ns0.xml | 4 +- .../qemuxmlns-qemu-ns-domain-commandline.xml | 4 +- .../qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.xml | 4 +- tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 4 +- .../sexpr2xml-disk-block-shareable.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 4 +- .../sexpr2xml-disk-drv-blktap-qcow.xml | 4 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 4 +- .../sexpr2xml-disk-drv-blktap2-raw.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 4 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 4 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 4 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 4 +- .../sexpr2xml-pv-bootloader-cmdline.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 4 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 4 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-pv.xml | 4 +- tests/vmx2xmldata/vmx2xml-annotation.xml | 4 +- tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml | 4 +- tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml | 4 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml | 4 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml | 4 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml | 4 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml | 4 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml | 4 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml | 4 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml | 4 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml | 4 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml | 6 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml | 4 +- tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml | 4 +- tests/vmx2xmldata/vmx2xml-ethernet-custom.xml | 4 +- tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml | 4 +- tests/vmx2xmldata/vmx2xml-ethernet-generated.xml | 4 +- tests/vmx2xmldata/vmx2xml-ethernet-other.xml | 4 +- tests/vmx2xmldata/vmx2xml-ethernet-static.xml | 4 +- tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml | 4 +- tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml | 4 +- tests/vmx2xmldata/vmx2xml-floppy-device.xml | 4 +- tests/vmx2xmldata/vmx2xml-floppy-file.xml | 4 +- tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 4 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml | 4 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml | 4 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml | 4 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml | 4 +- tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml | 4 +- tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml | 4 +- tests/vmx2xmldata/vmx2xml-minimal-64bit.xml | 4 +- tests/vmx2xmldata/vmx2xml-minimal.xml | 4 +- tests/vmx2xmldata/vmx2xml-parallel-device.xml | 4 +- tests/vmx2xmldata/vmx2xml-parallel-file.xml | 4 +- tests/vmx2xmldata/vmx2xml-scsi-driver.xml | 4 +- tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml | 4 +- tests/vmx2xmldata/vmx2xml-serial-device.xml | 4 +- tests/vmx2xmldata/vmx2xml-serial-file.xml | 4 +- .../vmx2xmldata/vmx2xml-serial-network-client.xml | 4 +- .../vmx2xmldata/vmx2xml-serial-network-server.xml | 4 +- tests/vmx2xmldata/vmx2xml-serial-pipe.xml | 4 +- tests/vmx2xmldata/vmx2xml-smbios.xml | 4 +- tests/vmx2xmldata/vmx2xml-svga.xml | 4 +- tests/xmconfigdata/sexpr2xml-pv-bootloader.xml | 4 +- tests/xmconfigdata/test-escape-paths.xml | 4 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 4 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 4 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 4 +- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 4 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 4 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 4 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 4 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 4 +- .../test-fullvirt-serial-dev-2-ports.xml | 4 +- .../test-fullvirt-serial-dev-2nd-port.xml | 4 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 4 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 4 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 4 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 4 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 4 +- .../test-fullvirt-serial-tcp-telnet.xml | 4 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 4 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 4 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 4 +- tests/xmconfigdata/test-fullvirt-sound.xml | 4 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 4 +- .../test-fullvirt-usbtablet-no-bus.xml | 4 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 4 +- tests/xmconfigdata/test-fullvirt-utc.xml | 4 +- tests/xmconfigdata/test-no-source-cdrom.xml | 4 +- tests/xmconfigdata/test-paravirt-net-e1000.xml | 4 +- tests/xmconfigdata/test-paravirt-net-vifname.xml | 4 +- .../test-paravirt-new-pvfb-vncdisplay.xml | 4 +- tests/xmconfigdata/test-paravirt-new-pvfb.xml | 4 +- .../test-paravirt-old-pvfb-vncdisplay.xml | 4 +- tests/xmconfigdata/test-paravirt-old-pvfb.xml | 4 +- tests/xmconfigdata/test-paravirt-vcpu.xml | 4 +- tests/xmconfigdata/test-pci-devs.xml | 4 +- tests/xml2sexprdata/xml2sexpr-boot-grub.xml | 2 +- tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml | 2 +- tests/xml2sexprdata/xml2sexpr-curmem.xml | 4 +- .../xml2sexpr-disk-block-shareable.xml | 4 +- tests/xml2sexprdata/xml2sexpr-disk-block.xml | 2 +- tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml | 2 +- .../xml2sexpr-disk-drv-blktap-qcow.xml | 2 +- .../xml2sexpr-disk-drv-blktap-raw.xml | 2 +- tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml | 2 +- .../xml2sexpr-disk-drv-blktap2-raw.xml | 2 +- tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml | 2 +- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml | 2 +- tests/xml2sexprdata/xml2sexpr-disk-file.xml | 2 +- tests/xml2sexprdata/xml2sexpr-escape.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-kernel.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-localtime.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml | 2 +- .../xml2sexpr-fv-serial-dev-2-ports.xml | 2 +- .../xml2sexpr-fv-serial-dev-2nd-port.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml | 2 +- .../xml2sexpr-fv-serial-tcp-telnet.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-sound.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-utc.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv.xml | 2 +- tests/xml2sexprdata/xml2sexpr-net-bridged.xml | 2 +- tests/xml2sexprdata/xml2sexpr-net-e1000.xml | 2 +- tests/xml2sexprdata/xml2sexpr-net-routed.xml | 2 +- tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml | 4 +- tests/xml2sexprdata/xml2sexpr-pci-devs.xml | 2 +- .../xml2sexpr-pv-bootloader-cmdline.xml | 2 +- tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml | 2 +- tests/xml2sexprdata/xml2sexpr-pv-localtime.xml | 4 +- tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml | 2 +- tests/xml2sexprdata/xml2sexpr-pv.xml | 2 +- tests/xml2vmxdata/xml2vmx-annotation.xml | 2 +- tests/xml2vmxdata/xml2vmx-cdrom-ide-device.xml | 2 +- tests/xml2vmxdata/xml2vmx-cdrom-ide-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.xml | 2 +- tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml | 4 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.xml | 4 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.xml | 4 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml | 4 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml | 6 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml | 4 +- tests/xml2vmxdata/xml2vmx-ethernet-bridged.xml | 2 +- tests/xml2vmxdata/xml2vmx-ethernet-custom.xml | 2 +- tests/xml2vmxdata/xml2vmx-ethernet-e1000.xml | 2 +- tests/xml2vmxdata/xml2vmx-ethernet-generated.xml | 2 +- tests/xml2vmxdata/xml2vmx-ethernet-other.xml | 2 +- tests/xml2vmxdata/xml2vmx-ethernet-static.xml | 2 +- tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml | 2 +- tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml | 2 +- tests/xml2vmxdata/xml2vmx-floppy-device.xml | 2 +- tests/xml2vmxdata/xml2vmx-floppy-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-graphics-vnc.xml | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.xml | 4 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.xml | 4 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.xml | 4 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.xml | 4 +- tests/xml2vmxdata/xml2vmx-harddisk-ide-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-minimal-64bit.xml | 2 +- tests/xml2vmxdata/xml2vmx-minimal.xml | 2 +- tests/xml2vmxdata/xml2vmx-parallel-device.xml | 2 +- tests/xml2vmxdata/xml2vmx-parallel-file.xml | 2 +- tests/xml2vmxdata/xml2vmx-scsi-driver.xml | 2 +- tests/xml2vmxdata/xml2vmx-scsi-writethrough.xml | 2 +- tests/xml2vmxdata/xml2vmx-serial-device.xml | 2 +- tests/xml2vmxdata/xml2vmx-serial-file.xml | 2 +- .../xml2vmxdata/xml2vmx-serial-network-client.xml | 2 +- .../xml2vmxdata/xml2vmx-serial-network-server.xml | 2 +- tests/xml2vmxdata/xml2vmx-serial-pipe.xml | 2 +- tests/xml2vmxdata/xml2vmx-smbios.xml | 2 +- tests/xml2vmxdata/xml2vmx-svga.xml | 2 +- 458 files changed, 1008 insertions(+), 876 deletions(-) -- 1.7.7.6

3 8

[libvirt] RFC: <memory units=...> [was: libvirt doesn't boot kVM, hangs, qemu on 100% CPU]
by Eric Blake 23 Feb '12

23 Feb '12

On 02/21/2012 03:46 PM, Igor Galić wrote: > > Hi folks, > > it's been adventurous. > Yesterday night I've started debugging this particular > issue of why my KVMs don't boot on Ubuntu 11.10. On IRC, we identified the culprit: > <uuid>8cfcb7b0-10ee-7d08-9b64-9f39c154292a</uuid> > <memory>2048</memory> > <currentMemory>2048</currentMemory> There ain't no way on earth you're going to boot a kernel in 2 megabytes of memory! I propose enhancing the XML; on output, libvirt should produce: <memory units='k'>2048</memory> => 2048 * kibibyte the output unit must remain the same as it has always been, but the new attribute will make it easier for humans reading the XML to spot blunders like what spawned this thread. On input, the optional attribute is more useful - we can use it to provide a multiplier (of course, the result will be rounded up to k, and again rounded up to any higher granularity per the hypervisor): b => bytes k, KiB => kibibyte (1024) KB => kilobyte (1000) M, MiB => mebibyte (1024*1024) MB => megabyte (1000000) and so on for at least G and T (do we need P, E, Z, or Y? and I'm jealous if you have a machine with 1Y memory). Thoughts before I propose such a patch? -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

3 2

[libvirt] [PATCH 0/3] Forbid migration with cache != none
by Jiri Denemark 23 Feb '12

23 Feb '12

Migrating qemu domains with disks using cache != none is unsafe unless the disk images are stored on coherent clustered filesystem. Thus we forbid migrating such domains unless VIR_MIGRATE_UNSAFE flags is used. This series uses similar aproach to forbidding unsafe PCI passthrough or disk format probing when we forbade those by default with the possibility to force them. Domain configuration is only checked on source, which makes migrating affected domains from an old libvirt to the new one possible. Migrating back is impossible since destination libvirtd would complain about unknown flag (the flag is not filtered so it gets to the destination even though it's not really used there). However, users of clustered filesystems now have to always pass the new flag to be able to migrate because libvirtd would think they are doing something unsafe. Perhaps we should provide a system wide (i.e., /etc/libvirt/qemu.conf) tunable which would disable cache mode checking for all domains at once? I was also wondering if we should rather use more specific name for both the error code and flag, such as VIR(_ERR)?_MIGRATE_UNSAFE_CACHE (or ...UNSAFE_DISK) in the case we find other unsafe conditions... Jiri Denemark (3): Add support for unsafe migration virsh: Add --unsafe option to migrate command qemu: Forbid migration with cache != none include/libvirt/libvirt.h.in | 2 +- include/libvirt/virterror.h | 1 + src/libvirt.c | 4 ++++ src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_migration.c | 36 ++++++++++++++++++++++++++++++++---- src/qemu/qemu_migration.h | 6 ++++-- src/util/virterror.c | 6 ++++++ tools/virsh.c | 4 ++++ tools/virsh.pod | 10 +++++++++- 9 files changed, 63 insertions(+), 9 deletions(-) -- 1.7.8.4

4 7

[libvirt] Cluster_size parameter issue on qcow2 image format
by Pankaj Rawat 23 Feb '12

23 Feb '12

I have been working o the qcow2 image format , I theory regarding cluster size it is written that as the size of cluster increase performance should increase. But something surprising happen The performance is degrading as the size of cluster increased from 64K to 1M ( during expansion of qcow2 image) can any one tell why ? DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

1 0

[libvirt] [PATCH v4 0/7] Console corruption patchset
by Peter Krempa 22 Feb '12

22 Feb '12

Rebased and tweaked to current upstream. Some patches still need review: * 1/7 pidfile: Make checking binary path in virPidFileRead optional - ACKed in v3 by Eric - minor spelling fixes * 2/7 Add flags for virDomainOpenConsole - ACKed in v3 by Eric - spelling fixes - added docs about behavior with older server suggested by Eric * 3/7 virsh: add support for VIR_DOMAIN_CONSOLE_* flags - ACKed in v3 by Eric - tweaked grammar/spelling - added reason why --safe and --force was not implemented in start/create * 4/7 fdstream: Emit stream abort callback even if poll() doesnt. - no change to v3 - Eric requested final ack by danpb * 5/7 fdstream: Add internal callback on stream close - no change to v3 - needs review * 6/7 util: Add helpers for safe domain console operations - fixed include of hash.h -> virhash.h - needs review of changes done in v3 * 7/7 qemu: Add ability to abort existing console while creating new one - needs review of changes done in v3 configure.ac | 39 ++++- include/libvirt/libvirt.h.in | 12 ++ po/POTFILES.in | 1 + src/Makefile.am | 6 +- src/conf/virconsole.c | 396 ++++++++++++++++++++++++++++++++++++++++++ src/conf/virconsole.h | 36 ++++ src/fdstream.c | 89 +++++++++- src/fdstream.h | 11 ++ src/libvirt.c | 18 ++- src/libvirt_private.syms | 6 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 21 ++- src/util/virpidfile.c | 21 ++- tools/console.c | 5 +- tools/console.h | 3 +- tools/virsh.c | 24 ++- tools/virsh.pod | 8 +- 18 files changed, 666 insertions(+), 38 deletions(-) create mode 100644 src/conf/virconsole.c create mode 100644 src/conf/virconsole.h -- 1.7.3.4

2 15

[libvirt] [PATCH] conf/default.cfg: Update Fedora download URLs
by Lucas Meneghel Rodrigues 22 Feb '12

22 Feb '12

libvirt TCK is currently broke since it can't download from the old alias download.fedora.redhat.com, since that alias was removed and people really should update their download links. Point to the new dl.fedoraproject.org URLs. Signed-off-by: Lucas Meneghel Rodrigues <lmr(a)redhat.com> --- conf/default.cfg | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/default.cfg b/conf/default.cfg index cb70149..a303d88 100644 --- a/conf/default.cfg +++ b/conf/default.cfg @@ -69,8 +69,8 @@ kernels = ( hvm xen ) - kernel = http://download.fedora.redhat.com/pub/fedora/linux/releases/15/Fedora/i386/… - initrd = http://download.fedora.redhat.com/pub/fedora/linux/releases/15/Fedora/i386/… + kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/ima… + initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/ima… } # Fedora 15 x86_64 has pv_ops, so one kernel can do both Xen and KVM guests here { @@ -79,8 +79,8 @@ kernels = ( hvm xen ) - kernel = http://download.fedora.redhat.com/pub/fedora/linux/releases/15/Fedora/x86_6… - initrd = http://download.fedora.redhat.com/pub/fedora/linux/releases/15/Fedora/x86_6… + kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/i… + initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/i… } # User mode linux i686 needs custom kernel + root filesystem { -- 1.7.7.6

2 1

[libvirt] [perl-Sys-Virt][PATCH] de-mortalize the return value from hv_delete
by Guannan Ren 22 Feb '12

22 Feb '12

when calling block_stats() like $dom->block_stats(), it will reprot errors: Attempt to free unreferenced scalar: SV 0x2598498, Perl interpreter: 0x11a0010. Attempt to free unreferenced scalar: SV 0x258c498, Perl interpreter: 0x11a0010. This patch fix it. --- Virt.xs | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Virt.xs b/Virt.xs index e5d8438..9ef9715 100644 --- a/Virt.xs +++ b/Virt.xs @@ -3358,6 +3358,7 @@ block_stats(dom, path, flags=0) field = "flush_reqs"; if (field) { SV *val = hv_delete(RETVAL, params[i].field, strlen(params[i].field), 0); + SvREFCNT_inc(val); (void)hv_store(RETVAL, field, strlen(field), val, 0); } } -- 1.7.1

2 1

[libvirt] [PATCH] libvirt-guests: Enable parallel operations and improve error handling
by Peter Krempa 22 Feb '12

22 Feb '12

This patch modifies the libvirt-guests init script to enable parallel shiutdown on guest machines and gets rid of error messages if the client is unable connect to the URI specified in the config file. --- Simultaneous shutdown of machines may speed up the shutdown process as the shutdown sequence of guests often consists of timeouts and storage un-intensive tasks. Simultaneous resume of machines was already supported, although not documented well enough. This patch also checks if connection to the URI can be done, and prints a error message if it's not the case. This get's rid of unrelevant and repeated error messages if the URI is unreachable. The last improvement is while using managed-save. Transient domains are excluded from the save sequence to get rid of error messages and a list of domains that are left behind is printed. Please tell me your suggestions how to improve this, as I'm not a bash "native speaker". tools/libvirt-guests.init.sh | 214 ++++++++++++++++++++++++++++++++++++++---- tools/libvirt-guests.sysconf | 10 ++- 2 files changed, 204 insertions(+), 20 deletions(-) diff --git a/tools/libvirt-guests.init.sh b/tools/libvirt-guests.init.sh index 367177e..c858747 100644 --- a/tools/libvirt-guests.init.sh +++ b/tools/libvirt-guests.init.sh @@ -78,8 +78,25 @@ run_virsh_c() { ( export LC_ALL=C; run_virsh "$@" ) } +test_connect() +{ + uri=$1 + + run_virsh "$uri" connect 2>/dev/null + if [ $? -ne 0 ]; then + eval_gettext "Can't connect to \$uri. Skipping." + echo + return 1 + fi +} + +# "persistent" argument options: +# yes: list only persistent guests +# no: list only transient guests +# all: list both persistent and transient guests list_guests() { uri=$1 + persistent=$2 list=$(run_virsh_c "$uri" list) if [ $? -ne 0 ]; then @@ -89,12 +106,19 @@ list_guests() { uuids= for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do - uuid=$(run_virsh_c "$uri" dominfo "$id" | awk '/^UUID:/{print $2}') - if [ -z "$uuid" ]; then + dominfo=$(run_virsh_c "$uri" dominfo "$id") + uuid=$(echo "$dominfo" | awk '/^UUID:/{print $2}') + dompersist=$(echo "$dominfo" | awk '/^Persistent:/{print $2}') + + if [ -z "$uuid" ] || [ -z "$dompersist" ]; then RETVAL=1 return 1 fi - uuids="$uuids $uuid" + + if [ "$persistent" == "$dompersist" ] || + [ "$persistent" == "all" ]; then + uuids="$uuids $uuid" + fi done echo $uuids @@ -162,6 +186,8 @@ start() { continue fi + test_connect "$uri" || continue + eval_gettext "Resuming guests on \$uri URI..."; echo for guest in $list; do name=$(guest_name "$uri" "$guest") @@ -241,6 +267,102 @@ shutdown_guest() fi } +shutdown_guest_async() +{ + uri=$1 + guest=$2 + + name=$(guest_name "$uri" "$guest") + label=$(eval_gettext "Starting shutdown on guest: \$name") + echo $label + retval run_virsh "$uri" shutdown "$guest" >/dev/null || return +} + +set_add() +{ + item=$1 + items=$2 + + echo "$items $item" +} + +set_remove() +{ + item=$1 + items=$2 + + newitems= + for nit in $items; do + if [ "$nit" != "$domain" ]; then + newitems="$newitems $nit" + fi + done + + echo "$newitems" +} + +set_count() +{ + items=$1 + + count="0" + for item in $items; do + count=$((count+1)) + done + + echo $count +} + +set_head() +{ + items=$1 + + for item in $items; do + echo $item + return 0 + done +} + +remove_shutdown_domains() +{ + uri=$1 + domains=$2 + + newlist= + for dom in $domains; do + guest_is_on "$uri" "$dom" 2>&1 > /dev/null || return + if "$guest_running"; then + newlist="$newlist $dom" + fi + done + + echo "$newlist" +} + +notify_shutdown_domains() +{ + uri=$1 + all=$2 + running=$3 + + for dom in $all; do + found=false + for run in $running; do + if [ $dom = $run ]; then + found=true + break + fi + done + + if ! "$found"; then + name=$(guest_name "$uri" "$dom") + eval_gettext "Shutdown of guest \$name complete." + echo + fi + done +} + + stop() { # last stop was not followed by start [ -f "$LISTFILE" ] && return 0 @@ -260,14 +382,12 @@ stop() { set -f for uri in $URIS; do set +f - eval_gettext "Running guests on \$uri URI: " - if [ "x$uri" = xdefault ] && [ ! -x "$libvirtd" ]; then - gettext "libvirtd not installed; skipping this URI."; echo - continue - fi + test_connect "$uri" || continue + + eval_gettext "Running guests on \$uri URI: " - list=$(list_guests "$uri") + list=$(list_guests "$uri" "all") if [ $? -eq 0 ]; then empty=true for uuid in $list; do @@ -275,13 +395,45 @@ stop() { printf %s "$(guest_name "$uri" "$uuid")" empty=false done + if "$empty"; then - gettext "no running guests."; echo + gettext "no running guests." + fi + echo + fi + + if "$suspending"; then + transient=$(list_guests "$uri" "no") + if [ $? -eq 0 ]; then + empty=true + for uuid in $transient; do + if "$empty"; then + eval_gettext "Not suspending transient domains on URI: \$uri: " + empty=false + else + printf ", " + fi + printf %s "$(guest_name "$uri" "$uuid")" + done + # reload domain list to contain only persistent domains + list=$(list_guests "$uri" "yes") + if [ $? -ne 0 ]; then + eval_gettext "Failed to list persistent domains on \$uri" + echo + RETVAL=1 + return + fi else + gettext "Failed to list transient domains" echo - echo "$uri" "$list" >>"$LISTFILE" + RETVAL=1 + return fi fi + + if [ -n "$list" ]; then + echo "$uri" "$list" >>"$LISTFILE" + fi done set +f @@ -292,13 +444,39 @@ stop() { eval_gettext "Shutting down guests on \$uri URI..."; echo fi - for guest in $list; do - if "$suspending"; then - suspend_guest "$uri" "$guest" - else - shutdown_guest "$uri" "$guest" - fi - done + if [ "$PARALLEL_SHUTDOWN" -gt 1 ] && + ! "$suspending"; then + on_shutdown= + timeout=$SHUTDOWN_TIMEOUT + while [ $(set_count "$on_shutdown") -gt "0" ] || + [ $(set_count "$list") -gt "0" ]; do + while [ $(set_count "$on_shutdown") -lt "$PARALLEL_SHUTDOWN" ] && + [ $(set_count "$list") -gt "0" ]; do + domain=$(set_head "$list") + shutdown_guest_async "$uri" "$domain" + on_shutdown=$(set_add "$domain" "$on_shutdown"); + list=$(set_remove "$domain" "$list"); + done + sleep 1 + timeout=$((timeout - 1)) + if [ $timeout -le 0 ]; then + eval_gettext "Timeout expired while shutting down domains"; echo + RETVAL=1 + return + fi + on_shutdown_old=$on_shutdown + on_shutdown=$(remove_shutdown_domains "$uri" "$on_shutdown" || return) + notify_shutdown_domains "$uri" "$on_shutdown_old" "$on_shutdown" + done + else + for guest in $list; do + if "$suspending"; then + suspend_guest "$uri" "$guest" + else + shutdown_guest "$uri" "$guest" + fi + done + fi done <"$LISTFILE" rm -f "$VAR_SUBSYS_LIBVIRT_GUESTS" diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf index 9b8b64f..e16af4f 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -10,7 +10,8 @@ # libvirtd #ON_BOOT=start -# number of seconds to wait between each guest start +# number of seconds to wait between each guest start. Set to 0 to allow parallel +# startup. #START_DELAY=0 # action taken on host shutdown @@ -23,7 +24,12 @@ # value suitable for your guests. #ON_SHUTDOWN=suspend -# number of seconds we're willing to wait for a guest to shut down +# If set to non-zero, shutdown will suspend domains concurently. Number of domains +# on shutdown at any time will not exceed number set in this variable. +#PARALLEL_SHUTDOWN=0 + +# number of seconds we're willing to wait for a guest to shut down. If parallel +# shutdown is enabled, this timeout applies as a timeout for shutting down all guests. #SHUTDOWN_TIMEOUT=0 # If non-zero, try to bypass the file system cache when saving and -- 1.7.3.4

2 2

[libvirt] non-TLS spice connections
by Christophe Fergeau 22 Feb '12

22 Feb '12

Hey, I recently setup ovirt/vdsm on one of my boxes. For some reason spice TLS was disabled through spice_tls = no in /etc/libvirt/qemu.conf. Then I created a VM, started it, and had troubles connecting to it with spicec. After investigating (thanks djasa), I realized that qemu was started with some encrypted SPICE channels but with no TLS port configured, which explained why I couldn't connect. https://bugzilla.redhat.com/show_bug.cgi?id=790436 was filed against libvirt about this, but now we are wondering how to best fix things in libvirt. What is currently happening is that libvirt doesn't warn when a domain has <channel name='main' mode='secure'/> with spice_tls = no in qemu.conf, and it adds the corresponding tls-channel=main to qemu command-line, but doesn't set a TLS port (if one is set it's silently ignored). There are at least two ways of solving this problem in libvirt: * either the current behaviour is kept, but "tls-channel=main" is not added to qemu command line when spice-tls is disabled. The drawback of this is that some security options that have been explicitly set in the domain XML are silently ignored * or the current behaviour is changed, and in this situation (SPICE secure channels in the XML, but TLS disabled in qemu.conf), libvirt errors out, which would change the current behaviour. This has been discussed on the libvirt mailing list (cc'ed) in this thread: https://www.redhat.com/archives/libvir-list/2012-February/msg00656.html Before making a decision, we were wondering what behaviour oVirt would expect in this case (error or silently ignoring the secure channels), and if a setup with spice_tls = no in /etc/libvirt/qemu.conf is something widely deployed that you have to support, or if it's more of an experimental feature at this point. Thanks for any input you can give on this matter, Christophe

2 3

[libvirt] [PATCH] caps: Improve error if passed an unknown arch
by Cole Robinson 22 Feb '12

22 Feb '12

Previously we would have: "os type 'hvm' & arch 'idontexist' combination is not supported" Now we get "No guest options available for arch 'idontexist'" or if options available but guest OS type not applicable: "No os type 'xen' available for arch 'x86_64'" --- src/conf/capabilities.c | 28 ++++++++++++++++++++++++---- src/conf/capabilities.h | 9 ++++++--- src/conf/domain_conf.c | 13 +++++++++++-- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index d44ce1b..542bf03 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -497,6 +497,26 @@ virCapabilitiesAddGuestFeature(virCapsGuestPtr guest, return NULL; } +/** + * virCapabilitiesSupportsGuestArch: + * @caps: capabilities to query + * @arch: Architecture to search for (eg, 'i686', 'x86_64') + * + * Returns non-zero if the capabilities support the + * requested architecture + */ +extern int +virCapabilitiesSupportsGuestArch(virCapsPtr caps, + const char *arch) +{ + int i; + for (i = 0 ; i < caps->nguests ; i++) { + if (STREQ(caps->guests[i]->arch.name, arch)) + return 1; + } + return 0; +} + /** * virCapabilitiesSupportsGuestOSType: @@ -520,7 +540,7 @@ virCapabilitiesSupportsGuestOSType(virCapsPtr caps, /** - * virCapabilitiesSupportsGuestOSType: + * virCapabilitiesSupportsGuestOSTypeArch: * @caps: capabilities to query * @ostype: OS type to search for (eg 'hvm', 'xen') * @arch: Architecture to search for (eg, 'i686', 'x86_64') @@ -529,9 +549,9 @@ virCapabilitiesSupportsGuestOSType(virCapsPtr caps, * requested operating system type */ extern int -virCapabilitiesSupportsGuestArch(virCapsPtr caps, - const char *ostype, - const char *arch) +virCapabilitiesSupportsGuestOSTypeArch(virCapsPtr caps, + const char *ostype, + const char *arch) { int i; for (i = 0 ; i < caps->nguests ; i++) { diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 38d07c4..421030d 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -237,12 +237,15 @@ virCapabilitiesAddGuestFeature(virCapsGuestPtr guest, int toggle); extern int +virCapabilitiesSupportsGuestArch(virCapsPtr caps, + const char *arch); +extern int virCapabilitiesSupportsGuestOSType(virCapsPtr caps, const char *ostype); extern int -virCapabilitiesSupportsGuestArch(virCapsPtr caps, - const char *ostype, - const char *arch); +virCapabilitiesSupportsGuestOSTypeArch(virCapsPtr caps, + const char *ostype, + const char *arch); extern const char * diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 85a2058..b0c3fa6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7581,9 +7581,18 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def->os.arch = virXPathString("string(./os/type[1]/@arch)", ctxt); if (def->os.arch) { - if (!virCapabilitiesSupportsGuestArch(caps, def->os.type, def->os.arch)) { + if (!virCapabilitiesSupportsGuestArch(caps, def->os.arch)) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, - _("os type '%s' & arch '%s' combination is not supported"), + _("No guest options available for arch '%s'"), + def->os.arch); + goto error; + } + + if (!virCapabilitiesSupportsGuestOSTypeArch(caps, + def->os.type, + def->os.arch)) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("No os type '%s' available for arch '%s'"), def->os.type, def->os.arch); goto error; } -- 1.7.7.5

2 2

[libvirt] Migration failure related to EOF from Monitor
by Shradha Shah 22 Feb '12

22 Feb '12

Hello All, I am trying to migrate a KVM guest while implementing the patches for PCI-Passthrough of SRIOV Vf's and I repeatedly see the following error: [root@c6100k cwd]# virsh migrate --live dibenchvm1 qemu+ssh://c6100l.uk.level5networks.com/system error: operation failed: migration job: unexpectedly failed I have turned on debugging in /etc/libvirt/libvirtd.conf and I see the following debug in /var/log/libvirt/libvirtd.log 10:37:26.632: 2449: error : qemuMonitorIO:584 : internal error End of file from monitor 10:37:26.632: 2449: debug : qemuMonitorIO:617 : Error on monitor internal error End of file from monitor 10:37:26.632: 2449: debug : virEventPollUpdateHandle:145 : Update handle w=21 e=12 10:37:26.632: 2449: debug : virEventPollInterruptLocked:676 : Skip interrupt, 1 -1497479264 10:37:26.632: 2449: debug : qemuMonitorIO:640 : Triggering EOF callback 10:37:26.632: 2449: debug : qemuProcessHandleMonitorEOF:125 : Received EOF on 0x7f588c003540 'dibenchvm1' 10:37:26.632: 2449: debug : qemuProcessStop:3271 : Shutting down VM 'dibenchvm1' pid=18739 migrated=0 10:37:26.632: 2449: debug : qemuMonitorClose:765 : mon=0x7f588c00c7f0 10:37:26.632: 2449: debug : virEventPollRemoveHandle:172 : Remove handle w=21 10:37:26.633: 2449: debug : virEventPollRemoveHandle:185 : mark delete 9 20 10:37:26.633: 2449: debug : virEventPollInterruptLocked:676 : Skip interrupt, 1 -1497479264 10:37:26.633: 2449: debug : qemuProcessKill:3217 : vm=dibenchvm1 pid=18739 gracefully=0 10:37:26.633: 2449: debug : qemuProcessAutoDestroyRemove:3736 : vm=dibenchvm1 uuid=a4452511-0f97-734a-dbcc-f4c66f821956 10:37:26.633: 2449: debug : virSecurityDACRestoreSecurityAllLabel:504 : Restoring security label on dibenchvm1 migrated=0 May I ask for suggestions on how I can debug the monitor and find out the reason why the qemu monitor dies? Many Thanks, Regards, Shradha Shah

3 2

Re: [libvirt] [Qemu-devel] [PATCH v5 12/12] suspend: add qmp events
by Gerd Hoffmann 22 Feb '12

22 Feb '12

On 02/17/12 18:33, Luiz Capitulino wrote: > On Wed, 15 Feb 2012 11:28:21 +0100 > Gerd Hoffmann <kraxel(a)redhat.com> wrote: > >> Send qmp events on suspend and wakeup so libvirt >> has a chance to track the vm state. [ added libvirt to Cc:, leaving full context. this is about qmp events when the guest enters/leaves s3 ]. >> Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> >> --- >> monitor.c | 6 ++++++ >> monitor.h | 2 ++ >> vl.c | 15 +++++++++++++++ >> 3 files changed, 23 insertions(+), 0 deletions(-) >> >> diff --git a/monitor.c b/monitor.c >> index aadbdcb..e6f5fad 100644 >> --- a/monitor.c >> +++ b/monitor.c >> @@ -485,6 +485,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) >> case QEVENT_BLOCK_JOB_CANCELLED: >> event_name = "BLOCK_JOB_CANCELLED"; >> break; >> + case QEVENT_SUSPEND: >> + event_name = "SUSPEND"; >> + break; >> + case QEVENT_WAKEUP: >> + event_name = "WAKEUP"; >> + break; >> default: >> abort(); >> break; >> diff --git a/monitor.h b/monitor.h >> index b72ea07..9df3bab 100644 >> --- a/monitor.h >> +++ b/monitor.h >> @@ -38,6 +38,8 @@ typedef enum MonitorEvent { >> QEVENT_SPICE_DISCONNECTED, >> QEVENT_BLOCK_JOB_COMPLETED, >> QEVENT_BLOCK_JOB_CANCELLED, >> + QEVENT_SUSPEND, >> + QEVENT_WAKEUP, >> QEVENT_MAX, >> } MonitorEvent; >> >> diff --git a/vl.c b/vl.c >> index bfdcb7c..570ea05 100644 >> --- a/vl.c >> +++ b/vl.c >> @@ -1416,6 +1416,7 @@ static void qemu_system_suspend(void) >> { >> pause_all_vcpus(); >> notifier_list_notify(&suspend_notifiers, NULL); >> + monitor_protocol_event(QEVENT_SUSPEND, NULL); >> is_suspended = true; >> } >> >> @@ -1436,12 +1437,26 @@ void qemu_register_suspend_notifier(Notifier *notifier) >> >> void qemu_system_wakeup_request(WakeupReason reason) >> { >> + static const char *names[] = { >> + [QEMU_WAKEUP_REASON_OTHER] = "other", >> + [QEMU_WAKEUP_REASON_RTC] = "rtc", >> + [QEMU_WAKEUP_REASON_PMTIMER] = "pmtimer", > > Is the reason really important for mngt? Can we just leave it out? I assumed the wakeup reason could be useful, but dunno. Zapping the code is no problem of course. Lets ask mgmt aka libvirt folks ;) cheers, Gerd >> + }; >> + const char *name; >> + QObject *data; >> + >> if (!is_suspended) { >> return; >> } >> if (!(wakeup_reason_mask & (1 << reason))) { >> return; >> } >> + >> + name = (reason < ARRAY_SIZE(names)) ? names[reason] : "unknown"; >> + data = qobject_from_jsonf("{ 'reason': %s }", name); >> + monitor_protocol_event(QEVENT_WAKEUP, data); >> + qobject_decref(data); >> + >> notifier_list_notify(&wakeup_notifiers, &reason); >> reset_requested = 1; >> qemu_notify_event(); >

3 3

[libvirt] [PATCH] virsh: Enhance list command to ease creation of shell scripts
by Peter Krempa 22 Feb '12

22 Feb '12

This patch adds new options to the "virsh list" command enabling filtering of persistent and transient domains along with the option to print only UUIDs or names of domains instead of printing the table. Option --name prints domain names (one per line) instead of the default table. Similarly --uuid prints domain's UUID. The option --table is an alias for the default behavior. Aditionaly --persistent and/or --transient may be specified to filter the output of domains. --- tools/virsh.c | 176 ++++++++++++++++++++++++++++++++++++++++-------------- tools/virsh.pod | 20 ++++++- 2 files changed, 148 insertions(+), 48 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 66ba61c..10160de 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -888,6 +888,11 @@ static const vshCmdInfo info_list[] = { static const vshCmdOptDef opts_list[] = { {"inactive", VSH_OT_BOOL, 0, N_("list inactive domains")}, {"all", VSH_OT_BOOL, 0, N_("list inactive & active domains")}, + {"transient", VSH_OT_BOOL, 0, N_("list transient domains")}, + {"persistent", VSH_OT_BOOL, 0, N_("list persistent domains")}, + {"uuid", VSH_OT_BOOL, 0, N_("list uuid's only")}, + {"name", VSH_OT_BOOL, 0, N_("list domain names only")}, + {"table", VSH_OT_BOOL, 0, N_("list table (default)")}, {"managed-save", VSH_OT_BOOL, 0, N_("mark domains with managed save state")}, {"title", VSH_OT_BOOL, 0, N_("show short domain description")}, @@ -905,13 +910,41 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) char **names = NULL; int maxname = 0; bool managed = vshCommandOptBool(cmd, "managed-save"); - bool desc = vshCommandOptBool(cmd, "title"); + bool optTitle = vshCommandOptBool(cmd, "title"); + bool optTable = vshCommandOptBool(cmd, "table"); + bool optUUID = vshCommandOptBool(cmd, "uuid"); + bool optName = vshCommandOptBool(cmd, "name"); + bool optPersistent = vshCommandOptBool(cmd, "persistent"); + bool optTransient = vshCommandOptBool(cmd, "transient"); + bool persistUsed = true; + virDomainPtr dom = NULL; char *title; + char uuid[VIR_UUID_STRING_BUFLEN]; int state; + int persistent; bool ret = false; inactive |= all; + /* process arguments */ + if (!optPersistent && !optTransient) { + optPersistent = true; + optTransient = true; + persistUsed = false; + } + + if ((optTable && optName) || + (optTable && optUUID) || + (optName && optUUID)) { + vshError(ctl, "%s", + _("Only one argument from --table, --name and --uuid" + "may be specified.")); + return false; + } + + if (!optUUID && !optName) + optTable = true; + if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -924,14 +957,15 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (maxid) { ids = vshMalloc(ctl, sizeof(int) * maxid); - if ((maxid = virConnectListDomains(ctl->conn, &ids[0], maxid)) < 0) { + if ((maxid = virConnectListDomains(ctl->conn, ids, maxid)) < 0) { vshError(ctl, "%s", _("Failed to list active domains")); goto cleanup; } - qsort(&ids[0], maxid, sizeof(int), idsorter); + qsort(ids, maxid, sizeof(int), idsorter); } } + if (inactive) { maxname = virConnectNumOfDefinedDomains(ctl->conn); if (maxname < 0) { @@ -941,7 +975,9 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (maxname) { names = vshMalloc(ctl, sizeof(char *) * maxname); - if ((maxname = virConnectListDefinedDomains(ctl->conn, names, maxname)) < 0) { + if ((maxname = virConnectListDefinedDomains(ctl->conn, + names, + maxname)) < 0) { vshError(ctl, "%s", _("Failed to list inactive domains")); goto cleanup; } @@ -950,77 +986,125 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } } - if (desc) { - vshPrintExtra(ctl, "%-5s %-30s %-10s %s\n", _("Id"), _("Name"), _("State"), _("Title")); - vshPrintExtra(ctl, "-----------------------------------------------------------\n"); - } else { - vshPrintExtra(ctl, " %-5s %-30s %s\n", _("Id"), _("Name"), _("State")); - vshPrintExtra(ctl, "----------------------------------------------------\n"); + /* print table header in legacy mode */ + if (optTable) { + vshPrintExtra(ctl, " %-5s %-30s %-10s", + _("Id"), _("Name"), _("State")); + if (optTitle) + vshPrintExtra(ctl, "%-20s", _("Title")); + + vshPrintExtra(ctl, "\n" + "-----------------------------------------------------------\n"); } for (i = 0; i < maxid; i++) { - virDomainPtr dom = virDomainLookupByID(ctl->conn, ids[i]); + dom = virDomainLookupByID(ctl->conn, ids[i]); /* this kind of work with domains is not atomic operation */ if (!dom) continue; - if (desc) { - if (!(title = vshGetDomainDescription(ctl, dom, true, 0))) + if (persistUsed) { + persistent = virDomainIsPersistent(dom); + if (persistent < 0) { + vshError(ctl, "%s", + _("Failed to determine domain's persistent state")); goto cleanup; + } - vshPrint(ctl, "%-5d %-30s %-10s %s\n", - virDomainGetID(dom), - virDomainGetName(dom), - _(vshDomainStateToString(vshDomainState(ctl, dom, NULL))), - title); - VIR_FREE(title); - } else { - vshPrint(ctl, " %-5d %-30s %s\n", - virDomainGetID(dom), - virDomainGetName(dom), - _(vshDomainStateToString(vshDomainState(ctl, dom, NULL)))); + if ((persistent && !optPersistent) || + (!persistent && !optTransient)) { + virDomainFree(dom); + dom = NULL; + continue; + } } + + if (optTable) { + vshPrint(ctl, " %-5d %-30s %-10s", + virDomainGetID(dom), + virDomainGetName(dom), + _(vshDomainStateToString(vshDomainState(ctl, dom, NULL)))); + + if (optTitle) { + if (!(title = vshGetDomainDescription(ctl, dom, true, 0))) + goto cleanup; + + vshPrint(ctl, "%-20s", title); + VIR_FREE(title); + } + + vshPrint(ctl, "\n"); + } else if (optUUID) { + if (virDomainGetUUIDString(dom, uuid) < 0) { + vshError(ctl, "%s", + _("Failed to get domain's UUID")); + goto cleanup; + } + vshPrint(ctl, "%s\n", uuid); + } else if (optName) { + vshPrint(ctl, "%s\n", virDomainGetName(dom)); + } + virDomainFree(dom); + dom = NULL; } + for (i = 0; i < maxname; i++) { - virDomainPtr dom = virDomainLookupByName(ctl->conn, names[i]); + dom = virDomainLookupByName(ctl->conn, names[i]); /* this kind of work with domains is not atomic operation */ - if (!dom) { - VIR_FREE(names[i]); + if (!dom) continue; - } - state = vshDomainState(ctl, dom, NULL); - if (managed && state == VIR_DOMAIN_SHUTOFF && - virDomainHasManagedSaveImage(dom, 0) > 0) - state = -2; + if (!optPersistent) { + virDomainFree(dom); + dom = NULL; + continue; + } - if (desc) { - if (!(title = vshGetDomainDescription(ctl, dom, true, 0))) - goto cleanup; + if (optTable) { + state = vshDomainState(ctl, dom, NULL); + if (managed && state == VIR_DOMAIN_SHUTOFF && + virDomainHasManagedSaveImage(dom, 0) > 0) + state = -2; - vshPrint(ctl, "%-5s %-30s %-10s %s\n", - "-", - names[i], - state == -2 ? _("saved") : _(vshDomainStateToString(state)), - title); - VIR_FREE(title); - } else { - vshPrint(ctl, " %-5s %-30s %s\n", + vshPrint(ctl, " %-5s %-30s %-10s", "-", names[i], state == -2 ? _("saved") : _(vshDomainStateToString(state))); - } - virDomainFree(dom); - VIR_FREE(names[i]); + if (optTitle) { + if (!(title = vshGetDomainDescription(ctl, dom, true, 0))) + goto cleanup; + + vshPrint(ctl, "%-20s", title); + VIR_FREE(title); + } + + vshPrint(ctl, "\n"); + } else if (optUUID) { + if (virDomainGetUUIDString(dom, uuid) < 0) { + vshError(ctl, "%s", + _("Failed to get domain's UUID")); + goto cleanup; + } + vshPrint(ctl, "%s\n", uuid); + } else if (optName) { + vshPrint(ctl, "%s\n", names[i]); + } + + virDomainFree(dom); + dom = NULL; } ret = true; cleanup: + if (dom) + virDomainFree(dom); VIR_FREE(ids); + for (i = 0; i < maxname; i++) + VIR_FREE(names[i]); VIR_FREE(names); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index 0d5a41d..aa29c00 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -280,6 +280,8 @@ The XML also show the NUMA topology information if available. Inject NMI to the guest. =item B<list> [I<--inactive> | I<--all>] [I<--managed-save>] [I<--title>] + [I<--name> | <I--table> | <I--uuid>] [I<--persistent>] + [I<--transient>] Prints information about existing domains. If no options are specified it prints out information about running domains. @@ -348,10 +350,24 @@ crashed. If I<--managed-save> is specified, then domains that have managed save state (only possible if they are in the B<shut off> state) will -instead show as B<saved> in the listing. +instead show as B<saved> in the listing. This flag is usable only with the +default I<--table> output. + +If I<--name> is specified, domain names are printed instead of the table +formated one per line. If I<--uuid> is specified domain's UUID's are printed +instead of names. Flag I<--table> specifies that the legacy table-formated +output should be used. This is the default. All of these are mutually +exclusive. + +Flag I<--persistent> specifies that persistent domains should be printed. +Similarly I<--transiet> enables output of transient domains. These flags +may be combined. Default behavior is as though both were specifiedi (Although +if any of these flags is specified, the check for the persistence state is done +and may fail. If none of these flags is specified, the check is skipped). If I<--title> is specified, then the domain note is printed. The output then -the output looks as follows. +the output looks as follows. This flag is usable only with the default +I<--table> output. B<virsh> list --title Id Name State Title -- 1.7.3.4

3 3

[libvirt] [PATCH] configure: Define program name if not found
by Michal Privoznik 22 Feb '12

22 Feb '12

AC_CHECK_PROG checks for program in given path. However, if it doesn't exists, [variable] is set to [value-if-not-found]. We don't want this to be the empty string in case of 'modprobe' and 'scrub' as we want to fallback to runtime detection. --- configure.ac | 4 ++-- src/util/pci.c | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 4493b94..732f4fe 100644 --- a/configure.ac +++ b/configure.ac @@ -211,11 +211,11 @@ AC_PATH_PROG([UDEVADM], [udevadm], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([UDEVSETTLE], [udevsettle], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) -AC_PATH_PROG([MODPROBE], [modprobe], [], +AC_PATH_PROG([MODPROBE], [modprobe], [modprobe], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([OVSVSCTL], [ovs-vsctl], [ovs-vsctl], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) -AC_PATH_PROG([SCRUB], [scrub], [], +AC_PATH_PROG([SCRUB], [scrub], [scrub], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"], diff --git a/src/util/pci.c b/src/util/pci.c index 633dcd8..c660e8d 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -40,11 +40,6 @@ #include "virterror_internal.h" #include "virfile.h" -/* avoid compilation breakage on some systems */ -#ifndef MODPROBE -# define MODPROBE "modprobe" -#endif - #define PCI_SYSFS "/sys/bus/pci/" #define PCI_ID_LEN 10 /* "XXXX XXXX" */ #define PCI_ADDR_LEN 13 /* "XXXX:XX:XX.X" */ -- 1.7.3.4

2 2

[libvirt] [PATCH] util: Fix virFileAccessibleAs return path from parent
by Michal Privoznik 22 Feb '12

22 Feb '12

Despite documentation, if we do fork() parent always returns -1 even if file is accessible. Which is wrong obviously. --- src/util/util.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 3406b7b..04a0e79 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -724,8 +724,12 @@ virFileAccessibleAs(const char *path, int mode, return -1; } - errno = status; - return -1; + if (!status) { + errno = status; + return -1; + } + + return 0; } /* child. -- 1.7.3.4

2 2

[libvirt] [PATCH 0/2] VMware Workstation domainXMLFromNative support
by Jean-Baptiste Rouault 22 Feb '12

22 Feb '12

These patches add domainXMLFromNative to the vmware driver and add support for more network configurations in vmx files Jean-Baptiste Rouault (2): vmware: implement domainXMLFromNative vmx: Better Workstation vmx handling src/vmware/vmware_driver.c | 31 +++++++++++++++++++++++++++++++ src/vmx/vmx.c | 29 ++++++++++++++++++----------- 2 files changed, 49 insertions(+), 11 deletions(-) -- 1.7.9

2 5

[libvirt] Fwd: a question about sanlock
by Alex Jia 22 Feb '12

22 Feb '12

Hi Daniel, Thanks for your quick reply, from safety point of view, yes, libvirt should exit, but, your alternative solution is more friendly for users, however, I haven't any idea about this now, maybe, others want to do this, so forward it to libvirt-list. Thanks & Regards, Alex ----- Forwarded Message ----- From: "Daniel P. Berrange" <berrange(a)redhat.com> To: "Alex Jia" <ajia(a)redhat.com> Cc: libvirt-users(a)redhat.com Sent: Wednesday, February 22, 2012 4:19:28 PM Subject: Re: [libvirt] a question about sanlock On Wed, Feb 22, 2012 at 02:04:09AM -0500, Alex Jia wrote: > Hi Daniel, > I got a question about lock manager, if I enable 'sanlock' in qemu.conf and > uncomment 'auto_disk_leases = 1' in qemu-sanlock.conf then restart libvirtd > service, libvirtd will be dead, I know I should also uncomment 'host_id = 1' > in qemu-sanlock.conf, because I enable 'auto_disk_leases'. The question is > the libvirtd must die due to a error users configuration? or could we give > some warning information instead of libvirtd die? I think this is a safety issue - if someone is deploying libvirt in an scenario where they want locking, then we must be very careful not to accidentally run without locking. So if someone accidentally mis-configures one of their libvirtd instances to not have any host_id parameter, I felt the only safe thing todo was to exit. An alternative would be to allow libvirtd to start, but then make sure it refuses to start any guests. I'm happy to take patches for the latter if someone wants to... Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] Effect of cluster size on read write performance
by Pankaj Rawat 22 Feb '12

22 Feb '12

Hi all The cluster -size increase write performance when the qcow2 image is not expanded , surely with increase in cluster_size the disk space used increases but that is not my concern. Can anyone tell what is the effect of cluster size on read and write performance on qcow2 image after expantion? DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

2 1

[libvirt] virtio-win-0.1-22 balloon install fails on 2008R2
by sean darcy 21 Feb '12

21 Feb '12

Trying to install the virtio-win-0.1-22.iso balloon driver on Windows 2008R2: E:\Wlh\amd64>x:\microsoft\WinDDK\7600.16385.win7_wdk.100208-1538\tools\devcon\amd64\devcon.exe install BALLOON.inf PCI\VEN_1AF4&DEV_1002&SUBSYS_00051AF4&REV_00 Device node created. Install is complete when drivers are installed... Updating drivers for PCI\VEN_1AF4 from E:\Wlh\amd64\BALLOON.inf. devcon.exe failed. 'DEV_1002' is not recognized as an internal or external command, operable program or batch file. 'SUBSYS_00051AF4' is not recognized as an internal or external command, operable program or batch file. 'REV_00' is not recognized as an internal or external command, operable program or batch file. Any help appreciated. sean

2 2

[libvirt] [PATCH] esx: Correctly disable HTTP Expect header usage of libcurl
by Matthias Bolte 21 Feb '12

21 Feb '12

Adding "Expect:" to the header list stops libcurl from sending a Expect header at all. Before, a dummy Expect header was added that might confuse HTTP proxies and result in HTTP error code 417 being reported. --- src/esx/esx_vi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 14ad50a..6004aac 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -293,14 +293,14 @@ esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri) "Content-Type: text/xml; charset=UTF-8"); /* - * Add a dummy expect header to stop CURL from waiting for a response code + * Add an empty expect header to stop CURL from waiting for a response code * 100 (Continue) from the server before continuing the POST operation. * Waiting for this response would slowdown each communication with the * server by approx. 2 sec, because the server doesn't send the expected * 100 (Continue) response and the wait times out resulting in wasting * approx. 2 sec per POST operation. */ - curl->headers = curl_slist_append(curl->headers, "Expect: nothing"); + curl->headers = curl_slist_append(curl->headers, "Expect:"); if (curl->headers == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.7.4.1

2 2

[libvirt] [PATCH 0/6] (informational) conf support for <interface type='hostdev'>
by Laine Stump 21 Feb '12

21 Feb '12

This series of patches enhances the domain parser/formatter code to support a sort of "intelligent hostdev", i.e. PCI passthrough where device-type specific initialization is done prior to assigning the device to the guest, in particular to allow setting the MAC address and do 802.1QbX setup for network devices. Rather than adding all of the device-type specific config to <hostdev>, I accomplish this through adding a new type of <interface> element, type='hostdev'. When an interface is type='hostdev' the following is changed: * in the toplevel device, the managed attribute can be specified (with identical results as when it's specified in a <hostdev> * The <source> element can specify a pci address or usb address, just as can be done in <hostdev>. One notable difference is that the type of the address is specified directly in the source <address> element, rather than as an attribute of the toplevel device (that's how it's done for <hostdev>, but for <interface>, the toplevel element's type attribute is already used). These patches include only the parser/formatter, test (for domainschematest, and qemuxml2xmltest only), and doc changes; they still need to be hooked into the domain's device lists (a type=hostdev interface will reside in both the interface list (for configuration and memory management) and hostdev list (for attach/detach, and tracking of which devices are assigned)). I don't intend to push these patches until that part is also done, but some other people are doing work that depends on the changes to config format and data structures, so I'm sending these patches now both to unblock them, as well as to get feedback from everyone else on what needs to be changed. The first 4 patches are just setup for the real new code - they reorder and refactor existing code to allow greater re-use of existing code and easier plugin of the new code. Patch 5/6 is just a couple of lines, and patch 6/6 provides the new functionality.

2 18

[libvirt] Network not Persistent
by Shradha Shah 21 Feb '12

21 Feb '12

Hello All, I am currently working on patches for PCI-passthrough of SRIOV VF's and I am facing an issue with the network definition not being persistent. I am using a new forward mode = hostdev and the network xml is as follows: <network> <name>pci-passthrough-network</name> <uuid>81ff0d90-c91e-6742-64da-4a736edb9a8f</uuid> <forward mode="hostdev"> <pf dev="eth2"/> </forward> </network> Command line used is: # virsh net-define pci_passthrough_network.xml The network is defined successfully and I can use it at this point. But if I restart libvirt after defining the above network, I lose the network definition. After restart libvirt does not possess any knowledge of the above network. This does not happen when I use forward mode="bridge". I have cross referenced the function call path of networkDefine for both the forwarding modes and I can't seem to find the problem. Is there some function I am missing? May I ask for your help to solve this issue? Many Thanks, Regards, Shradha Shah

3 5

[libvirt] [PATCH] lib: Fix function documentation for virConnectListDomains
by Peter Krempa 21 Feb '12

21 Feb '12

Clarify the documentation of virConnectListDomains. --- src/libvirt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index a55d823..6294196 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1818,23 +1818,23 @@ error: virDispatchError(conn); return -1; } /** * virConnectListDomains: * @conn: pointer to the hypervisor connection * @ids: array to collect the list of IDs of active domains * @maxids: size of @ids * - * Collect the list of active domains, and store their ID in @maxids + * Collect the list of active domains, and store their IDs in array @ids * - * Returns the number of domain found or -1 in case of error + * Returns the number of domains found or -1 in case of error */ int virConnectListDomains(virConnectPtr conn, int *ids, int maxids) { VIR_DEBUG("conn=%p, ids=%p, maxids=%d", conn, ids, maxids); virResetLastError(); if (!VIR_IS_CONNECT(conn)) { virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); -- 1.7.3.4

2 1

[libvirt] [PATCH] virsh: Fix docs for list command
by Peter Krempa 21 Feb '12

21 Feb '12

Commit fad5cd210899dfde4afe36712754dc921c3f3051 introduced option to display domain's title in the list command output. There was a mistake in the virsh man page example for this command stating --note instead of --title. --- Pushed under trivial rule. tools/virsh.pod | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 6730b8b..0d5a41d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -353,7 +353,7 @@ instead show as B<saved> in the listing. If I<--title> is specified, then the domain note is printed. The output then the output looks as follows. -B<virsh> list --note +B<virsh> list --title Id Name State Title ----------------------------------------------- 0 Domain-0 running Mailserver 1 -- 1.7.3.4

1 0

[libvirt] [PATCH] daemon: Plug memory leak on remoteDispatchAuthList
by Alex Jia 21 Feb '12

21 Feb '12

Detected by valgrind. Leak is introuduced in commit fcdfa31. * daemon/remote.c (remoteDispatchAuthList): fix memory leak on failure path. * Actual result ==26844== 150,592 bytes in 9,602 blocks are definitely lost in loss record 735 of 738 ==26844== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==26844== by 0x36AEAFEDE7: __vasprintf_chk (in /lib64/libc-2.12.so) ==26844== by 0x36C3A59B03: virVasprintf (stdio2.h:199) ==26844== by 0x36C3A59BA7: virAsprintf (util.c:1827) ==26844== by 0x4335F5: remoteDispatchAuthListHelper (remote.c:2054) ==26844== by 0x36C3B10394: virNetServerProgramDispatch (virnetserverprogram.c:416) ==26844== by 0x36C3B11620: virNetServerHandleJob (virnetserver.c:164) ==26844== by 0x36C3A57AAB: virThreadPoolWorker (threadpool.c:144) ==26844== by 0x36C3A573C8: virThreadHelper (threads-pthread.c:161) ==26844== by 0x36AEE077F0: start_thread (in /lib64/libpthread-2.12.so) ==26844== by 0x36AEAE570C: clone (in /lib64/libc-2.12.so) Notes, the test is in a loop, so you will see a quite big leaks. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/remote.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 74a5f16..9018c15 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2054,6 +2054,7 @@ remoteDispatchAuthList(virNetServerPtr server ATTRIBUTE_UNUSED, if (virAsprintf(&ident, "pid:%lld,uid:%d", (long long) callerPid, callerUid) < 0) { virReportOOMError(); + VIR_FREE(ident); goto cleanup; } VIR_INFO("Bypass polkit auth for privileged client %s", ident); -- 1.7.1

2 4

[libvirt] Release of libvirt-0.9.10
by Daniel Veillard 21 Feb '12

21 Feb '12

As planned I made the release yesterday, it is tagged in git and available at: ftp://libvirt.org/libvirt/ both as tarball and signed rpms for Fedora 16. This is again a relatively large release with close to 300 commits, and we got a significant number of added feature in the last month, along with the usual improvement and bug fixes: Features: - Add support for sVirt in the LXC driver (Daniel P. Berrange) - block rebase: add new API virDomainBlockRebase (Eric Blake) - API: Add api to set and get domain metadata (Peter Krempa) - virDomainGetDiskErrors public API (Jiri Denemark) - conf: add rawio attribute to disk element of domain XML (Taku Izumi) - Add new public API virDomainGetCPUStats() (KAMEZAWA Hiroyuki) - Introduce virDomainPMSuspendForDuration API (Michal Privoznik) - resize: add virStorageVolResize() API (Zeeshan Ali (Khattak)) - Add a virt-host-validate command to sanity check HV config (Daniel P. Berrange) - Add new virDomainShutdownFlags API (Daniel P. Berrange) - QEMU guest agent support (Daniel P. Berrange) Documentation: - fix typo in python bindings (Eric Blake) - conf: small changes to comments in virDomainDeviceInfo (Laine Stump) - Clarify the purpose of domxml-from-native (Dave Allan) - Enhance documentation of the old-style boot configuration (Jiri Denemark) - virterror.c: Fix several spelling mistakes (Philipp Hahn) - Add detail to documentation on storage pools and volumes. (Dave Allan) - fill out rawio description (Laine Stump) - XenXs: Update documentation (Philipp Hahn) - reorder public header (Eric Blake) - tweak recent suspend API additions (Eric Blake) - Add missing docs for <viridian/> feature flag (Daniel P. Berrange) - fix virsh man page (Eric Blake) - fix a few small typos in formatdomain.html.in (Laine Stump) - src/datatypes.h: fix typo (Alon Levy) - Clarify semantics of virDomainMigrate{,ToURI}2 (Jiri Denemark) - Add missed RNG schema for interface (Osier Yang) - Add documentation new ways to access members of variables (Stefan Berger) - virsh: improve doMigrate function docs (Alex Jia) - standardize description of flags (Eric Blake) - Document Android application using libvirt (Michal Privoznik) Portability: - virpidfile: replace fopen/fwrite/fscanf with more portable version (Marc-André Lureau) - util: Do not use PRIx64 macro (Osier Yang) - Replace truncate() with ftruncate() (Daniel P. Berrange) - build: avoid gcc 4.7 warning about inlines (Eric Blake) - lxc: Fix build with AppArmor (Jiri Denemark) - Update gnulib to fix mingw64 compilation errors (Marc-André Lureau) - tests: virnettlscontexttest needs gnutls-2.6.0 (Philipp Hahn) - qemu: Silent bogus warning about unitialized variable (Jiri Denemark) - build: fix text regression (Eric Blake) - Add virt-host-validate.1 to Mingw32 RPM spec file list (Daniel P. Berrange) - build: fix missing include (Eric Blake) - qemu: support qmp on RHEL/CentOS qemu (Eric Blake) - util: Include stdint.h because of uint32_t (Michal Privoznik) - Cast pointer to int using intptr_t (Marc-André Lureau) - build: fix header order on mingw (Eric Blake) - errcode is typedef by mingw, rename an argument name (Marc-André Lureau) - Add missing virGetGroupName() (Marc-André Lureau) - build: skip lxc with too-old glibc (Eric Blake) - Remove dmidecode dependancy outside PC arches (Daniel Veillard) - build: fix bootstrap on fresh clone (Eric Blake) - tests: Add qemuxml2argv tests for PPC64 pseries machine (Michael Ellerman) - tests: Teach qemuxml2argvtest about spapr-vio addresses (Michael Ellerman) - Disable netcf if building without libvirtd (Daniel P. Berrange) - build: fix build on mingw with netcf available (Eric Blake) - build: avoid spurious compiler warning (Eric Blake) Bug Fixes: - rpc: Plug memory leaks on doRemoteOpen() failure path (Alex Jia) - GetCPUStats: fix overflow test (Lai Jiangshan) - python: Correct arguments number for migrateSetMaxSpeed (Osier Yang) - qemu: fix persistent setting of blkiodevice weights (Eric Blake) - qemu: Fix memory leak when building -cpu argument (Jiri Denemark) - security: Driver 'none' cannot create confined guests (Jiri Denemark) - seclabel: Do not output relabel attribute for type 'none' (Jiri Denemark) - virsh: Plug memory leak on cmdDesc (Alex Jia) - virsh: Do not check the input XML at virsh layer for cmdDetachDevice (Osier Yang) - On systems with dmidecode version 2.10 or older, (Prerna Saxena) - storage: Don't unsparsify images when cloning (Cole Robinson) - build: don't require avahi during install (Laine Stump) - pyhton: Don't link against libvirt_util.la (Michal Privoznik) - xen-xm: SIGSEGV in xenXMDomainDefineXML: filename (Philipp Hahn) - xen-xm: fix data loss in domain edit (Philipp Hahn) - virsh: Fix resource leak while listing inactive domains with titles (Peter Krempa) - xen_xm: Fix SIGSEGV in xenXMDomainDefineXML (Philipp Hahn) - qemu: Fix seamless spice migration (Jiri Denemark) - apparmor: Add missing comma (Jiri Denemark) - virsh: Avoid invalid read of size errors (Alex Jia) - qemu: eliminate "Ignoring open failure" when using root-squash NFS (Laine Stump) - conf: Plug memory on virDomainDiskDefParseXML (Alex Jia) - virsh: Plug memory leak on cmdUndefine (Alex Jia) - network: fix testsuite regression (Eric Blake) - network: Avoid memory leaks on networkBuildDnsmasqArgv (Alex Jia) - python: correct a copy-paste error (Alex Jia) - qemu: Don't jump to endjob if no job was even started (Michal Privoznik) - qemu: fix my typo at commit 74e034964c32edb1732d0ff7642f3977f3587d72 (Taku Izumi) - qemu: Fix segfault in qemuMonitorTextGetBlockInfo (Hendrik Schwartke) - tests: fix reversed comparisons (Eric Blake) - qemu: avoid double free of qemu help output (Eric Blake) - apparmor: Fix use of uninitialized random_data (Jiri Denemark) - storage: Fix any VolLookupByPath if we have an empty logical pool (Cole Robinson) - Don't bind mount onto a char device for /dev/ptmx in LXC (Daniel P. Berrange) - xen: Don't crash when we fail to init caps (Guido Günther) - xen: properly report out of memory when hvm_type is too small (Guido Günther) - threads: check for failure to set thread-local value (Eric Blake) - Fix rpc generator to anchor matches for method names (Daniel P. Berrange) - Fix startup of LXC containers with filesystems containing symlinks (Daniel P. Berrange) - qemu: Prohibit reattaching node device if it is in use (Osier Yang) - qemu: Don't break domain with 0:0:2.0 assigned to anything but VGA (Jiri Denemark) - Fixed dumpxml of <iotune> parameters (Martin Kletzander) - nwfilter: fix typing error in filter (Stefan Berger) - events: Return the correct number of registered events (Adam Litke) - uuid: fix off-by-one (Eric Blake) - build: fix virsh reformat fallout (Eric Blake) - stream: Check for stream EOF (Michal Privoznik) - Do not generate security_model when fs driver is anything but 'path' (Deepak C Shetty) - qemu: check for kvm availability before starting kvm guests (Laine Stump) - qemu: fix a typo on qemuDomainSetBlkioParameters (Alex Jia) - config: report error when script given for inappropriate interface type (Laine Stump) Improvements: - python: make other APIs share common {get, set}PyVirTypedParameter (Guannan Ren) - npiv: Auto-generate WWN if it's not specified (Osier Yang) - Remove single quotes from audit records (Marcelo Cerri) - domain: add implicit USB controller (Marc-André Lureau) - python: refactoring virTypedParameter conversion for NUMA tuning APIs (Guannan Ren) - qemu: make blkiodevice weights easier to read (Eric Blake) - sysinfo: simplify function signature (Eric Blake) - Populate /dev/std{in,out,err} symlinks in LXC containers (Daniel P. Berrange) - Update symbols file for virFileDirectFd/virFileWrapperFd rename (Daniel P. Berrange) - virsh: Fix flag semantics and docs for "desc" command (Peter Krempa) - qemu: Always use iohelper for domain save (Jiri Denemark) - qemu: Always use iohelper for dumping domain core (Jiri Denemark) - util: Generalize virFileDirectFd (Jiri Denemark) - Allow polkit auth for VNC and SSH users (Cole Robinson) - seclabel: make code and RNG match (Eric Blake) - maint: Add test output files to .gitignore (Peter Krempa) - tests: Fix build with -Werror (Jiri Denemark) - maint: consolidate several .gitignore files (Eric Blake) - util: refactor virFileOpenAs (Laine Stump) - util: rename netlink.[ch] to virnetlink.[ch] (D. Herrendoerfer) - virsh: add --graceful switch to destroy command (Laine Stump) - qemu: new GRACEFUL flag for virDomainDestroy w/ QEMU support (Laine Stump) - Added missing memory reporting into python bindings (Martin Kletzander) - python: use libvirt_util to avoid raw free (Eric Blake) - build: expand rule to cover testsuite (Eric Blake) - build: prohibit raw malloc and free (Eric Blake) - build: clean up CPPFLAGS/INCLUDES usage (Eric Blake) - command: allow merging stdout and stderr in string capture (Eric Blake) - maint: prune duplicate listings in AUTHORS (Eric Blake) - virsh: extension of virsh attach-disk for rawio (Taku Izumi) - Fixed connection definition for non-SELinux builds (Martin Kletzander) - Added RSS reporting (Martin Kletzander) - Added RSS information gathering into qemudGetProcessInfo (Martin Kletzander) - Set a security context on /dev and /dev/pts mounts (Daniel P. Berrange) - Add two new security label types (Daniel P. Berrange) - Re-add domain device seclabel parsing / formatting (Daniel P. Berrange) - Revert changes to sec label parsing (Daniel P. Berrange) - tests: dynamically replace dnsmasq path (Philipp Hahn) - xen_xs: name xendConfigVersion magic numbers (Philipp Hahn) - block rebase: initial qemu implementation (Eric Blake) - block rebase: wire up remote protocol (Eric Blake) - qemu: Add support for virDomainGetMetadata and virDomainSetMetadata (Peter Krempa) - virsh: Add support for modifying domain description and titles (Peter Krempa) - xml: Add element <title> to allow short description of domains (Peter Krempa) - build: add missing virStorageFileResize to libvirt_private.syms (Laine Stump) - build: add missing virCommandAddCap to libvirt_private.syms (Laine Stump) - daemon: Allow overriding NOFILES ulimit for the daemon as well (Michal Privoznik) - python: Add binding for virDomainGetDiskErrors (Jiri Denemark) - virsh: Implement domblkerror command (Jiri Denemark) - qemu: Implement virDomainGetDiskErrors (Jiri Denemark) - Remote protocol for virDomainGetDiskErrors (Jiri Denemark) - command: Fix ATTRIBUTE_UNUSED on virSetCapabilities (Michal Privoznik) - simplify block of codes (Alex Jia) - qemu: make qemu processes to retain rawio capability (Taku Izumi) - util: extend virExecWithHook() (Taku Izumi) - util: add functions to keep capabilities (Taku Izumi) - Implement virStorageVolResize() for FS backend (Zeeshan Ali (Khattak)) - resize: slightly alter signature (Eric Blake) - qemu: add "romfile" support to specify device boot ROM (Laine Stump) - qemu: (and conf) support rombar for network devices (Laine Stump) - conf: relocate rombar and boot order parse/format (Laine Stump) - conf: put all guest-related HostdevDef data in one object (Laine Stump) - xen: Don't add <console> to xml for dom0 (Cole Robinson) - remote handler for virDomainGetCPUStats() (KAMEZAWA Hiroyuki) - virsh: Expose new virDomainPMSuspendForDuration API (Michal Privoznik) - resize: implement remote protocol for virStorageVolResize() (Zeeshan Ali (Khattak)) - Return more error output if policykit auth fails. (Cole Robinson) - Add new error code VIR_ERROR_AUTH_CANCELLED (Cole Robinson) - Move virEmitXMLWarning into xml.h (Daniel P. Berrange) - Move virMacAddrXXX functions to src/util/virmacaddr.[ch] (Daniel P. Berrange) - Rename virXXXXMacAddr to virMacAddrXXX (Daniel P. Berrange) - qemu: parse and create -cpu ...,-kvmclock (Paolo Bonzini) - conf: add kvmclock timer (Paolo Bonzini) - qemu: do not create useless <cpu> element (Paolo Bonzini) - qemu: get arch name from <cpu> element (Paolo Bonzini) - qemu: detect arch correctly for KVM (Paolo Bonzini) - x86: add kvm32 and kvm64, update qemu64 (Paolo Bonzini) - qemu: parse -enable-kvm (Paolo Bonzini) - qemu: require qmp on new enough qemu (Eric Blake) - nwfilter: Rebuild filters only if new filter is different than current (Stefan Berger) - nwfilter: Force instantiation of filters upon driver reload (Stefan Berger) - qemu: Refactor qemuMonitorGetBlockInfo (Jiri Denemark) - Update VIRT_CONTROL audit record with pid. (Marcelo Cerri) - build: allow for 64-bit pid in daemon (Eric Blake) - daemon: convert virRun to virCommand (Eric Blake) - hash: minor touchups (Eric Blake) - Replace hashing algorithm with murmurhash (Daniel P. Berrange) - Rename hash.h and hash.c to virhash.h and virhash.c (Daniel P. Berrange) - Convert various virHash functions to use size_t / uint32 (Daniel P. Berrange) - Introduce new API for generating random numbers (Daniel P. Berrange) - schema: Relax schema for domain name (Peter Krempa) - storage: Support different wiping algorithms (Michal Privoznik) - lxc: export container=lxc-libvirt for systemd (Eric Blake) - Add virFileTouch for creating empty files (Daniel P. Berrange) - virsh: Expose new VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE flag (Michal Privoznik) - snapshots: Introduce VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE flag (Michal Privoznik) - qemu_agent: Create file system freeze and thaw functions (Michal Privoznik) - qemu: Emit bootindex even for direct boot (Jiri Denemark) - metadata: group metadata next to description (Eric Blake) - build: simplify xmlFreeNode usage (Eric Blake) - Allow custom metadata in domain configuration XML (Zeeshan Ali (Khattak)) - virCommandProcessIO(): make poll() usage more robust (Laszlo Ersek) - Allow choice of shutdown method via virsh (Daniel P. Berrange) - Wire up QEMU agent to reboot/shutdown APIs (Daniel P. Berrange) - hashtest: Initialize variable in virHashEqual test (Michal Privoznik) - Add test case for virHashEqual function (Stefan Berger) - Compare two hash tables for equality (Stefan Berger) - virsh: let domif-{get,set}link take target name (Taku Izumi) - maint: cleanup qemu capabilities (Eric Blake) - maint: enforce use of _LAST marker (Eric Blake) - API: make declaration of _LAST enum values conditional (Eric Blake) - error: drop old-style error reporting (Eric Blake) - util: use new virTypedParameter helpers (Eric Blake) - util: add new file for virTypedParameter utils (Eric Blake) - lxc: use live/config helper (Eric Blake) - build: silence some compiler warnings from gnulib (Eric Blake) - Rename APIs for fetching UNIX socket credentials (Daniel P. Berrange) - Add virGetGroupName to convert from GID to group name (Daniel P. Berrange) - Remove duplicate call to virNetSASLSessionGetIdentity (Daniel P. Berrange) - Also retrieve GID from SO_PEERCRED (Daniel P. Berrange) - Added capability checking for block <iotune> setting. (Martin Kletzander) - qemu: Introduce inactive PCI device list (Osier Yang) - Permission change for systemtap examples. (Martin Kletzander) - Add new attribute wrpolicy to <driver> element (Deepak C Shetty) - tests: avoid dirname in tests (Eric Blake) - qemu: Add support for host CPU modes (Jiri Denemark) - Taint domains configured with cpu mode=host-passthrough (Jiri Denemark) - cpu: Update guest CPU in host-* mode (Jiri Denemark) - Add support for cpu mode attribute (Jiri Denemark) - cpu: Optionally forbid fallback CPU models (Jiri Denemark) - tests: Print XML file name in verbose CPU test (Jiri Denemark) - docs: Expose alias tag in domain RNG schema (Osier Yang) - docs: Add readonly to filesystem RNG schema (Osier Yang) - conf: Remove do-nothing validation functions (Michael Ellerman) - Make drive unit attribute optional in the XML schema (Michael Ellerman) - virsh domiflist: change output (Taku Izumi) - export virNetDevGetVirtualFunctions as a private symbol (Paolo Bonzini) - virsh: Two new fields for command domblklist (Osier Yang) - qemu: Support copy on read for disk (Osier Yang) - Added check for maximum number of vcpus exceeding topology limit (Martin Kletzander) - build: update to latest gnulib (Eric Blake) - Rsync keymaps.csv file with GTK-VNC (Daniel P. Berrange) - Re-write LXC controller end-of-file I/O handling yet again (Daniel P. Berrange) - Allow 10 chars for domain IDs & 30 chars for names in virsh list (Daniel P. Berrange) - virsh: New command print summary of all virtual interfaces (Osier Yang) - Added new option to virsh net-dumpxml called --inactive (Shradha Shah) - Functionality to implicitly get interface pool from SR-IOV PF. (Shradha Shah) - Adding the element pf to network xml. (Shradha Shah) - Added Function virNetDevGetVirtualFunctions (Shradha Shah) - Added function pciSysfsFile to enable access to the PCI SYSFS files. (Shradha Shah) - Add test cases for new ways to access variables in filters (Stefan Berger) - Address side effects of accessing vars via index (Stefan Berger) - Add access to elements of variables via index (Stefan Berger) - Introduce possibility to have an iterator per variable (Stefan Berger) - Optimize the elements the iterator visits. (Stefan Berger) - apparmor: Mark pid parameter as unused (Jiri Denemark) - Change security driver APIs to use virDomainDefPtr instead of virDomainObjPtr (Daniel P. Berrange) - snapshot: allow reuse of existing files in disk snapshot (Eric Blake) - PolicyKit: Check auth before asking client to obtain it (Jim Fehlig) - qemu: add new disk device='lun' for bus='virtio' & type='block' (Laine Stump) - qemu: add capabilities flags related to SG_IO (Laine Stump) - qemu: one more client to live/config helper (Eric Blake) Cleanups: - python: drop unused function (Eric Blake) - python: drop redundant function (Eric Blake) - Replace TAB with white spaces (Osier Yang) - qemu: Clenup qemuDomainSetInterfaceParameters (Michal Privoznik) - conf: remove duplicate call to VIR_FREE(info->alias) (Laine Stump) - xml: fix struct typos (Eric Blake) - Remove tabs from libvirt_public.syms & enforce it (Daniel P. Berrange) So thanks everybody for your contributions for this release, be it ideas, patches, or reports, enjoy, and let's shoot for another release within one month, keep the patches flowing ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

5 12

[libvirt] [Bug] [vbox-driver] attach-device
by Gravok 20 Feb '12

20 Feb '12

Hi, using the version from git I can't attach devices to my domain (using attach-device) neither using the virsh or a language binding. In both cases it throws a OutOfMemory exception. It gets thrown in vbox_tmpl.c:5340, although I got 7gb of RAM left. Am I doing something wrong, or is this a bug ? Thanks ! -- Empfehlen Sie GMX DSL Ihren Freunden und Bekannten und wir belohnen Sie mit bis zu 50,- Euro! https://freundschaftswerbung.gmx.de

2 3

Re: [libvirt] [virt-tools-list] virt-manager destroys symlinks to guest configs
by Cole Robinson 20 Feb '12

20 Feb '12

On 02/20/2012 11:21 AM, Jakub Mroziński wrote: > Hi, > virt-manager after saving guest config destroy symlink to this file and > creates new file. How to reproduce: > > cd /etc/libvirt/qemu > # mv openbsd.xml /mount/ > # ln -s /mount/openbsd.xml > # ls -l openbsd.xml > lrwxrwxrwx 1 root root 49 Feb 20 17:09 openbsd.xml -> /mount/openbsd.xml > # virt-manager > > Now we need to edit host openbsd in virt-manager then "Apply" changes and we got: > # ls -l openbsd.xml > -rw------- 1 root root 2076 Feb 20 17:13 openbsd.xml > > I have network storage and move every configuration there. On host i want have > only symlinks. I know that i can do workaround, but i dont want. > > This solution was working (i dont know on which version) fine but after > upgrade it doesn't work. > > virt-manager - 0.9.1-1 (debian testing) > virt-manager defers to libvirt for all changes like this. Did you update libvirt at the same time? - Cole

2 1

[libvirt] ANNOUNCE: libvirt-glib release 0.0.5
by Daniel P. Berrange 20 Feb '12

20 Feb '12

am pleased to announce that a new release of the libvirt-glib package, version 0.0.4 is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Require libvirt >= 0.9.10 - Fix error after finishing a stream - Use G_PARAM_STATIC_STRINGS - Add config for readonly disks - Add config for description/metadata - Fix type when creating storage volumes - Remove some bogus g_error usage - Import GNULIB's compiler warning flags support & fix problems - Add API for resizing storage volumes - Add API to check if a domain is saved - Add config for disk cache method - Add APIs to get node information - Add flags for deleting domains libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable, for the first few releases, we are *NOT* guaranteeing that libvirt-glib libraries are API/ABI stable. ABI stability will only be guaranteed once the bulk of the APIs have been fleshed out and proved in non-trivial application usage. We anticipate this will be within the next 6 months in order to line up with Fedora 17. Follow up comments about libvirt-glib should be directed to the regular libvir-list redhat com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

Re: [libvirt] fix ix86 macros
by Eric Blake 20 Feb '12

20 Feb '12

On 02/17/2012 08:27 AM, Peter Robinson wrote: > commit 79ae809020d041ec2d10982a60a9eaf4782ca843 > Author: Peter Robinson <pbrobinson(a)gmail.com> > Date: Fri Feb 17 15:27:03 2012 +0000 > > fix ix86 macros > > libvirt.spec | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > --- > diff --git a/libvirt.spec b/libvirt.spec > index 2c7f6c0..d0b82bd 100644 > --- a/libvirt.spec > +++ b/libvirt.spec > @@ -22,7 +22,7 @@ > > # RHEL-5 builds are client-only for s390, ppc > %if 0%{?rhel} == 5 > -%ifnarch i386 i586 i686 x86_64 ia64 > +%ifnarch %{ix86} x86_64 ia64 ... Thanks for this fix. We'd also like to apply it to upstream libvirt.git, in the file libvirt.spec.in, so we don't have to repeat this type of fix in the future. Is it all right if I attribute such a patch in your name? -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 2

[libvirt] [libvirt-glib] Fixes to gvir_domain_*save*() docs
by Zeeshan Ali (Khattak) 20 Feb '12

20 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> The saved state of a domain is restored using gvir_domain_start() rather than gvir_domain_resume(). --- libvirt-gobject/libvirt-gobject-domain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 0cbb0fe..23ad882 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -735,7 +735,7 @@ cleanup: * @flags: extra flags, currently unused * @err: Place-holder for possible errors * - * Saves the state of the domain on disk and stops it. Use #gvir_domain_resume + * Saves the state of the domain on disk and stops it. Use #gvir_domain_start * to restore the saved state of the domain. A saved domain can be restored * even after shutdown/reboot of host machine. * @@ -860,7 +860,7 @@ gboolean gvir_domain_get_persistent(GVirDomain *dom) * @dom: the domain * * Returns: TRUE if a stopped domain has a saved state to which it can be - * restored to using #gvir_domain_resume, FALSE otherwise. + * restored to using #gvir_domain_start, FALSE otherwise. */ gboolean gvir_domain_get_saved(GVirDomain *dom) { -- 1.7.7.6

2 1

[libvirt] [libvirt-glib] API to get node information about the connection
by Zeeshan Ali (Khattak) 20 Feb '12

20 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Mostly just a wrapper around virNodeGetInfo() and virNodeInfo struct. --- libvirt-gobject/libvirt-gobject-connection.c | 49 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 17 +++++++++ libvirt-gobject/libvirt-gobject.sym | 2 + 3 files changed, 68 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index cb19e9d..fc8595d 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -71,6 +71,21 @@ gvir_connection_error_quark(void) return g_quark_from_static_string("gvir-connection"); } +static GVirNodeInfo * +gvir_node_info_copy(GVirNodeInfo *info) +{ + return g_slice_dup(GVirNodeInfo, info); +} + +static void +gvir_node_info_free(GVirNodeInfo *info) +{ + g_slice_free(GVirNodeInfo, info); +} + +G_DEFINE_BOXED_TYPE(GVirNodeInfo, gvir_node_info, + gvir_node_info_copy, gvir_node_info_free) + static void gvir_connection_get_property(GObject *object, guint prop_id, GValue *value, @@ -1338,3 +1353,37 @@ GVirStoragePool *gvir_connection_create_storage_pool return g_object_ref(pool); } + +/** + * gvir_connection_get_node_info: + * @conn: the connection + * @err: return location for any #GError + * + * Returns: (transfer full): the info + */ +GVirNodeInfo *gvir_connection_get_node_info(GVirConnection *conn, + GError **err) +{ + GVirConnectionPrivate *priv = conn->priv; + virNodeInfo info; + GVirNodeInfo *ret; + + if (virNodeGetInfo(priv->conn, &info) < 0) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to get node info"); + return NULL; + } + + ret = g_slice_new(GVirNodeInfo); + g_utf8_strncpy (ret->model, info.model, sizeof (ret->model)); + ret->memory = info.memory; + ret->cpus = info.cpus; + ret->mhz = info.mhz; + ret->nodes = info.nodes; + ret->sockets = info.sockets; + ret->cores = info.cores; + ret->threads = info.threads; + + return ret; +} diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index 477a0c3..3cc60a2 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -38,6 +38,19 @@ G_BEGIN_DECLS #define GVIR_TYPE_CONNECTION_HANDLE (gvir_connection_handle_get_type ()) +typedef struct _GVirNodeInfo GVirNodeInfo; +struct _GVirNodeInfo +{ + gchar model[32]; /* string indicating the CPU model */ + gulong memory; /* memory size in kilobytes */ + guint cpus; /* the number of active CPUs */ + guint mhz; /* expected CPU frequency */ + guint nodes; /* the number of NUMA cell, 1 for unusual NUMA topologies or uniform memo */ + guint sockets; /* number of CPU sockets per node if nodes > 1, total number of CPU socke */ + guint cores; /* number of cores per socket */ + guint threads; /* number of threads per core */ +}; + typedef struct _GVirConnection GVirConnection; typedef struct _GVirConnectionPrivate GVirConnectionPrivate; typedef struct _GVirConnectionClass GVirConnectionClass; @@ -69,6 +82,7 @@ struct _GVirConnectionClass GType gvir_connection_get_type(void); GType gvir_connection_handle_get_type(void); +GType gvir_node_info_get_type(void); GVirConnection *gvir_connection_new(const char *uri); gboolean gvir_connection_open(GVirConnection *conn, @@ -174,6 +188,9 @@ GVirStoragePool *gvir_connection_create_storage_pool GVirStream *gvir_connection_get_stream(GVirConnection *conn, guint flags); +GVirNodeInfo *gvir_connection_get_node_info(GVirConnection *conn, + GError **err); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_CONNECTION_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index a02191e..1ad6b53 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -4,6 +4,7 @@ LIBVIRT_GOBJECT_0.0.4 { gvir_init_object_check; gvir_connection_get_type; + gvir_node_info_get_type; gvir_connection_new; gvir_connection_open; gvir_connection_open_async; @@ -29,6 +30,7 @@ LIBVIRT_GOBJECT_0.0.4 { gvir_connection_create_domain; gvir_connection_create_storage_pool; gvir_connection_start_domain; + gvir_connection_get_node_info; gvir_domain_device_get_type; -- 1.7.7.6

2 1

[libvirt] [libvirt-glib 1/2] API to get node information about the connection
by Zeeshan Ali (Khattak) 20 Feb '12

20 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Mostly just a wrapper around virNodeGetInfo() and virNodeInfo struct. --- libvirt-gobject/libvirt-gobject-connection.c | 49 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 17 +++++++++ libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 67 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index cb19e9d..c2691f7 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -71,6 +71,21 @@ gvir_connection_error_quark(void) return g_quark_from_static_string("gvir-connection"); } +static GVirNodeInfo * +gvir_node_info_copy(GVirNodeInfo *info) +{ + return g_slice_dup(GVirNodeInfo, info); +} + +static void +gvir_node_info_free(GVirNodeInfo *info) +{ + g_slice_free(GVirNodeInfo, info); +} + +G_DEFINE_BOXED_TYPE(GVirNodeInfo, gvir_node_info, + gvir_node_info_copy, gvir_node_info_free) + static void gvir_connection_get_property(GObject *object, guint prop_id, GValue *value, @@ -1338,3 +1353,37 @@ GVirStoragePool *gvir_connection_create_storage_pool return g_object_ref(pool); } + +/** + * gvir_connection_get_node_info: + * @conn: the connection + * @err: return location for any #GError + * + * Returns: (transfer full): the info + */ +GVirNodeInfo *gvir_connection_get_node_info(GVirConnection *conn, + GError **err) +{ + GVirConnectionPrivate *priv = conn->priv; + virNodeInfo info; + GVirNodeInfo *ret; + + if (virNodeGetInfo(priv->conn, &info) < 0) { + gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, + 0, + "Unable to get node info"); + return NULL; + } + + ret = g_slice_new(GVirNodeInfo); + g_memmove (ret->model, info.model, sizeof (ret->model)); + ret->memory = info.memory; + ret->cpus = info.cpus; + ret->mhz = info.mhz; + ret->nodes = info.nodes; + ret->sockets = info.sockets; + ret->cores = info.cores; + ret->threads = info.threads; + + return ret; +} diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index 477a0c3..3cc60a2 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -38,6 +38,19 @@ G_BEGIN_DECLS #define GVIR_TYPE_CONNECTION_HANDLE (gvir_connection_handle_get_type ()) +typedef struct _GVirNodeInfo GVirNodeInfo; +struct _GVirNodeInfo +{ + gchar model[32]; /* string indicating the CPU model */ + gulong memory; /* memory size in kilobytes */ + guint cpus; /* the number of active CPUs */ + guint mhz; /* expected CPU frequency */ + guint nodes; /* the number of NUMA cell, 1 for unusual NUMA topologies or uniform memo */ + guint sockets; /* number of CPU sockets per node if nodes > 1, total number of CPU socke */ + guint cores; /* number of cores per socket */ + guint threads; /* number of threads per core */ +}; + typedef struct _GVirConnection GVirConnection; typedef struct _GVirConnectionPrivate GVirConnectionPrivate; typedef struct _GVirConnectionClass GVirConnectionClass; @@ -69,6 +82,7 @@ struct _GVirConnectionClass GType gvir_connection_get_type(void); GType gvir_connection_handle_get_type(void); +GType gvir_node_info_get_type(void); GVirConnection *gvir_connection_new(const char *uri); gboolean gvir_connection_open(GVirConnection *conn, @@ -174,6 +188,9 @@ GVirStoragePool *gvir_connection_create_storage_pool GVirStream *gvir_connection_get_stream(GVirConnection *conn, guint flags); +GVirNodeInfo *gvir_connection_get_node_info(GVirConnection *conn, + GError **err); + G_END_DECLS #endif /* __LIBVIRT_GOBJECT_CONNECTION_H__ */ diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 7a2f65d..9e63773 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -4,6 +4,7 @@ LIBVIRT_GOBJECT_0.0.4 { gvir_init_object_check; gvir_connection_get_type; + gvir_node_info_get_type; gvir_connection_new; gvir_connection_open; gvir_connection_open_async; -- 1.7.7.6

2 5

[libvirt] libvirt-0.9.10.1 maybe?
by Doug Goldstein 20 Feb '12

20 Feb '12

Given the issues discovered after 0.9.10's release I was wondering if you guys wanted to put out a 0.9.10.1. Here's the list of the patches I've cherry picked based on the list comments and think would qualify. If not that's ok. 18942b9bea8a5a8a4d52c0cdde253ae91be338a6 e0d4b0db9e4cc045d9660f955ddccfabd098a91b 2ccc4a607f6e122aff2e3b9d133d6e6b4b661a1e fcdfa31f3cad32f41ef5e7933c58d986ab7fc6c9 c05ec920219dc9fad9230c3cea7c1fb17d29ddc3 4c1c361127b6f5ce56be980ca7ea06f829c53399 15a280bb6d2de16b2f54dd7ca667a5a69363558c d2728cc24581d8a2f40c7ffed2a10fd2da79015f -- Doug Goldstein

1 0

[libvirt] [PATCH 0/10]virtio-scsi: New device address logic for SCSI devices
by Osier Yang 17 Feb '12

17 Feb '12

This patch series completed the support for the first 3 parts of Paolo's proposal: http://permalink.gmane.org/gmane.comp.emulators.libvirt/50428 The 3 parts are: * SCSI controller models * Stable addressing for SCSI devices * LUN passthrough: block devices [PATCH 1/10] and [PATCH 2/10] add two new "scsi" controllers, "ibmvscsi" and "virtio-scsi". [PATCH 3/10] is to set the default controller model for scsi controller when parsing and implicit controller addtion. [PATCH 4/10] adds a helper functions to get a disk controller's model. [PATCH 5/10] introduces attribute "target" for device addressing XML. "target" is useless for model "lsilogic", for which it's not printed out when formating XML. [PATCH 7/10] builds the qemu command line for the new addressing format. The logic is: 1) If the disk controller model is "lsilogic": -drive file=/dev/sda,if=none,id=drive-scsi0-0-3,\ format=raw -device scsi-disk,bus=scsi0.0,\ scsi-id=0,drive=drive-scsi0-0-3-0,id=scsi0-0-3-0 libvirt attrs --> qdev properties: bus=scsi<controller>.0 scsi-id=<unit> 2) If the disk controller model is other else: The command line will be like: -drive file=/dev/sda,if=none,id=drive-scsi0-0-3-0,\ format=raw -device scsi-disk,bus=scsi0.0,channel=0,\ scsi-id=3,lun=0,drive=drive-scsi0-0-3-0,id=scsi0-0-3-0 libvirt attrs --> qdev properties: bus=scsi<controller>.0 channel=<bus> scsi-id=<target> lun=<unit> [PATCH 01/10] qemu: Add ibmvscsi controller model [PATCH 02/10] qemu: Add virtio-scsi controller model [PATCH 03/10] conf: Set default scsi controller model when parsing [PATCH 04/10] conf: Add helper function to look up disk controller [PATCH 05/10] conf: Introduce new attribute for device address [PATCH 06/10] qemu: New cap flag to indicate if channel is supported [PATCH 07/10] qemu: Build command line for the new address format [PATCH 08/10] tests: Update qemu tests to be consistent with new [PATCH 09/10] tests: Update vmx tests to be consistent with new [PATCH 10/10] tests: Add tests for virtio-scsi and ibmvscsi Regards, Osier

2 19

[libvirt] [libvirt-glib] Add gvir_domain_get_saved()
by Zeeshan Ali (Khattak) 17 Feb '12

17 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Binding for virDomainHasManagedSaveImage(). --- libvirt-gobject/libvirt-gobject-domain.c | 13 +++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 1 + libvirt-gobject/libvirt-gobject.sym | 1 + 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index d9e4c00..5f26dcd 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -854,3 +854,16 @@ gboolean gvir_domain_get_persistent(GVirDomain *dom) return virDomainIsPersistent(dom->priv->handle) == 1; } + +/** + * gvir_domain_get_saved: + * @dom: the domain + * + * Returns: TRUE if domain is in a saved state, FALSE otherwise. + */ +gboolean gvir_domain_get_saved(GVirDomain *dom) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + + return virDomainHasManagedSaveImage(dom->priv->handle, 0) == 1; +} diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 20388f2..bdff32e 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -167,6 +167,7 @@ gboolean gvir_domain_save_finish (GVirDomain *dom, GAsyncResult *result, GError **err); gboolean gvir_domain_get_persistent(GVirDomain *dom); +gboolean gvir_domain_get_saved(GVirDomain *dom); G_END_DECLS diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 468bf65..7a2f65d 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -64,6 +64,7 @@ LIBVIRT_GOBJECT_0.0.4 { gvir_domain_set_config; gvir_domain_get_info; gvir_domain_get_persistent; + gvir_domain_get_saved; gvir_domain_screenshot; gvir_domain_snapshot_get_type; -- 1.7.7.6

3 16

[libvirt] A script for setting up x509 certs for libvirt/spice/vnc
by Daniel P. Berrange 17 Feb '12

17 Feb '12

After 4 years of swearing at the pain of setting up x509 certs, I finally decided to try to write a script to automate it. I'm attaching a very raw proof of concept called "virt-pki-admin.pl". It does the following * Create CA key+cert * Create server + client keys+cert & sign with the CA * Copy server/client certs to remote hosts into correct directories which is sufficient to get up & running with libvirtd/virt-manager/virsh etc using x509 eg, // Create a self-signed CA $ virt-pki-admin.pl init "Evil CA" // Add some servers virt-pki-admin add_server "Evil Moonbase" alpha.moonbase.evil.com virt-pki-admin add_server "Evil Moonbase" beta.moonbase.evil.com virt-pki-admin add_server "Evil Moonbase" gamma.moonbase.evil.com // And some clients virt-pki-admin add_client "Evil Henchmen" up.moonbase.evil.com virt-pki-admin add_client "Evil Henchmen" down.moonbase.evil.com virt-pki-admin add_client "Evil Henchmen" strange.moonbase.evil.com // Copy the server certs/keys via the SSH root account virt-pki-admin deploy_server alpha.moonbase.evil.com virt-pki-admin deploy_server beta.moonbase.evil.com virt-pki-admin deploy_server gamma.moonbase.evil.com // Copy the client certs/keys via the SSH root account virt-pki-admin deploy_client up.moonbase.evil.com virt-pki-admin deploy_client down.moonbase.evil.com virt-pki-admin deploy_client strange.moonbase.evil.com // Copy the client certs/keys via the SSH $USER account virt-pki-admin deploy_user_client up.moonbase.evil.com virt-pki-admin deploy_user_client down.moonbase.evil.com virt-pki-admin deploy_user_client strange.moonbase.evil.com With that, if you are logged into 'root' on any of 'up', 'down', or 'strange' you can connect to any server using qemu+tls://hostname/system. Likewise for non-root accounts, which also have setup GTK-VNC and SPICE-GTK certs to allow graphical access to QEMU using x509 certs. WIth some more work I plan to submit this to libvirt, but for now here is the script in case it is useful BTW it stores all certs & keys in $HOME/.libvirt/pki/ on the machine used to run the command. You can safely experiment with any of the commands *except* the 'deploy_' ones, without messing up your current x509 config Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 1

[libvirt] [PATCH] Don't add SPICE TLS channels when TLS is disabled
by Christophe Fergeau 17 Feb '12

17 Feb '12

It's possible to disable SPICE TLS in qemu.conf. When this happens, libvirt ignores any SPICE TLS port or x509 directory that may have been set when it builds the qemu command line to use. However, it's not ignoring the secure channels that may have been set and adds tls-channel arguments to qemu command line. Current qemu versions don't report an error when this happens, and try to use TLS for the specified channels. Before this patch <domain type='kvm'> <name>auto-tls-port</name> <memory>65536</memory> <os> <type arch='x86_64' machine='pc'>hvm</type> </os> <devices> <graphics type='spice' port='5900' tlsPort='-1' autoport='yes' listen='0' ke <listen type='address' address='0'/> <channel name='main' mode='secure'/> <channel name='inputs' mode='secure'/> </graphics> </devices> </domain> generates -spice port=5900,addr=0,disable-ticketing,tls-channel=main,tls-channel=inputs and after this patch we get -spice port=5900,addr=0,disable-ticketing This fixes bug #790436 --- src/qemu/qemu_command.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 99d7129..30fb3b1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5286,8 +5286,9 @@ qemuBuildCommandLine(virConnectPtr conn, int mode = def->graphics[0]->data.spice.channels[i]; switch (mode) { case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: - virBufferAsprintf(&opt, ",tls-channel=%s", - virDomainGraphicsSpiceChannelNameTypeToString(i)); + if (driver->spiceTLS) + virBufferAsprintf(&opt, ",tls-channel=%s", + virDomainGraphicsSpiceChannelNameTypeToString(i)); break; case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: virBufferAsprintf(&opt, ",plaintext-channel=%s", -- 1.7.7.6

5 7

[libvirt] [libvirt-glib 1/2] Add gvir_config_domain_disk_[gs]et_cache
by Christophe Fergeau 17 Feb '12

17 Feb '12

--- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 23 +++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-disk.h | 12 ++++++++++++ libvirt-gconfig/libvirt-gconfig.sym | 3 +++ libvirt-gconfig/tests/test-domain-create.c | 2 ++ 4 files changed, 40 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index b2861e4..afa7eda 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -172,6 +172,18 @@ void gvir_config_domain_disk_set_driver_type(GVirConfigDomainDisk *disk, "driver", "type", driver_type); } +void gvir_config_domain_disk_set_driver_cache(GVirConfigDomainDisk *disk, + GVirConfigDomainDiskCacheType cache_type) +{ + const char *cache_str; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk)); + cache_str = gvir_config_genum_get_nick(GVIR_CONFIG_TYPE_DOMAIN_DISK_CACHE_TYPE, cache_type); + g_return_if_fail(cache_str != NULL); + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), + "driver", "cache", cache_str); +} + void gvir_config_domain_disk_set_target_bus(GVirConfigDomainDisk *disk, GVirConfigDomainDiskBus bus) { @@ -269,6 +281,17 @@ gvir_config_domain_disk_get_driver_type(GVirConfigDomainDisk *disk) "driver", "type"); } +GVirConfigDomainDiskCacheType +gvir_config_domain_disk_get_driver_cache(GVirConfigDomainDisk *disk) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk), + GVIR_CONFIG_DOMAIN_DISK_CACHE_DEFAULT); + + return gvir_config_object_get_attribute_genum(GVIR_CONFIG_OBJECT(disk), + "driver", "cache", + GVIR_CONFIG_TYPE_DOMAIN_DISK_CACHE_TYPE, + GVIR_CONFIG_DOMAIN_DISK_CACHE_DEFAULT); +} GVirConfigDomainDiskBus gvir_config_domain_disk_get_target_bus(GVirConfigDomainDisk *disk) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.h b/libvirt-gconfig/libvirt-gconfig-domain-disk.h index 3359049..4b16b80 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.h @@ -75,6 +75,15 @@ typedef enum { } GVirConfigDomainDiskBus; typedef enum { + GVIR_CONFIG_DOMAIN_DISK_CACHE_DEFAULT, + GVIR_CONFIG_DOMAIN_DISK_CACHE_NONE, + GVIR_CONFIG_DOMAIN_DISK_CACHE_WRITETHROUGH, + GVIR_CONFIG_DOMAIN_DISK_CACHE_WRITEBACK, + GVIR_CONFIG_DOMAIN_DISK_CACHE_DIRECTSYNC, + GVIR_CONFIG_DOMAIN_DISK_CACHE_UNSAFE +} GVirConfigDomainDiskCacheType; + +typedef enum { GVIR_CONFIG_DOMAIN_DISK_GUEST_DEVICE_DISK, GVIR_CONFIG_DOMAIN_DISK_GUEST_DEVICE_FLOPPY, GVIR_CONFIG_DOMAIN_DISK_GUEST_DEVICE_CDROM @@ -100,6 +109,8 @@ void gvir_config_domain_disk_set_snapshot_type(GVirConfigDomainDisk *disk, GVirConfigDomainDiskSnapshotType type); void gvir_config_domain_disk_set_source(GVirConfigDomainDisk *disk, const char *source); +void gvir_config_domain_disk_set_driver_cache(GVirConfigDomainDisk *disk, + GVirConfigDomainDiskCacheType cache_type); void gvir_config_domain_disk_set_driver_name(GVirConfigDomainDisk *disk, const char *driver_name); void gvir_config_domain_disk_set_driver_type(GVirConfigDomainDisk *disk, @@ -113,6 +124,7 @@ GVirConfigDomainDiskType gvir_config_domain_disk_get_disk_type(GVirConfigDomainD GVirConfigDomainDiskGuestDeviceType gvir_config_domain_disk_get_guest_device_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskSnapshotType gvir_config_domain_disk_get_snapshot_type(GVirConfigDomainDisk *disk); char *gvir_config_domain_disk_get_source(GVirConfigDomainDisk *disk); +GVirConfigDomainDiskCacheType gvir_config_domain_disk_get_driver_cache(GVirConfigDomainDisk *disk); char *gvir_config_domain_disk_get_driver_name(GVirConfigDomainDisk *disk); char *gvir_config_domain_disk_get_driver_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskBus gvir_config_domain_disk_get_target_bus(GVirConfigDomainDisk *disk); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index ab2c7bf..96ce58f 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -69,11 +69,14 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_disk_get_type; gvir_config_domain_disk_bus_get_type; + gvir_config_domain_disk_cache_type_get_type; gvir_config_domain_disk_guest_device_type_get_type; gvir_config_domain_disk_snapshot_type_get_type; gvir_config_domain_disk_type_get_type; gvir_config_domain_disk_new; gvir_config_domain_disk_new_from_xml; + gvir_config_domain_disk_get_driver_cache; + gvir_config_domain_disk_set_driver_cache; gvir_config_domain_disk_get_driver_name; gvir_config_domain_disk_set_driver_name; gvir_config_domain_disk_get_driver_type; diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index 821e0b0..0cd8304 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -101,6 +101,8 @@ int main(int argc, char **argv) gvir_config_domain_disk_set_driver_name(disk, "foo"); gvir_config_domain_disk_set_driver_type(disk, "bar"); gvir_config_domain_disk_set_driver_name(disk, "qemu"); + gvir_config_domain_disk_set_driver_cache(disk, GVIR_CONFIG_DOMAIN_DISK_CACHE_NONE); + g_assert(gvir_config_domain_disk_get_driver_cache(disk) == GVIR_CONFIG_DOMAIN_DISK_CACHE_NONE); gvir_config_domain_disk_set_driver_type(disk, "qcow2"); gvir_config_domain_disk_set_target_bus(disk, GVIR_CONFIG_DOMAIN_DISK_BUS_IDE); gvir_config_domain_disk_set_target_dev(disk, "hda"); -- 1.7.7.6

2 5

[libvirt] [libvirt-glib] Fix [gs]et_custom_xml-related leaks
by Christophe Fergeau 17 Feb '12

17 Feb '12

I forgot to run the testing code through valgrind before pushing the patches so a few small memory leaks crept in. --- libvirt-gconfig/libvirt-gconfig-domain.c | 1 + libvirt-gconfig/tests/test-domain-create.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index d7ac4c6..177c926 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -479,6 +479,7 @@ gboolean gvir_config_domain_set_custom_xml(GVirConfigDomain *domain, gvir_config_object_delete_children(metadata, NULL, ns_uri); gvir_config_object_attach_add(metadata, custom_xml); g_object_unref(G_OBJECT(metadata)); + g_object_unref(G_OBJECT(custom_xml)); return TRUE; } diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index 1610587..821e0b0 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -177,8 +177,12 @@ int main(int argc, char **argv) gvir_config_domain_set_custom_xml(domain, "<foo/>", "ns", "http://bar", NULL); gvir_config_domain_set_custom_xml(domain, "<bar/>", "ns", "http://foo", NULL); - g_assert(g_strcmp0(gvir_config_domain_get_custom_xml(domain, "http://foo"), "<ns:bar xmlns:ns=\"http://foo\"/>") == 0); - g_assert(g_strcmp0(gvir_config_domain_get_custom_xml(domain, "http://bar"), "<ns:foo xmlns:ns=\"http://bar\"/>") == 0); + xml = gvir_config_domain_get_custom_xml(domain, "http://foo"); + g_assert(g_strcmp0(xml, "<ns:bar xmlns:ns=\"http://foo\"/>") == 0); + g_free(xml); + xml = gvir_config_domain_get_custom_xml(domain, "http://bar"); + g_assert(g_strcmp0(xml, "<ns:foo xmlns:ns=\"http://bar\"/>") == 0); + g_free(xml); xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(domain)); g_print("%s\n\n", xml); -- 1.7.7.6

2 2

[libvirt] [libvirt-glib 1/3] Tell CC to ignore unused macros
by Zeeshan Ali (Khattak) 17 Feb '12

17 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- m4/virt-compile-warnings.m4 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 6659568..de542cc 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -39,6 +39,8 @@ AC_DEFUN([LIBVIRT_GLIB_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Wdeclaration-after-statement" # Using long long is fine dontwarn="$dontwarn -Wlong-long" + # Unused macros are ok + dontwarn="$dontwarn -Wunused-macros" # g_clear_object & G_ATOMIC_OP_USE_GCC_BUILTINS causes -- 1.7.7.6

3 6

[libvirt] [PATCH] python: Avoid memory leaks on libvirt_virNodeGetCPUStats
by ajia＠redhat.com 17 Feb '12

17 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks are introduced in commit 4955602. * python/libvirt-override.c (libvirt_virNodeGetCPUStats): fix memory leaks and improve codes return value. For details, please see the following link: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=770943 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 46 ++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 792cfa3..6e076bc 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2503,7 +2503,9 @@ libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *arg static PyObject * libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *ret; + PyObject *ret = NULL; + PyObject *key = NULL; + PyObject *val = NULL; PyObject *pyobj_conn; virConnectPtr conn; unsigned int flags; @@ -2512,39 +2514,53 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) virNodeCPUStatsPtr stats = NULL; if (!PyArg_ParseTuple(args, (char *)"Oii:virNodeGetCPUStats", &pyobj_conn, &cpuNum, &flags)) - return(NULL); + return ret; conn = (virConnectPtr)(PyvirConnect_Get(pyobj_conn)); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetCPUStats(conn, cpuNum, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) - return VIR_PY_NONE; + return ret; if (nparams) { if (VIR_ALLOC_N(stats, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetCPUStats(conn, cpuNum, stats, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - VIR_FREE(stats); - return VIR_PY_NONE; - } - } - if (!(ret = PyDict_New())) { - VIR_FREE(stats); - return VIR_PY_NONE; + if (c_retval < 0) + goto error; } + + if (!(ret = PyDict_New())) + goto error; + for (i = 0; i < nparams; i++) { - PyDict_SetItem(ret, - libvirt_constcharPtrWrap(stats[i].field), - libvirt_ulonglongWrap(stats[i].value)); + key = libvirt_constcharPtrWrap(stats[i].field); + val = libvirt_ulonglongWrap(stats[i].value); + + if (!key || !val) + goto error; + + if (PyDict_SetItem(ret, key, val) < 0) { + Py_DECREF(ret); + goto error; + } + + Py_DECREF(key); + Py_DECREF(val); } VIR_FREE(stats); return ret; + +error: + VIR_FREE(stats); + Py_XDECREF(key); + Py_XDECREF(val); + return ret; } static PyObject * -- 1.7.1

1 0

[libvirt] [PATCH] nwfilter: improved logging during driver initialization
by Stefan Berger 17 Feb '12

17 Feb '12

Improve the logging during nwfilter driver initialization when testing the command line tools. --- src/nwfilter/nwfilter_ebiptables_driver.c | 41 +++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 12 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -4036,6 +4036,7 @@ static int ebiptablesDriverInit(bool privileged) { virBuffer buf = VIR_BUFFER_INITIALIZER; + char *errmsg = NULL; if (!privileged) return 0; @@ -4056,8 +4057,14 @@ ebiptablesDriverInit(bool privileged) "%s", CMD_STOPONERR(1)); - if (ebiptablesExecCLI(&buf, NULL, NULL) < 0) - VIR_FREE(ebtables_cmd_path); + if (ebiptablesExecCLI(&buf, NULL, &errmsg) < 0) { + VIR_FREE(ebtables_cmd_path); + VIR_ERROR(_("Testing of ebtables command failed%s%s."), + errmsg ? ": " : "", + errmsg ? errmsg : ""); + } + } else { + VIR_WARN(_("Could not find 'ebtables' executable.")); } iptables_cmd_path = virFindFileInPath("iptables"); @@ -4070,8 +4077,14 @@ ebiptablesDriverInit(bool privileged) "%s", CMD_STOPONERR(1)); - if (ebiptablesExecCLI(&buf, NULL, NULL) < 0) - VIR_FREE(iptables_cmd_path); + if (ebiptablesExecCLI(&buf, NULL, &errmsg) < 0) { + VIR_FREE(iptables_cmd_path); + VIR_ERROR(_("Testing of iptables command failed%s%s."), + errmsg ? ": " : "", + errmsg ? errmsg : ""); + } + } else { + VIR_WARN(_("Could not find 'iptables' executable.")); } ip6tables_cmd_path = virFindFileInPath("ip6tables"); @@ -4084,25 +4097,29 @@ ebiptablesDriverInit(bool privileged) "%s", CMD_STOPONERR(1)); - if (ebiptablesExecCLI(&buf, NULL, NULL) < 0) - VIR_FREE(ip6tables_cmd_path); + if (ebiptablesExecCLI(&buf, NULL, &errmsg) < 0) { + VIR_FREE(ip6tables_cmd_path); + VIR_ERROR(_("Testing of ip6tables command failed%s%s."), + errmsg ? ": " : "", + errmsg ? errmsg : ""); + } + } else { + VIR_WARN(_("Could not find 'ip6tables' executable.")); } /* ip(6)tables support needs gawk & grep, ebtables doesn't */ if ((iptables_cmd_path != NULL || ip6tables_cmd_path != NULL) && (!grep_cmd_path || !gawk_cmd_path)) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("essential tools to support ip(6)tables " - "firewalls could not be located")); + VIR_ERROR(_("essential tools to support ip(6)tables " + "firewalls could not be located")); VIR_FREE(iptables_cmd_path); VIR_FREE(ip6tables_cmd_path); } + VIR_FREE(errmsg); if (!ebtables_cmd_path && !iptables_cmd_path && !ip6tables_cmd_path) { - virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("firewall tools were not found or " - "cannot be used")); + VIR_ERROR(_("firewall tools were not found or cannot be used")); ebiptablesDriverShutdown(); return -ENOTSUP; }

2 2

[libvirt] [PATCHv2] qemu: Prevent crash of libvirtd without guest agent
by ajia＠redhat.com 16 Feb '12

16 Feb '12

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_process.c (qemuFindAgentConfig): avoid crash libvirtd due to deref a NULL pointer. * How to reproduce? 1. virsh edit the following xml into guest configuration: <channel type='pty'> <target type='virtio'/> </channel> 2. virsh start <domain> or % virt-install -n foo -r 1024 --disk path=/var/lib/libvirt/images/foo.img,size=1 \ --channel pty,target_type=virtio -l <installation tree> Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 939a83d..41218de 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -194,7 +194,7 @@ qemuFindAgentConfig(virDomainDefPtr def) if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) continue; - if (STREQ(channel->target.name, "org.qemu.guest_agent.0")) { + if (STREQ_NULLABLE(channel->target.name, "org.qemu.guest_agent.0")) { config = &channel->source; break; } -- 1.7.1

3 2

[libvirt] [PATCH] qemu: Unlock monitor when connecting to dest qemu fails
by Jiri Denemark 16 Feb '12

16 Feb '12

When migrating a qemu domain, we enter the monitor, send some commands, try to connect to destination qemu, send other commands, end exit the monitor. However, if we couldn't connect to destination qemu we forgot to exit the monitor. Bug introduced by commit d9d518b1c8ef3b65658cc91f85ba33a63c0959a4. --- src/qemu/qemu_migration.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 12cfbde..ea4185e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1624,8 +1624,10 @@ qemuMigrationRun(struct qemud_driver *driver, /* connect to the destination qemu if needed */ if (spec->destType == MIGRATION_DEST_CONNECT_HOST && - qemuMigrationConnect(driver, vm, spec) < 0) + qemuMigrationConnect(driver, vm, spec) < 0) { + qemuDomainObjExitMonitorWithDriver(driver, vm); goto cleanup; + } switch (spec->destType) { case MIGRATION_DEST_HOST: -- 1.7.8.4

2 2

[libvirt] [PATCH] qemu: Fix segfault when CPU host is empty
by Jiri Denemark 16 Feb '12

16 Feb '12

In case libvirtd cannot detect host CPU model (which may happen if it runs inside a virtual machine), the daemon is likely to segfault when starting a new qemu domain. It segfaults when domain XML asks for host (either model or passthrough) CPU or does not ask for any specific CPU model at all. --- src/qemu/qemu_command.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 99d7129..5633dfd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3508,22 +3508,13 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, *hasHwVirt = false; - if (def->cpu && - (def->cpu->mode != VIR_CPU_MODE_CUSTOM || def->cpu->model)) { - if (!(cpu = virCPUDefCopy(def->cpu))) - goto cleanup; - if (cpu->mode != VIR_CPU_MODE_CUSTOM && - !migrating && - cpuUpdate(cpu, host) < 0) - goto cleanup; - } - if (STREQ(def->os.arch, "i686")) default_model = "qemu32"; else default_model = "qemu64"; - if (cpu) { + if (def->cpu && + (def->cpu->mode != VIR_CPU_MODE_CUSTOM || def->cpu->model)) { virCPUCompareResult cmp; const char *preferred; int hasSVM; @@ -3539,6 +3530,14 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, goto cleanup; } + if (!(cpu = virCPUDefCopy(def->cpu))) + goto cleanup; + + if (cpu->mode != VIR_CPU_MODE_CUSTOM && + !migrating && + cpuUpdate(cpu, host) < 0) + goto cleanup; + cmp = cpuGuestData(host, cpu, &data); switch (cmp) { case VIR_CPU_COMPARE_INCOMPATIBLE: @@ -3647,7 +3646,8 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, ret = 0; cleanup: - cpuDataFree(host->arch, data); + if (host) + cpuDataFree(host->arch, data); virCPUDefFree(guest); virCPUDefFree(cpu); -- 1.7.8.4

3 3

[libvirt] [PATCH v2] storage: Allow runtime detection of scrub
by Michal Privoznik 16 Feb '12

16 Feb '12

Currently, if scrub (used for wiping algorithms) is not present at compile time, we don't support any other wiping algorithms than zeroing, even if it was installed later. Switch to runtime detection instead. --- diff to v1: -Add BuildRequires to spec file configure.ac | 30 ++++-------------------------- libvirt.spec.in | 3 +++ src/storage/storage_driver.c | 4 ---- 3 files changed, 7 insertions(+), 30 deletions(-) diff --git a/configure.ac b/configure.ac index 67351d9..5320f71 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,8 @@ AC_PATH_PROG([UDEVSETTLE], [udevsettle], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([MODPROBE], [modprobe], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) +AC_PATH_PROG([SCRUB], [scrub], [], + [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"], [Location or name of the dnsmasq program]) @@ -232,6 +234,8 @@ if test -n "$MODPROBE"; then AC_DEFINE_UNQUOTED([MODPROBE],["$MODPROBE"], [Location or name of the modprobe program]) fi +AC_DEFINE_UNQUOTED([SCRUB],["$SCRUB"], + [Location or name of the scrub program (for wiping algorithms)]) dnl Specific dir for HTML output ? AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=path], @@ -2500,32 +2504,6 @@ AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) AC_SUBST([LIBNL_CFLAGS]) AC_SUBST([LIBNL_LIBS]) -dnl scrub program for different volume wiping algorithms - -AC_ARG_WITH([scrub], - AC_HELP_STRING([--with-scrub], [enable different volume wiping algorithms - @<:@default=check@:>@]), - [with_macvtap=${withval}], - [with_scrub=check]) - -if test "$with_scrub" != "no"; then - AC_PATH_PROG([SCRUB], [scrub]) - if test -z "$SCRUB" ; then - if test "$with_scrub" = "check"; then - with_scrub=no - else - AC_MSG_ERROR([You must install the 'scrub' binary to enable - different volume wiping algorithms]) - fi - else - with_scrub=yes - fi - if test "$with_scrub" = "yes"; then - AC_DEFINE_UNQUOTED([SCRUB], ["$SCRUB"], - [Location of the scrub program]) - fi -fi - # Only COPYING.LIB is under version control, yet COPYING # is included as part of the distribution tarball. # Copy one to the other, but only if this is a srcdir-build. diff --git a/libvirt.spec.in b/libvirt.spec.in index e48d8b8..3f0f19a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -513,6 +513,9 @@ BuildRequires: nfs-utils # Fedora build root suckage BuildRequires: gawk +# For storage wiping with different algorithms +BuildRequires: scrub + %description Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The main package includes diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 9170a17..df0e291 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1918,7 +1918,6 @@ storageVolumeWipeInternal(virStorageVolDefPtr def, if (algorithm != VIR_STORAGE_VOL_WIPE_ALG_ZERO) { const char *alg_char ATTRIBUTE_UNUSED = NULL; switch (algorithm) { -#ifdef SCRUB case VIR_STORAGE_VOL_WIPE_ALG_NNSA: alg_char = "nnsa"; break; @@ -1943,13 +1942,11 @@ storageVolumeWipeInternal(virStorageVolDefPtr def, case VIR_STORAGE_VOL_WIPE_ALG_RANDOM: alg_char = "random"; break; -#endif default: virStorageReportError(VIR_ERR_INVALID_ARG, _("unsupported algorithm %d"), algorithm); } -#ifdef SCRUB cmd = virCommandNew(SCRUB); virCommandAddArgList(cmd, "-f", "-p", alg_char, def->target.path, NULL); @@ -1958,7 +1955,6 @@ storageVolumeWipeInternal(virStorageVolDefPtr def, goto out; ret = 0; -#endif goto out; } else { if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { -- 1.7.3.4

2 2

[libvirt] question about guest status
by Wen Congyang 16 Feb '12

16 Feb '12

Hi all: If the guest runs on xen, we can know the guest OS paniced, and the guest status is paniced. But if the guest runs on qemu/kvm, we need the same feature. And the feature to know guest-is-panic is a very very good feature for enterprise. We have some ways to know that guest has paniced: 1. watchdog timeouts It is not a good way, because we can not say "the guest is paniced" in 100% accuracy 2. use a PV driver(like the XEN) The old RHELs do not have such driver... It can not work for the second kernel... 3. Adding a function for console-logging (in ring buffer or some) and check messages given by guests. If we allow some filtering script or some, we can catch Linux's panic messages. We can say the guest paniced if we catch such messages. We may be able to catch other events by other script I prefer to 3 now. Does anyone have a better idea? Thanks Wen Congyang

3 3

[libvirt] Anyone up for a libvirt webcast on FLOSS Weekly Podcasts
by Justin Clift 16 Feb '12

16 Feb '12

Hi all, Looking for someone to do a webcast about Libvirt, for the FLOSS Weekly podcast: http://twit.tv/show/floss-weekly Preferably someone pretty well known in the Libvirt Community (commit access maybe?). Said person must have decent bandwidth for the webcast connection, and be comfortable using Skype. Already asked DV who would, except he's very bandwidth limited, and the timezone (US/Los Angeles) is a pita for him. :( So, need an alternative person. :) The existing schedule is online: http://xrl.us/flossweeklyguests Anyone interested? Regards and best wishes, Justin Clift -- Aeolus Community Manager http://www.aeolusproject.org

1 0

[libvirt] [PATCH] daemon: fix logic bug with virAsprintf
by Eric Blake 16 Feb '12

16 Feb '12

Regression introduced in commit 7033c5f2, due to improper conversion from snprintf to virAsprintf. * daemon/remote.c (remoteDispatchAuthList): Check return value correctly. --- This one's embarrassing. I think I broke polkit authorization in 0.9.10. :( daemon/remote.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 9c61306..724db23 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2052,7 +2052,7 @@ remoteDispatchAuthList(virNetServerPtr server ATTRIBUTE_UNUSED, } else if (callerUid == 0) { char *ident; if (virAsprintf(&ident, "pid:%lld,uid:%d", - (long long) callerPid, callerUid) == 0) { + (long long) callerPid, callerUid) >= 0) { VIR_INFO("Bypass polkit auth for privileged client %s", ident); if (virNetServerClientSetIdentity(client, ident) < 0) -- 1.7.7.6

3 5

[libvirt] [PATCH] Fix build with polkit0
by Jim Fehlig 16 Feb '12

16 Feb '12

Commit 8dd623b9 introduced a build error with --enable-compile-warnings=error remote.c:2593: error: unused variable 'rv' [-Wunused-variable] Pushing under build-breaker rule. --- daemon/remote.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 724db23..ed27053 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2590,7 +2590,6 @@ remoteDispatchAuthPolkit(virNetServerPtr server, DBusError err; const char *action; char *ident = NULL; - int rv = -1; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); -- 1.7.7

1 0

[libvirt] [PATCHv4] python: Expose virDomain{G, S}etInterfaceParameters APIs in python binding
by ajia＠redhat.com 16 Feb '12

16 Feb '12

From: Alex Jia <ajia(a)redhat.com> The v4 patch corrects indentation issues. The v3 patch follows latest python binding codes and change 'size' type from int to Py_ssize_t. An simple example to show how to use it: #!/usr/bin/env python import libvirt conn = libvirt.open(None) dom = conn.lookupByName('foo') print dom.interfaceParameters('vnet0', 0) params = {'outbound.peak': 10, 'inbound.peak': 10, 'inbound.burst': 20, 'inbound.average': 20, 'outbound.average': 30, 'outbound.burst': 30} print dom.setInterfaceParameters('vnet0', params, 0) print dom.interfaceParameters('vnet0', 0) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override-api.xml | 16 +++++ python/libvirt-override.c | 126 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 563dd46..ab8f33a 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -261,6 +261,22 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> + <function name='virDomainSetInterfaceParameters' file='python'> + <info>Change the bandwidth tunables for a interface device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='device' type='const char *' info='interface name'/> + <arg name='params' type='virTypedParameterPtr' info='Pointer to bandwidth tuning params object'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='int' info='0 in case of success, -1 in case of failure'/> + </function> + <function name='virDomainGetInterfaceParameters' file='python'> + <info>Get the bandwidth tunables for a interface device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='device' type='const char *' info='interface name'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='str *' info='the bandwidth tunables value or None in case of error'/> + </function> + <function name='virConnectListStoragePools' file='python'> <info>list the storage pools, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 4e8a97e..078324e 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1109,6 +1109,130 @@ cleanup: } static PyObject * +libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + Py_ssize_t size = 0; + unsigned int flags; + const char *device = NULL; + virTypedParameterPtr params, new_params; + + if (!PyArg_ParseTuple(args, + (char *)"OzOi:virDomainSetInterfaceParameters", + &pyobj_domain, &device, &info, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (size == 0) { + PyErr_Format(PyExc_LookupError, + "Need non-empty dictionary to set attributes"); + return NULL; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if (nparams == 0) { + PyErr_Format(PyExc_LookupError, + "Domain has no settable attributes"); + return NULL; + } + + if (VIR_ALLOC_N(params, nparams) < 0) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetInterfaceParameters(domain, device, new_params, size, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); + VIR_FREE(params); + VIR_FREE(new_params); + return ret; +} + +static PyObject * +libvirt_virDomainGetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + unsigned int flags; + const char *device = NULL; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetInterfaceParameters", + &pyobj_domain, &device, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_NONE; + + if (!nparams) + return PyDict_New(); + + if (VIR_ALLOC_N(params, nparams) < 0) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_NONE; + goto cleanup; + } + + ret = getPyVirTypedParameter(params, nparams); + +cleanup: + virTypedParameterArrayClear(params, nparams); + VIR_FREE(params); + return ret; +} + +static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; @@ -5256,6 +5380,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetMemoryParameters", libvirt_virDomainGetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virDomainSetNumaParameters", libvirt_virDomainSetNumaParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetNumaParameters", libvirt_virDomainGetNumaParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetInterfaceParameters", libvirt_virDomainSetInterfaceParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetInterfaceParameters", libvirt_virDomainGetInterfaceParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, -- 1.7.1

3 2

[libvirt] [PATCH] snapshot: fix snapshot deletion
by Eric Blake 16 Feb '12

16 Feb '12

Bug introduced in commit 35abced. On an inactive domain, $ virsh snapshot-create-as dom snap $ virsh snapshot-create dom $ virsh snapshot-create dom $ virsh snapshot-delete --children dom snap could crash libvirtd, due to a use-after-free that results when the callback freed the current element in the iteration. * src/conf/domain_conf.c (virDomainSnapshotForEachChild) (virDomainSnapshotActOnDescendant): Allow iteration to delete current child. --- src/conf/domain_conf.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f8d0a4c..da00830 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13325,8 +13325,9 @@ virDomainSnapshotForEachChild(virDomainSnapshotObjPtr snapshot, virDomainSnapshotObjPtr child = snapshot->first_child; while (child) { + virDomainSnapshotObjPtr next = child->sibling; (iter)(child, child->def->name, data); - child = child->sibling; + child = next; } return snapshot->nchildren; @@ -13346,10 +13347,10 @@ virDomainSnapshotActOnDescendant(void *payload, virDomainSnapshotObjPtr obj = payload; struct snapshot_act_on_descendant *curr = data; - (curr->iter)(payload, name, curr->data); curr->number += 1 + virDomainSnapshotForEachDescendant(obj, curr->iter, curr->data); + (curr->iter)(payload, name, curr->data); } /* Run iter(data) on all descendants of snapshot, while ignoring all -- 1.7.7.6

2 2

[libvirt] [PATCH] daemon: plug memory leak
by Eric Blake 16 Feb '12

16 Feb '12

Leak introduced in commit bb2eddc6. * daemon/remote.c (remoteDispatchAuthPolkit): Also free pkout on success. --- daemon/remote.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1cea942..9c61306 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -2536,6 +2536,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED, virNetServerClientSetIdentity(client, ident); virMutexUnlock(&priv->lock); virCommandFree(cmd); + VIR_FREE(pkout); VIR_FREE(ident); return 0; -- 1.7.7.6

2 2

[libvirt] libvirtError: internal error cannot create rule since ebtables tool is missing.
by Phantomcircuit 15 Feb '12

15 Feb '12

# libvirtd --version libvirtd (libvirt) 0.9.8 # which ebtables /sbin/ebtables 2012-02-15 09:40:59.083+0000: 17675: error : ebtablesCreateRuleInstance:1943 : internal error cannot create rule since ebtables tool is missing. 2012-02-15 09:40:59.107+0000: 17675: error : virNetDevGetIndex:656 : Unable to get index for interface vnet0: No such device ebtables_cmd_path = virFindFileInPath("ebtables"); I can't figure out why ebtables_cmd_path is NULL when the call to ebtablesCreateRuleInstance is made.

2 1

[libvirt] [PATCH] qemu: Prevent crash of libvirtd without guest agent
by ajia＠redhat.com 15 Feb '12

15 Feb '12

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_process.c (qemuFindAgentConfig): avoid crash libvirtd due to deref a NULL pointer. * How to reproduce? 1. virsh edit the following xml into guest configuration: <channel type='pty'> <target type='virtio'/> <address type='virtio-serial' controller='0' bus='0' port='1'/> </channel> 2. virsh start <domain> or % virt-install -n foo -r 1024 --disk path=/var/lib/libvirt/images/foo.img,size=1 \ --channel pty,target_type=virtio -l <installation tree> Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2d92d66..6dc1732 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -189,11 +189,14 @@ qemuFindAgentConfig(virDomainDefPtr def) for (i = 0 ; i < def->nchannels ; i++) { virDomainChrDefPtr channel = def->channels[i]; + if(!channel) + break; if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) continue; - if (STREQ(channel->target.name, "org.qemu.guest_agent.0")) { + if (channel->target.name && + STREQ(channel->target.name, "org.qemu.guest_agent.0")) { config = &channel->source; break; } -- 1.7.1

2 1

[libvirt] [PATCH v2] RFC Libvirt + Openvswitch
by Ansis Atteka 15 Feb '12

15 Feb '12

This patch allows libvirt to add interfaces to already existing Open vSwitch bridges. The following syntax in domain XML file can be used: <interface type='bridge'> <mac address='52:54:00:d0:3f:f2'/> <source bridge='ovsbr'/> <virtualport type='openvswitch'> <parameters interfaceid='921a80cd-e6de-5a2e-db9c-ab27f15a6e1d'/> </virtualport> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> or if libvirt should auto-generate the interfaceid use following syntax: <interface type='bridge'> <mac address='52:54:00:d0:3f:f2'/> <source bridge='ovsbr'/> <virtualport type='openvswitch'> </virtualport> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> It is also possible to pass an optional profileid. To do that use following syntax: <interface type='bridge'> <source bridge='ovsbr'/> <mac address='00:55:1a:65:a2:8d'/> <virtualport type='openvswitch'> <parameters interfaceid='921a80cd-e6de-5a2e-db9c-ab27f15a6e1d' profileid='test-profile'/> </virtualport> </interface> To create Open vSwitch bridge install Open vSwitch and run the following command: ovs-vsctl add-br ovsbr --- configure.ac | 5 + src/Makefile.am | 1 + src/conf/domain_conf.c | 51 +++++++++++-- src/conf/domain_conf.h | 5 +- src/conf/netdev_vport_profile_conf.c | 47 +++++++++++- src/libvirt_private.syms | 7 ++- src/lxc/lxc_driver.c | 37 +++++++-- src/network/bridge_driver.c | 3 +- src/qemu/qemu_command.c | 5 +- src/qemu/qemu_hotplug.c | 17 ++++- src/qemu/qemu_migration.c | 4 +- src/qemu/qemu_process.c | 10 ++- src/uml/uml_conf.c | 3 +- src/util/virnetdevopenvswitch.c | 135 ++++++++++++++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 42 +++++++++++ src/util/virnetdevtap.c | 14 +++- src/util/virnetdevtap.h | 5 +- src/util/virnetdevvportprofile.c | 2 + src/util/virnetdevvportprofile.h | 7 ++- 19 files changed, 365 insertions(+), 35 deletions(-) create mode 100644 src/util/virnetdevopenvswitch.c create mode 100644 src/util/virnetdevopenvswitch.h diff --git a/configure.ac b/configure.ac index 9fb7bfc..dca178f 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,8 @@ AC_PATH_PROG([UDEVSETTLE], [udevsettle], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([MODPROBE], [modprobe], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) +AC_PATH_PROG([OVSVSCTL], [ovs-vsctl], [ovs-vsctl], + [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"], [Location or name of the dnsmasq program]) @@ -220,6 +222,9 @@ AC_DEFINE_UNQUOTED([RADVD],["$RADVD"], [Location or name of the radvd program]) AC_DEFINE_UNQUOTED([TC],["$TC"], [Location or name of the tc profram (see iproute2)]) +AC_DEFINE_UNQUOTED([OVSVSCTL],["$OVSVSCTL"], + [Location or name of the ovs-vsctl program]) + if test -n "$UDEVADM"; then AC_DEFINE_UNQUOTED([UDEVADM],["$UDEVADM"], [Location or name of the udevadm program]) diff --git a/src/Makefile.am b/src/Makefile.am index a3dd847..d5f52a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -97,6 +97,7 @@ UTIL_SOURCES = \ util/virnetdevbandwidth.h util/virnetdevbandwidth.c \ util/virnetdevbridge.h util/virnetdevbridge.c \ util/virnetdevmacvlan.c util/virnetdevmacvlan.h \ + util/virnetdevopenvswitch.h util/virnetdevopenvswitch.c \ util/virnetdevtap.h util/virnetdevtap.c \ util/virnetdevveth.h util/virnetdevveth.c \ util/virnetdevvportprofile.h util/virnetdevvportprofile.c \ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a09a506..5b5db43 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31,6 +31,7 @@ #include <sys/time.h> #include <strings.h> +#include "internal.h" #include "virterror_internal.h" #include "datatypes.h" #include "domain_conf.h" @@ -951,6 +952,7 @@ virDomainActualNetDefFree(virDomainActualNetDefPtr def) switch (def->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: VIR_FREE(def->data.bridge.brname); + VIR_FREE(def->data.bridge.ovsPort); break; case VIR_DOMAIN_NET_TYPE_DIRECT: VIR_FREE(def->data.direct.linkdev); @@ -994,6 +996,7 @@ void virDomainNetDefFree(virDomainNetDefPtr def) case VIR_DOMAIN_NET_TYPE_BRIDGE: VIR_FREE(def->data.bridge.brname); VIR_FREE(def->data.bridge.ipaddr); + VIR_FREE(def->data.bridge.ovsPort); break; case VIR_DOMAIN_NET_TYPE_INTERNAL: @@ -3732,7 +3735,11 @@ virDomainActualNetDefParseXML(xmlNodePtr node, } if (actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { - actual->data.bridge.brname = virXPathString("string(./source[1]/@bridge)", ctxt); + xmlNodePtr virtPortNode = virXPathNode("./virtualport", ctxt); + if (virtPortNode && + (!(actual->data.bridge.ovsPort = + virNetDevVPortProfileParse(virtPortNode)))) + goto error; } else if (actual->type == VIR_DOMAIN_NET_TYPE_DIRECT) { xmlNodePtr virtPortNode; @@ -3861,7 +3868,8 @@ virDomainNetDefParseXML(virCapsPtr caps, mode = virXMLPropString(cur, "mode"); } else if ((virtPort == NULL) && ((def->type == VIR_DOMAIN_NET_TYPE_DIRECT) || - (def->type == VIR_DOMAIN_NET_TYPE_NETWORK)) && + (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) || + (def->type == VIR_DOMAIN_NET_TYPE_BRIDGE)) && xmlStrEqual(cur->name, BAD_CAST "virtualport")) { if (!(virtPort = virNetDevVPortProfileParse(cur))) goto error; @@ -4000,6 +4008,8 @@ virDomainNetDefParseXML(virCapsPtr caps, def->data.bridge.ipaddr = address; address = NULL; } + def->data.bridge.ovsPort = virtPort; + virtPort = NULL; break; case VIR_DOMAIN_NET_TYPE_CLIENT: @@ -10429,6 +10439,12 @@ virDomainActualNetDefFormat(virBufferPtr buf, case VIR_DOMAIN_NET_TYPE_BRIDGE: virBufferEscapeString(buf, " <source bridge='%s'/>\n", def->data.bridge.brname); + if (def->data.bridge.ovsPort) { + virBufferAdjustIndent(buf, 6); + if (virNetDevVPortProfileFormat(def->data.bridge.ovsPort, buf) < 0) + return -1; + virBufferAdjustIndent(buf, -6); + } break; case VIR_DOMAIN_NET_TYPE_DIRECT: @@ -10516,6 +10532,12 @@ virDomainNetDefFormat(virBufferPtr buf, if (def->data.bridge.ipaddr) virBufferAsprintf(buf, " <ip address='%s'/>\n", def->data.bridge.ipaddr); + if (def->data.bridge.ovsPort) { + virBufferAdjustIndent(buf, 6); + if (virNetDevVPortProfileFormat(def->data.bridge.ovsPort, buf) < 0) + return -1; + virBufferAdjustIndent(buf, -6); + } break; case VIR_DOMAIN_NET_TYPE_SERVER: @@ -13832,15 +13854,27 @@ virDomainNetGetActualDirectMode(virDomainNetDefPtr iface) } virNetDevVPortProfilePtr -virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface) +virDomainNetGetActualVirtPortProfile(virDomainNetDefPtr iface) { - if (iface->type == VIR_DOMAIN_NET_TYPE_DIRECT) + switch (iface->type) { + case VIR_DOMAIN_NET_TYPE_DIRECT: return iface->data.direct.virtPortProfile; - if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) - return NULL; - if (!iface->data.network.actual) + case VIR_DOMAIN_NET_TYPE_BRIDGE: + return iface->data.bridge.ovsPort; + case VIR_DOMAIN_NET_TYPE_NETWORK: + if (!iface->data.network.actual) + return NULL; + switch (iface->data.network.actual->type) { + case VIR_DOMAIN_NET_TYPE_DIRECT: + return iface->data.network.actual->data.direct.virtPortProfile; + case VIR_DOMAIN_NET_TYPE_BRIDGE: + return iface->data.network.actual->data.bridge.ovsPort; + default: + return NULL; + } + default: return NULL; - return iface->data.network.actual->data.direct.virtPortProfile; + } } virNetDevBandwidthPtr @@ -13853,7 +13887,6 @@ virDomainNetGetActualBandwidth(virDomainNetDefPtr iface) return iface->bandwidth; } - /* Return listens[ii] from the appropriate union for the graphics * type, or NULL if this is an unsuitable type, or the index is out of * bounds. If force0 is TRUE, ii == 0, and there is no listen array, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8bb21cf..c4c3551 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -41,6 +41,7 @@ # include "virnetdevmacvlan.h" # include "sysinfo.h" # include "virnetdevvportprofile.h" +# include "virnetdevopenvswitch.h" # include "virnetdevbandwidth.h" /* Different types of hypervisor */ @@ -596,6 +597,7 @@ struct _virDomainActualNetDef { union { struct { char *brname; + virNetDevVPortProfilePtr ovsPort; } bridge; struct { char *linkdev; @@ -647,6 +649,7 @@ struct _virDomainNetDef { struct { char *brname; char *ipaddr; + virNetDevVPortProfilePtr ovsPort; } bridge; struct { char *name; @@ -1875,7 +1878,7 @@ const char *virDomainNetGetActualBridgeName(virDomainNetDefPtr iface); const char *virDomainNetGetActualDirectDev(virDomainNetDefPtr iface); int virDomainNetGetActualDirectMode(virDomainNetDefPtr iface); virNetDevVPortProfilePtr -virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface); +virDomainNetGetActualVirtPortProfile(virDomainNetDefPtr iface); virNetDevBandwidthPtr virDomainNetGetActualBandwidth(virDomainNetDefPtr iface); diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index b48b2cb..205d674 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -35,7 +35,8 @@ VIR_ENUM_IMPL(virNetDevVPort, VIR_NETDEV_VPORT_PROFILE_LAST, "none", "802.1Qbg", - "802.1Qbh") + "802.1Qbh", + "openvswitch") virNetDevVPortProfilePtr @@ -47,6 +48,7 @@ virNetDevVPortProfileParse(xmlNodePtr node) char *virtPortTypeIDVersion = NULL; char *virtPortInstanceID = NULL; char *virtPortProfileID = NULL; + char *virtPortInterfaceID = NULL; virNetDevVPortProfilePtr virtPort = NULL; xmlNodePtr cur = node->children; @@ -76,7 +78,7 @@ virNetDevVPortProfileParse(xmlNodePtr node) virtPortTypeIDVersion = virXMLPropString(cur, "typeidversion"); virtPortInstanceID = virXMLPropString(cur, "instanceid"); virtPortProfileID = virXMLPropString(cur, "profileid"); - + virtPortInterfaceID = virXMLPropString(cur, "interfaceid"); break; } @@ -171,6 +173,33 @@ virNetDevVPortProfileParse(xmlNodePtr node) goto error; } break; + case VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH: + if (virtPortInterfaceID != NULL) { + if (virUUIDParse(virtPortInterfaceID, + virtPort->u.openvswitch.interfaceID)) { + virNetDevError(VIR_ERR_XML_ERROR, "%s", + _("cannot parse interfaceid parameter as a uuid")); + goto error; + } + } else { + if (virUUIDGenerate(virtPort->u.openvswitch.interfaceID)) { + virNetDevError(VIR_ERR_XML_ERROR, "%s", + _("cannot generate a random uuid for interfaceid")); + goto error; + } + } + /* profileid is not mandatory for Open vSwitch */ + if (virtPortProfileID != NULL) { + if (virStrcpyStatic(virtPort->u.openvswitch.profileID, + virtPortProfileID) == NULL) { + virNetDevError(VIR_ERR_XML_ERROR, "%s", + _("profileid parameter too long")); + goto error; + } + } else { + virtPort->u.openvswitch.profileID[0] = '\0'; + } + break; default: virNetDevError(VIR_ERR_XML_ERROR, @@ -225,6 +254,20 @@ virNetDevVPortProfileFormat(virNetDevVPortProfilePtr virtPort, virtPort->u.virtPort8021Qbh.profileID); break; + case VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH: + virUUIDFormat(virtPort->u.openvswitch.interfaceID, + uuidstr); + if (virtPort->u.openvswitch.profileID[0] == '\0') { + virBufferAsprintf(buf, " <parameters interfaceid='%s'/>\n", + uuidstr); + } else { + virBufferAsprintf(buf, " <parameters interfaceid='%s' " + "profileid='%s'/>\n", uuidstr, + virtPort->u.openvswitch.profileID); + } + + break; + default: virNetDevError(VIR_ERR_XML_ERROR, _("unexpected virtualport type %d"), virtPort->virtPortType); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0c22dec..ad5c7d3 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -378,7 +378,7 @@ virDomainNetGetActualBandwidth; virDomainNetGetActualBridgeName; virDomainNetGetActualDirectDev; virDomainNetGetActualDirectMode; -virDomainNetGetActualDirectVirtPortProfile; +virDomainNetGetActualVirtPortProfile; virDomainNetGetActualType; virDomainNetIndexByMac; virDomainNetInsert; @@ -1237,6 +1237,11 @@ virNetDevMacVLanCreateWithVPortProfile; virNetDevMacVLanDeleteWithVPortProfile; +# virnetdevopenvswitch.h +virNetDevOpenvswitchAddPort; +virNetDevOpenvswitchRemovePort; + + # virnetdevtap.h virNetDevTapCreate; virNetDevTapCreateInBridgePort; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b712da4..17e8312 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -56,6 +56,7 @@ #include "domain_nwfilter.h" #include "network/bridge_driver.h" #include "virnetdev.h" +#include "virnetdevtap.h" #include "virnodesuspend.h" #include "virtime.h" #include "virtypedparam.h" @@ -1105,6 +1106,7 @@ static void lxcVmCleanup(lxc_driver_t *driver, virCgroupPtr cgroup; int i; lxcDomainObjPrivatePtr priv = vm->privateData; + virNetDevVPortProfilePtr vport = NULL; /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { @@ -1132,10 +1134,15 @@ static void lxcVmCleanup(lxc_driver_t *driver, priv->monitorWatch = -1; for (i = 0 ; i < vm->def->nnets ; i++) { - ignore_value(virNetDevSetOnline(vm->def->nets[i]->ifname, false)); - ignore_value(virNetDevVethDelete(vm->def->nets[i]->ifname)); - - networkReleaseActualDevice(vm->def->nets[i]); + virDomainNetDefPtr iface = vm->def->nets[i]; + vport = virDomainNetGetActualVirtPortProfile(iface); + ignore_value(virNetDevSetOnline(iface->ifname, false)); + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) + ignore_value(virNetDevOpenvswitchRemovePort( + virDomainNetGetActualBridgeName(iface), + iface->ifname)); + ignore_value(virNetDevVethDelete(iface->ifname)); + networkReleaseActualDevice(iface); } virDomainConfVMNWFilterTeardown(vm); @@ -1165,6 +1172,7 @@ static int lxcSetupInterfaceBridged(virConnectPtr conn, int ret = -1; char *parentVeth; char *containerVeth = NULL; + const virNetDevVPortProfilePtr vport = virDomainNetGetActualVirtPortProfile(net); VIR_DEBUG("calling vethCreate()"); parentVeth = net->ifname; @@ -1186,7 +1194,11 @@ static int lxcSetupInterfaceBridged(virConnectPtr conn, if (virNetDevSetMAC(containerVeth, net->mac) < 0) goto cleanup; - if (virNetDevBridgeAddPort(brname, parentVeth) < 0) + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) + ret = virNetDevOpenvswitchAddPort(brname, parentVeth, net->mac, vport); + else + ret = virNetDevBridgeAddPort(brname, parentVeth); + if (ret < 0) goto cleanup; if (virNetDevSetOnline(parentVeth, true) < 0) @@ -1242,7 +1254,7 @@ static int lxcSetupInterfaceDirect(virConnectPtr conn, * and automagically dies when the container dies. So * we have no dev to perform disassociation with. */ - prof = virDomainNetGetActualDirectVirtPortProfile(net); + prof = virDomainNetGetActualVirtPortProfile(net); if (prof) { lxcError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unable to set port profile on direct interfaces")); @@ -1260,7 +1272,7 @@ static int lxcSetupInterfaceDirect(virConnectPtr conn, virDomainNetGetActualDirectDev(net), virDomainNetGetActualDirectMode(net), false, false, def->uuid, - virDomainNetGetActualDirectVirtPortProfile(net), + virDomainNetGetActualVirtPortProfile(net), &res_ifname, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, driver->stateDir, @@ -1377,8 +1389,15 @@ static int lxcSetupInterfaces(virConnectPtr conn, cleanup: if (ret != 0) { - for (i = 0 ; i < def->nnets ; i++) - networkReleaseActualDevice(def->nets[i]); + for (i = 0 ; i < def->nnets ; i++) { + virDomainNetDefPtr iface = def->nets[i]; + virNetDevVPortProfilePtr vport = virDomainNetGetActualVirtPortProfile(iface); + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) + ignore_value(virNetDevOpenvswitchRemovePort( + virDomainNetGetActualBridgeName(iface), + iface->ifname)); + networkReleaseActualDevice(iface); + } } return ret; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 57ebb9f..1423d3f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1765,7 +1765,8 @@ networkStartNetworkVirtual(struct network_driver *driver, goto err0; } if (virNetDevTapCreateInBridgePort(network->def->bridge, - &macTapIfName, network->def->mac, 0, false, NULL) < 0) { + &macTapIfName, network->def->mac, 0, + false, NULL, NULL) < 0) { VIR_FREE(macTapIfName); goto err0; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1b92aa4..591e371 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -154,7 +154,7 @@ qemuPhysIfaceConnect(virDomainDefPtr def, virDomainNetGetActualDirectDev(net), virDomainNetGetActualDirectMode(net), true, vnet_hdr, def->uuid, - virDomainNetGetActualDirectVirtPortProfile(net), + virDomainNetGetActualVirtPortProfile(net), &res_ifname, vmop, driver->stateDir, virDomainNetGetActualBandwidth(net)); @@ -247,7 +247,8 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ err = virNetDevTapCreateInBridgePort(brname, &net->ifname, tapmac, - vnet_hdr, true, &tapfd); + vnet_hdr, true, &tapfd, + virDomainNetGetActualVirtPortProfile(net)); virDomainAuditNetDevice(def, net, "/dev/net/tun", tapfd >= 0); if (err < 0) { if (template_ifname) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b4870be..3b1dbbf 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -40,6 +40,7 @@ #include "qemu_cgroup.h" #include "locking/domain_lock.h" #include "network/bridge_driver.h" +#include "virnetdevtap.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -652,6 +653,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, int vhostfd = -1; char *nicstr = NULL; char *netstr = NULL; + virNetDevVPortProfilePtr vport = NULL; int ret = -1; virDomainDevicePCIAddress guestAddr; int vlan; @@ -838,6 +840,12 @@ cleanup: if (iface_connected) virDomainConfNWFilterTeardown(net); + vport = virDomainNetGetActualVirtPortProfile(net); + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) + ignore_value(virNetDevOpenvswitchRemovePort( + virDomainNetGetActualBridgeName(net), + net->ifname)); + networkReleaseActualDevice(net); } @@ -1833,6 +1841,7 @@ int qemuDomainDetachNetDevice(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; int vlan; char *hostnet_name = NULL; + virNetDevVPortProfilePtr vport = NULL; for (i = 0 ; i < vm->def->nnets ; i++) { virDomainNetDefPtr net = vm->def->nets[i]; @@ -1923,7 +1932,7 @@ int qemuDomainDetachNetDevice(struct qemud_driver *driver, detach->ifname, detach->mac, virDomainNetGetActualDirectDev(detach), virDomainNetGetActualDirectMode(detach), - virDomainNetGetActualDirectVirtPortProfile(detach), + virDomainNetGetActualVirtPortProfile(detach), driver->stateDir)); VIR_FREE(detach->ifname); } @@ -1938,6 +1947,12 @@ int qemuDomainDetachNetDevice(struct qemud_driver *driver, } } + vport = virDomainNetGetActualVirtPortProfile(detach); + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) + ignore_value(virNetDevOpenvswitchRemovePort( + virDomainNetGetActualBridgeName(detach), + detach->ifname)); + networkReleaseActualDevice(detach); if (vm->def->nnets > 1) { memmove(vm->def->nets + i, diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 12cfbde..a513b3c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2563,7 +2563,7 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) { net = def->nets[i]; if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { if (virNetDevVPortProfileAssociate(net->ifname, - virDomainNetGetActualDirectVirtPortProfile(net), + virDomainNetGetActualVirtPortProfile(net), net->mac, virDomainNetGetActualDirectDev(net), def->uuid, @@ -2580,7 +2580,7 @@ err_exit: net = def->nets[i]; if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { ignore_value(virNetDevVPortProfileDisassociate(net->ifname, - virDomainNetGetActualDirectVirtPortProfile(net), + virDomainNetGetActualVirtPortProfile(net), net->mac, virDomainNetGetActualDirectDev(net), VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH)); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2d92d66..9bc5436 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -62,6 +62,7 @@ #include "network/bridge_driver.h" #include "uuid.h" #include "virtime.h" +#include "virnetdevtap.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -3604,6 +3605,7 @@ void qemuProcessStop(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; virErrorPtr orig_err; virDomainDefPtr def; + virNetDevVPortProfilePtr vport = NULL; int i; int logfile = -1; char *timestamp; @@ -3724,13 +3726,19 @@ void qemuProcessStop(struct qemud_driver *driver, net->ifname, net->mac, virDomainNetGetActualDirectDev(net), virDomainNetGetActualDirectMode(net), - virDomainNetGetActualDirectVirtPortProfile(net), + virDomainNetGetActualVirtPortProfile(net), driver->stateDir)); VIR_FREE(net->ifname); } /* release the physical device (or any other resources used by * this interface in the network driver */ + vport = virDomainNetGetActualVirtPortProfile(net); + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) + ignore_value(virNetDevOpenvswitchRemovePort( + virDomainNetGetActualBridgeName(net), + net->ifname)); + networkReleaseActualDevice(net); } diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 316d558..8c17578 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -142,7 +142,8 @@ umlConnectTapDevice(virConnectPtr conn, memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ if (virNetDevTapCreateInBridgePort(bridge, &net->ifname, tapmac, - 0, true, NULL) < 0) { + 0, true, NULL, + virDomainNetGetActualVirtPortProfile(net)) < 0) { if (template_ifname) VIR_FREE(net->ifname); goto error; diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c new file mode 100644 index 0000000..24a335a --- /dev/null +++ b/src/util/virnetdevopenvswitch.c @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2012 Nicira, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dan Wendlandt <dan(a)nicira.com> + * Kyle Mestery <kmestery(a)cisco.com> + * Ansis Atteka <aatteka(a)nicira.com> + */ + +#include <config.h> + +#include "virnetdevopenvswitch.h" +#include "command.h" +#include "memory.h" +#include "virterror_internal.h" +#include "ignore-value.h" +#include "virmacaddr.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +/** + * virNetDevOpenvswitchAddPort: + * @brname: the bridge name + * @ifname: the network interface name + * @macaddr: the mac address of the virtual interface + * @ovsport: the ovs specific fields + * + * Add an interface to the OVS bridge + * + * Returns 0 in case of success or -1 in case of failure. + */ +int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, + const unsigned char *macaddr, + virNetDevVPortProfilePtr ovsport) +{ + int ret = -1; + virCommandPtr cmd = NULL; + char macaddrstr[VIR_MAC_STRING_BUFLEN]; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + char *attachedmac_ex_id = NULL; + char *ifaceid_ex_id = NULL; + char *profile_ex_id = NULL; + + virMacAddrFormat(macaddr, macaddrstr); + virUUIDFormat(ovsport->u.openvswitch.interfaceID, uuidstr); + + if (virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=\"%s\"", + macaddrstr) < 0) + goto cleanup; + if (virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=\"%s\"", + uuidstr) < 0) + goto cleanup; + if (ovsport->u.openvswitch.profileID[0] != '\0') { + if (virAsprintf(&profile_ex_id, "external-ids:port-profile=\"%s\"", + ovsport->u.openvswitch.profileID) < 0) + goto cleanup; + } + + cmd = virCommandNew(OVSVSCTL); + if (ovsport->u.openvswitch.profileID[0] == '\0') { + virCommandAddArgList(cmd, "--", "--may-exist", "add-port", + brname, ifname, + "--", "set", "Interface", ifname, attachedmac_ex_id, + "--", "set", "Interface", ifname, ifaceid_ex_id, + "--", "set", "Interface", ifname, + "external-ids:iface-status=active", + NULL); + } else { + virCommandAddArgList(cmd, "--", "--may-exist", "add-port", + brname, ifname, + "--", "set", "Interface", ifname, attachedmac_ex_id, + "--", "set", "Interface", ifname, ifaceid_ex_id, + "--", "set", "Interface", ifname, profile_ex_id, + "--", "set", "Interface", ifname, + "external-ids:iface-status=active", + NULL); + } + + if (virCommandRun(cmd, NULL) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Unable to add port %s to OVS bridge %s"), + ifname, brname); + goto cleanup; + } + ret = 0; + + cleanup: + VIR_FREE(attachedmac_ex_id); + VIR_FREE(ifaceid_ex_id); + VIR_FREE(profile_ex_id); + virCommandFree(cmd); + return ret; +} + +/** + * virNetDevOpenvswitchRemovePort: + * @ifname: the network interface name + * + * Deletes an interface from a OVS bridge + * + * Returns 0 in case of success or -1 in case of failure. + */ +int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const char *ifname) +{ + int ret = -1; + virCommandPtr cmd = NULL; + + cmd = virCommandNew(OVSVSCTL); + virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, NULL); + + if (virCommandRun(cmd, NULL) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("Unable to delete port %s from OVS"), ifname); + goto cleanup; + } + ret = 0; + + cleanup: + virCommandFree(cmd); + return ret; +} diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h new file mode 100644 index 0000000..bca4c3e --- /dev/null +++ b/src/util/virnetdevopenvswitch.h @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2012 Nicira, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * Dan Wendlandt <dan(a)nicira.com> + * Kyle Mestery <kmestery(a)cisco.com> + * Ansis Atteka <aatteka(a)nicira.com> + */ + +#ifndef __VIR_NETDEV_OPENVSWITCH_H__ +# define __VIR_NETDEV_OPENVSWITCH_H__ + +# include "internal.h" +# include "util.h" +# include "virnetdevvportprofile.h" + + +int virNetDevOpenvswitchAddPort(const char *brname, + const char *ifname, + const unsigned char *macaddr, + virNetDevVPortProfilePtr ovsport) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_RETURN_CHECK; + +int virNetDevOpenvswitchRemovePort(const char *brname, const char *ifname) + ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + +#endif /* __VIR_NETDEV_OPENVSWITCH_H__ */ diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 2ed53c6..cd1d4c1 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -25,6 +25,7 @@ #include "virnetdevtap.h" #include "virnetdev.h" #include "virnetdevbridge.h" +#include "virnetdevopenvswitch.h" #include "virterror_internal.h" #include "virfile.h" #include "virterror_internal.h" @@ -249,6 +250,7 @@ int virNetDevTapDelete(const char *ifname ATTRIBUTE_UNUSED) * @macaddr: desired MAC address (VIR_MAC_BUFLEN long) * @vnet_hdr: whether to try enabling IFF_VNET_HDR * @tapfd: file descriptor return value for the new tap device + * @ovsport: Open vSwitch specific configuration * * This function creates a new tap device on a bridge. @ifname can be either * a fixed name or a name template with '%d' for dynamic name allocation. @@ -265,7 +267,8 @@ int virNetDevTapCreateInBridgePort(const char *brname, const unsigned char *macaddr, int vnet_hdr, bool up, - int *tapfd) + int *tapfd, + virNetDevVPortProfilePtr ovsport) { if (virNetDevTapCreate(ifname, vnet_hdr, tapfd) < 0) return -1; @@ -286,8 +289,13 @@ int virNetDevTapCreateInBridgePort(const char *brname, if (virNetDevSetMTUFromDevice(*ifname, brname) < 0) goto error; - if (virNetDevBridgeAddPort(brname, *ifname) < 0) - goto error; + if (ovsport) { + if (virNetDevOpenvswitchAddPort(brname, *ifname, macaddr, ovsport) < 0) + goto error; + } else { + if (virNetDevBridgeAddPort(brname, *ifname) < 0) + goto error; + } if (virNetDevSetOnline(*ifname, up) < 0) goto error; diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index fb35ac5..ee159f7 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -24,6 +24,7 @@ # define __VIR_NETDEV_TAP_H__ # include "internal.h" +# include "virnetdevvportprofile.h" int virNetDevTapCreate(char **ifname, int vnet_hdr, @@ -38,8 +39,10 @@ int virNetDevTapCreateInBridgePort(const char *brname, const unsigned char *macaddr, int vnet_hdr, bool up, - int *tapfd) + int *tapfd, + virNetDevVPortProfilePtr ovsport) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; + #endif /* __VIR_NETDEV_TAP_H__ */ diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index faadc3a..67fd7bc 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -968,6 +968,7 @@ virNetDevVPortProfileAssociate(const char *macvtap_ifname, switch (virtPort->virtPortType) { case VIR_NETDEV_VPORT_PROFILE_NONE: + case VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH: case VIR_NETDEV_VPORT_PROFILE_LAST: break; @@ -1027,6 +1028,7 @@ virNetDevVPortProfileDisassociate(const char *macvtap_ifname, switch (virtPort->virtPortType) { case VIR_NETDEV_VPORT_PROFILE_NONE: + case VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH: case VIR_NETDEV_VPORT_PROFILE_LAST: break; diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h index 7a8d81f..ec2d06d 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -35,6 +35,7 @@ enum virNetDevVPortProfile { VIR_NETDEV_VPORT_PROFILE_NONE, VIR_NETDEV_VPORT_PROFILE_8021QBG, VIR_NETDEV_VPORT_PROFILE_8021QBH, + VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH, VIR_NETDEV_VPORT_PROFILE_LAST, }; @@ -54,7 +55,7 @@ enum virNetDevVPortProfileOp { }; VIR_ENUM_DECL(virNetDevVPortProfileOp) -/* profile data for macvtap (VEPA) */ +/* profile data for macvtap (VEPA) and openvswitch */ typedef struct _virNetDevVPortProfile virNetDevVPortProfile; typedef virNetDevVPortProfile *virNetDevVPortProfilePtr; struct _virNetDevVPortProfile { @@ -69,6 +70,10 @@ struct _virNetDevVPortProfile { struct { char profileID[LIBVIRT_IFLA_VF_PORT_PROFILE_MAX]; } virtPort8021Qbh; + struct { + unsigned char interfaceID[VIR_UUID_BUFLEN]; + char profileID[LIBVIRT_IFLA_VF_PORT_PROFILE_MAX]; + } openvswitch; } u; }; -- 1.7.5.4

3 5

[libvirt] [PATCHv3 0/2] qemu: mitigate 'qemu disk buffers not flushed' problem
by Laine Stump 15 Feb '12

15 Feb '12

I previously pushed a patch that adds a new flag, VIR_DOMAIN_DESTROY_GRACEFUL, to virDomainDestroyFlags, so that a management application can destroy a domain without danger of sending SIGKILL to the qemu process too early (which occasionally results in a corrupted disk image due to qemu being unable to flush its disk buffers quickly enough). That patch will enable management applications to solve the problem by calling virDomainDestroyFlags with the new flag, and if they receive an error back from libvirtd, they can decide (or let the admin decide) when/if it is appropriate to call the more heavy-handed version of virDomainDestroy. However, that patch does *not* help those installations that are able to upgrade libvirt but have no available updated management application to install. Since the root cause of this bug is in libvirt, we need to do our best to mitigate the situation for these people. These two patches do two things: 1) Drop the driver lock while sleeping during qemuProcessKill(), so that it can wait for a longer period without locking up all other libvirtd threads. This patch is a slight re-work of a patch Eric sent to the list back in November. 2) Wait for a considerably longer period after sending SIGTERM before sending SIGKILL.

2 5

[libvirt] [PATCHv3] python: Expose virDomain{G, S}etInterfaceParameters APIs in python binding
by ajia＠redhat.com 15 Feb '12

15 Feb '12

From: Alex Jia <ajia(a)redhat.com> The v3 patch to follow latest python binding codes and change 'size' type from int to Py_ssize_t. An simple example to show how to use it: #!/usr/bin/env python import libvirt conn = libvirt.open(None) dom = conn.lookupByName('foo') print dom.interfaceParameters('vnet0', 0) params = {'outbound.peak': 10, 'inbound.peak': 10, 'inbound.burst': 20, 'inbound.average': 20, 'outbound.average': 30, 'outbound.burst': 30} print dom.setInterfaceParameters('vnet0', params, 0) print dom.interfaceParameters('vnet0', 0) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override-api.xml | 16 +++++ python/libvirt-override.c | 126 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 563dd46..ab8f33a 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -261,6 +261,22 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> + <function name='virDomainSetInterfaceParameters' file='python'> + <info>Change the bandwidth tunables for a interface device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='device' type='const char *' info='interface name'/> + <arg name='params' type='virTypedParameterPtr' info='Pointer to bandwidth tuning params object'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='int' info='0 in case of success, -1 in case of failure'/> + </function> + <function name='virDomainGetInterfaceParameters' file='python'> + <info>Get the bandwidth tunables for a interface device</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='device' type='const char *' info='interface name'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> + <return type='str *' info='the bandwidth tunables value or None in case of error'/> + </function> + <function name='virConnectListStoragePools' file='python'> <info>list the storage pools, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 4e8a97e..078324e 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1109,6 +1109,130 @@ cleanup: } static PyObject * +libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + Py_ssize_t size = 0; + unsigned int flags; + const char *device = NULL; + virTypedParameterPtr params, new_params; + + if (!PyArg_ParseTuple(args, + (char *)"OzOi:virDomainSetInterfaceParameters", + &pyobj_domain, &device, &info, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (size == 0) { + PyErr_Format(PyExc_LookupError, + "Need non-empty dictionary to set attributes"); + return NULL; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_INT_FAIL; + + if (nparams == 0) { + PyErr_Format(PyExc_LookupError, + "Domain has no settable attributes"); + return NULL; + } + + if (VIR_ALLOC_N(params, nparams) < 0) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainSetInterfaceParameters(domain, device, new_params, size, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; + } + + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); + VIR_FREE(params); + VIR_FREE(new_params); + return ret; +} + +static PyObject * +libvirt_virDomainGetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; + unsigned int flags; + const char *device = NULL; + virTypedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetInterfaceParameters", + &pyobj_domain, &device, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, NULL, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + return VIR_PY_NONE; + + if (!nparams) + return PyDict_New(); + + if (VIR_ALLOC_N(params, nparams) < 0) + return PyErr_NoMemory(); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetInterfaceParameters(domain, device, params, &nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + ret = VIR_PY_NONE; + goto cleanup; + } + + ret = getPyVirTypedParameter(params, nparams); + +cleanup: + virTypedParameterArrayClear(params, nparams); + VIR_FREE(params); + return ret; +} + +static PyObject * libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; @@ -5256,6 +5380,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainGetMemoryParameters", libvirt_virDomainGetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virDomainSetNumaParameters", libvirt_virDomainSetNumaParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetNumaParameters", libvirt_virDomainGetNumaParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetInterfaceParameters", libvirt_virDomainSetInterfaceParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetInterfaceParameters", libvirt_virDomainGetInterfaceParameters, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, -- 1.7.1

3 2

[libvirt] [PATCH] Improve error reporting when virsh console is run without a TTY
by Daniel P. Berrange 15 Feb '12

15 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> If attempting to run ssh root@somehost virsh console someguest You'll get an error 2012-02-15 13:11:47.683+0000: 4765: info : libvirt version: 0.9.10, package: 1.fc18 (Unknown, 2012-02-15-11:48:57, lettuce.camlab.fab.redhat.com) 2012-02-15 13:11:47.683+0000: 4765: error : vshRunConsole:320 : unable to get tty attributes: Invalid argument Connected to domain f16x86_64 Escape character is ^] There are several problems here - The actual error message is bad for users - We shouldn't rely on VIR_ERROR for this case - The prompt makes it look like we still connected because we didn't flush stdout. * virsh.c: Flush stdout before starting console and check for a valid tty --- tools/virsh.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 66ba61c..d4d3a83 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -838,8 +838,14 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, const char *name) goto cleanup; } + if (!isatty(STDIN_FILENO)) { + vshError(ctl, "%s", _("Cannot run interactive console without a controlling TTY")); + goto cleanup; + } + vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom)); vshPrintExtra(ctl, _("Escape character is %s\n"), ctl->escapeChar); + fflush(stdout); if (vshRunConsole(dom, name, ctl->escapeChar) == 0) ret = true; -- 1.7.7.6

2 1

[libvirt] [PATCH] Make virInitialize be called in multithreading environment
by Guannan Ren 15 Feb '12

15 Feb '12

When initializing libvirt shared library, calling virOnce to make load hypervisor drivers and create thread local key only once. --- src/libvirt.c | 131 +++++++++++++++++++------------------------ src/util/threads-pthread.c | 8 ++- 2 files changed, 64 insertions(+), 75 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index a55d823..4656779 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -106,7 +106,8 @@ static int virNWFilterDriverTabCount = 0; static virStateDriverPtr virStateDriverTab[MAX_DRIVERS]; static int virStateDriverTabCount = 0; #endif -static int initialized = 0; +static int virInitResult = 0; +static virOnceControl virOnceKey = VIR_ONCE_CONTROL_INITIALIZER; #if defined(POLKIT_AUTH) static int virConnectAuthGainPolkit(const char *privilege) { @@ -379,30 +380,19 @@ static struct gcry_thread_cbs virTLSThreadImpl = { } while (0) /** - * virInitialize: - * - * Initialize the library. It's better to call this routine at startup - * in multithreaded applications to avoid potential race when initializing - * the library. - * - * Calling virInitialize is mandatory, unless your first API call is one of - * virConnectOpen*. - * - * Returns 0 in case of success, -1 in case of error + * Initialize global variable and load supported + * hypervisor drivers once. */ -int -virInitialize(void) +static void +virInitializeOnce(void) { - if (initialized) - return 0; - - initialized = 1; + if (virInitResult < 0) + return; - if (virThreadInitialize() < 0 || - virErrorInitialize() < 0 || + if (virErrorInitialize() < 0 || virRandomInitialize(time(NULL) ^ getpid()) || virNodeSuspendInit() < 0) - return -1; + goto failed; gcry_control(GCRYCTL_SET_THREAD_CBS, &virTLSThreadImpl); gcry_check_version(NULL); @@ -414,12 +404,9 @@ virInitialize(void) VIR_DEBUG("register drivers"); #if HAVE_WINSOCK2_H - if (winsock_init () == -1) return -1; + if (winsock_init () == -1) goto failed; #endif - if (!bindtextdomain(PACKAGE, LOCALEDIR)) - return -1; - /* * Note that the order is important: the first ones have a higher * priority when calling virConnectOpen. @@ -459,36 +446,65 @@ virInitialize(void) # endif #else # ifdef WITH_TEST - if (testRegister() == -1) return -1; + if (testRegister() == -1) goto failed; # endif # ifdef WITH_XEN - if (xenRegister () == -1) return -1; + if (xenRegister () == -1) goto failed; # endif # ifdef WITH_OPENVZ - if (openvzRegister() == -1) return -1; + if (openvzRegister() == -1) goto failed; # endif # ifdef WITH_VMWARE - if (vmwareRegister() == -1) return -1; + if (vmwareRegister() == -1) goto failed; # endif # ifdef WITH_PHYP - if (phypRegister() == -1) return -1; + if (phypRegister() == -1) goto failed; # endif # ifdef WITH_VBOX - if (vboxRegister() == -1) return -1; + if (vboxRegister() == -1) goto failed; # endif # ifdef WITH_ESX - if (esxRegister() == -1) return -1; + if (esxRegister() == -1) goto failed; # endif # ifdef WITH_HYPERV - if (hypervRegister() == -1) return -1; + if (hypervRegister() == -1) goto failed; # endif # ifdef WITH_XENAPI - if (xenapiRegister() == -1) return -1; + if (xenapiRegister() == -1) goto failed; # endif # ifdef WITH_REMOTE - if (remoteRegister () == -1) return -1; + if (remoteRegister () == -1) goto failed; # endif #endif + return; + +failed: + virInitResult = -1; +} + +/** + * virInitialize: + * + * Initialize the library. It could be either called directly + * or be called via one of virConnectOpen* in multithreaded + * applications. + * + * Returns 0 in case of success, -1 in case of error + */ +int +virInitialize(void) +{ + int ret; + + if (virThreadInitialize() < 0) + return -1; + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) + return -1; + + ret = virOnce(&virOnceKey, virInitializeOnce); + if (ret < 0 || virInitResult < 0) + return -1; return 0; } @@ -573,9 +589,6 @@ DllMain (HINSTANCE instance ATTRIBUTE_UNUSED, int virRegisterNetworkDriver(virNetworkDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -606,9 +619,6 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) int virRegisterInterfaceDriver(virInterfaceDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -639,9 +649,6 @@ virRegisterInterfaceDriver(virInterfaceDriverPtr driver) int virRegisterStorageDriver(virStorageDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -672,9 +679,6 @@ virRegisterStorageDriver(virStorageDriverPtr driver) int virRegisterDeviceMonitor(virDeviceMonitorPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -705,9 +709,6 @@ virRegisterDeviceMonitor(virDeviceMonitorPtr driver) int virRegisterSecretDriver(virSecretDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -738,9 +739,6 @@ virRegisterSecretDriver(virSecretDriverPtr driver) int virRegisterNWFilterDriver(virNWFilterDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -774,9 +772,6 @@ virRegisterDriver(virDriverPtr driver) { VIR_DEBUG("driver=%p name=%s", driver, driver ? NULLSTR(driver->name) : "(null)"); - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -814,9 +809,6 @@ virRegisterDriver(virDriverPtr driver) int virRegisterStateDriver(virStateDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -844,9 +836,6 @@ virRegisterStateDriver(virStateDriverPtr driver) int virStateInitialize(int privileged) { int i, ret = 0; - if (virInitialize() < 0) - return -1; - for (i = 0 ; i < virStateDriverTabCount ; i++) { if (virStateDriverTab[i]->initialize && virStateDriverTab[i]->initialize(privileged) < 0) { @@ -942,9 +931,8 @@ virGetVersion(unsigned long *libVer, const char *type ATTRIBUTE_UNUSED, { VIR_DEBUG("libVir=%p, type=%s, typeVer=%p", libVer, type, typeVer); - if (!initialized) - if (virInitialize() < 0) - goto error; + if (virInitialize() < 0) + goto error; if (libVer == NULL) goto error; @@ -1342,9 +1330,8 @@ virConnectPtr virConnectOpen (const char *name) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s", name); ret = do_open (name, NULL, 0); @@ -1376,9 +1363,8 @@ virConnectPtr virConnectOpenReadOnly(const char *name) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s", name); ret = do_open (name, NULL, VIR_CONNECT_RO); @@ -1414,9 +1400,8 @@ virConnectOpenAuth(const char *name, unsigned int flags) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s, auth=%p, flags=%x", NULLSTR(name), auth, flags); ret = do_open (name, auth, flags); diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c index ea64887..15d1407 100644 --- a/src/util/threads-pthread.c +++ b/src/util/threads-pthread.c @@ -42,10 +42,14 @@ void virThreadOnExit(void) int virOnce(virOnceControlPtr once, virOnceFunc init) { - return pthread_once(&once->once, init); + int ret; + if ((ret = pthread_once(&once->once, init)) != 0) { + errno = ret; + return -1; + } + return 0; } - int virMutexInit(virMutexPtr m) { int ret; -- 1.7.7.5

1 0

[libvirt] [PATCH libvirt-glib] Avoid triggering deprecation warnings on newest GLib
by Daniel P. Berrange 15 Feb '12

15 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- libvirt-glib/libvirt-glib-event.c | 4 ++++ libvirt-glib/libvirt-glib-main.c | 4 ++++ libvirt-gobject/libvirt-gobject-compat.h | 5 +++++ libvirt-gobject/libvirt-gobject-manager.c | 1 + 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index c1761e8..6d54b10 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -31,6 +31,10 @@ #include "libvirt-glib/libvirt-glib.h" +#if GLIB_CHECK_VERSION(2, 31, 0) +#define g_mutex_new() g_new0(GMutex, 1) +#endif + struct gvir_event_handle { int watch; diff --git a/libvirt-glib/libvirt-glib-main.c b/libvirt-glib/libvirt-glib-main.c index 8f50cc8..0cb2dd5 100644 --- a/libvirt-glib/libvirt-glib-main.c +++ b/libvirt-glib/libvirt-glib-main.c @@ -63,8 +63,12 @@ gboolean gvir_init_check(int *argc G_GNUC_UNUSED, GError **err G_GNUC_UNUSED) { virSetErrorFunc(NULL, gvir_error_func); + + /* Threading is always enabled from 2.31.0 onwards */ +#if !GLIB_CHECK_VERSION(2, 31, 0) if (!g_thread_supported()) g_thread_init(NULL); +#endif virInitialize(); diff --git a/libvirt-gobject/libvirt-gobject-compat.h b/libvirt-gobject/libvirt-gobject-compat.h index 0c37537..839dfe1 100644 --- a/libvirt-gobject/libvirt-gobject-compat.h +++ b/libvirt-gobject/libvirt-gobject-compat.h @@ -26,6 +26,11 @@ #include <glib-object.h> #include <gio/gio.h> +#if GLIB_CHECK_VERSION(2, 31, 0) +#define g_mutex_new() g_new0(GMutex, 1) +#define g_mutex_free(m) g_free(m) +#endif + #if !GLIB_CHECK_VERSION(2,26,0) #define G_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) G_DEFINE_BOXED_TYPE_WITH_CODE (TypeName, type_name, copy_func, free_func, {}) #define G_DEFINE_BOXED_TYPE_WITH_CODE(TypeName, type_name, copy_func, free_func, _C_) _G_DEFINE_BOXED_TYPE_BEGIN (TypeName, type_name, copy_func, free_func) {_C_;} _G_DEFINE_TYPE_EXTENDED_END() diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index aef519f..da5d31d 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -28,6 +28,7 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" +#include "libvirt-gobject/libvirt-gobject-compat.h" #define GVIR_MANAGER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_MANAGER, GVirManagerPrivate)) -- 1.7.7.6

2 1

[libvirt] [PATCH 0/2 v3] Implement DomainPMSuspendForDuration for qemu
by Michal Privoznik 15 Feb '12

15 Feb '12

This is basically v3 for: https://www.redhat.com/archives/libvir-list/2012-February/msg00533.html This time, I've split it into 2 patches so it can be reviewed easier. Michal Privoznik (2): qemu: Set capabilities based on supported monitor commands qemu: Implement DomainPMSuspendForDuration src/qemu/qemu_agent.c | 31 +++++++++++++++ src/qemu/qemu_agent.h | 2 + src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 87 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 21 +++++----- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 15 ++++--- src/qemu/qemu_monitor_json.h | 5 ++- src/qemu/qemu_process.c | 2 +- 10 files changed, 149 insertions(+), 20 deletions(-) -- 1.7.3.4

2 5

[libvirt] libvirtError: internal error cannot create rule since ebtables tool is missing.
by Phantomcircuit 15 Feb '12

15 Feb '12

# libvirtd --version libvirtd (libvirt) 0.9.8 # which ebtables /sbin/ebtables 2012-02-15 09:40:59.083+0000: 17675: error : ebtablesCreateRuleInstance:1943 : internal error cannot create rule since ebtables tool is missing. 2012-02-15 09:40:59.107+0000: 17675: error : virNetDevGetIndex:656 : Unable to get index for interface vnet0: No such device ebtables_cmd_path = virFindFileInPath("ebtables"); I can't figure out why ebtables_cmd_path is NULL when

1 0

[libvirt] Fail to import available VM image
by Jun Koi 15 Feb '12

15 Feb '12

hi, i am trying to import an available KVM image to use with libvirt. i am not sure if this is the problem of libvirt or not, so bear in me if that is not the case. i run the following command, and got error: # virt-install -n winxp -r 800 -f img.winxp --accelerate --vnc --noautoconsole -v --import ERROR [Errno 10] No child processes all the softwares are of latest version (libvirt 0.9.10 and virtinst-0.60.1) where am i wrong? many thanks, Jun

3 9

[libvirt] [PATCH] storage: Allow runtime detection of scrub
by Michal Privoznik 14 Feb '12

14 Feb '12

Currently, if scrub (used for wiping algorithms) is not present at compile time, we don't support any other wiping algorithms than zeroing, even if it was installed later. Switch to runtime detection instead. --- configure.ac | 30 ++++-------------------------- src/storage/storage_driver.c | 4 ---- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/configure.ac b/configure.ac index 67351d9..5320f71 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,8 @@ AC_PATH_PROG([UDEVSETTLE], [udevsettle], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([MODPROBE], [modprobe], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) +AC_PATH_PROG([SCRUB], [scrub], [], + [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"], [Location or name of the dnsmasq program]) @@ -232,6 +234,8 @@ if test -n "$MODPROBE"; then AC_DEFINE_UNQUOTED([MODPROBE],["$MODPROBE"], [Location or name of the modprobe program]) fi +AC_DEFINE_UNQUOTED([SCRUB],["$SCRUB"], + [Location or name of the scrub program (for wiping algorithms)]) dnl Specific dir for HTML output ? AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=path], @@ -2500,32 +2504,6 @@ AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) AC_SUBST([LIBNL_CFLAGS]) AC_SUBST([LIBNL_LIBS]) -dnl scrub program for different volume wiping algorithms - -AC_ARG_WITH([scrub], - AC_HELP_STRING([--with-scrub], [enable different volume wiping algorithms - @<:@default=check@:>@]), - [with_macvtap=${withval}], - [with_scrub=check]) - -if test "$with_scrub" != "no"; then - AC_PATH_PROG([SCRUB], [scrub]) - if test -z "$SCRUB" ; then - if test "$with_scrub" = "check"; then - with_scrub=no - else - AC_MSG_ERROR([You must install the 'scrub' binary to enable - different volume wiping algorithms]) - fi - else - with_scrub=yes - fi - if test "$with_scrub" = "yes"; then - AC_DEFINE_UNQUOTED([SCRUB], ["$SCRUB"], - [Location of the scrub program]) - fi -fi - # Only COPYING.LIB is under version control, yet COPYING # is included as part of the distribution tarball. # Copy one to the other, but only if this is a srcdir-build. diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 9170a17..df0e291 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1918,7 +1918,6 @@ storageVolumeWipeInternal(virStorageVolDefPtr def, if (algorithm != VIR_STORAGE_VOL_WIPE_ALG_ZERO) { const char *alg_char ATTRIBUTE_UNUSED = NULL; switch (algorithm) { -#ifdef SCRUB case VIR_STORAGE_VOL_WIPE_ALG_NNSA: alg_char = "nnsa"; break; @@ -1943,13 +1942,11 @@ storageVolumeWipeInternal(virStorageVolDefPtr def, case VIR_STORAGE_VOL_WIPE_ALG_RANDOM: alg_char = "random"; break; -#endif default: virStorageReportError(VIR_ERR_INVALID_ARG, _("unsupported algorithm %d"), algorithm); } -#ifdef SCRUB cmd = virCommandNew(SCRUB); virCommandAddArgList(cmd, "-f", "-p", alg_char, def->target.path, NULL); @@ -1958,7 +1955,6 @@ storageVolumeWipeInternal(virStorageVolDefPtr def, goto out; ret = 0; -#endif goto out; } else { if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { -- 1.7.3.4

2 1

[libvirt] [PATCHv3 0/3] Xen: Fix <clock> handling
by Philipp Hahn 14 Feb '12

14 Feb '12

Before version 3.1 xen only implemented clock/@offset='utc' and 'localtime'. With the introduction of managed domains in 3.1 xend keeps track of the rtc_timeoffset, even over reboots. This translates to libvirts clock/@offset='variable' variant. Be advised that only HV domains have a RTC. In addition xen also supports a variant where the offset is tracked to 'localtime', which is currently not supported by libvirt. To make matters worse, this was somehow broken in some versions of xen and was finally fixed with version xen-3.4. The following patch set ... * adds support for handling variable offsets relative to localtime, * fixes libvirt to use clock/@offset='variable' for newer xen versions, * adapts the test suit accordingly I've tested this on CenOS5 (xend-3.0.3 + 3.1.2 hypervisor?), UCS-2.3 (xen-3.2.1), UCS-2.4 (xen-3.4.3) and UCS-3.0 (xen-4.1.2). Since v1: + fix handling of direct-PV-domains + added handling of localtime=1 + rtc_timeoffset + fixed test suite Since v2: (on feedback by Eric) + add the adjustment='reset' attribute to force the old behaviour + handle adjustment='$timeDelta' as a short-cut for the conversion to variable. + simplify error path handling + update version numbers to 0.9.11 Philipp Hahn (3): Support clock=variable relative to localtime Xen: Fix <clock> handling Xen: Adapt <clock> tests docs/formatdomain.html.in | 18 ++- docs/schemas/domaincommon.rng | 30 +++- src/conf/domain_conf.c | 60 +++++++- src/conf/domain_conf.h | 17 ++- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 8 +- src/qemu/qemu_process.c | 2 +- src/xenxs/xen_sxpr.c | 167 +++++++++++++++----- src/xenxs/xen_xm.c | 123 ++++++++++++--- .../qemuxml2argv-clock-variable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- .../sexpr2xml-disk-block-shareable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 +- .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 2 +- .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 +- .../sexpr2xml-pv-bootloader-cmdline.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 2 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 2 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 +- tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg | 1 + tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- .../test-fullvirt-usbtablet-no-bus.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 1 + tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.cfg | 1 + tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 +- .../test-paravirt-new-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-new-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 +- .../test-paravirt-old-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-old-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-old-pvfb.xml | 2 +- tests/xmconfigdata/test-paravirt-vcpu.cfg | 1 + tests/xmconfigdata/test-paravirt-vcpu.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 1 + .../xml2sexpr-disk-block-shareable.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 5 +- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 1 + .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 3 +- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 1 + .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +- .../xml2sexpr-pv-bootloader-cmdline.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv.sexpr | 2 +- 157 files changed, 525 insertions(+), 200 deletions(-)

1 4

[libvirt] [PATCHv2 0/3] Xen: Fix <clock> handling
by Philipp Hahn 14 Feb '12

14 Feb '12

Before version 3.1 xen only implemented clock/@offset='utc' and 'localtime'. With the introduction of managed domains in 3.1 xend keeps track of the rtc_timeoffset, even over reboots. This translates to libvirts clock/@offset='variable' variant. Be advised that only HV domains have a RTC. In addition xen also supports a variant where the offset is tracked to 'localtime', which is currently not supported by libvirt. To make matters worse, this was somehow broken in some versions of xen and was finally fixed with version xen-3.4. The following patch set ... * adds support for handling variable offsets relative to localtime, * fixes libvirt to use clock/@offset='variable' for newer xen versions, * adapts the test suit accordingly I've tested this on CenOS5 (xend-3.0.3 + 3.1.2 hypervisor?), UCS-2.3 (xen-3.2.1), UCS-2.4 (xen-3.4.3) and UCS-3.0 (xen-4.1.2). Since v1: + fix handling of direct-PV-domains + added handling of localtime=1 + rtc_timeoffset + fixed test suite Questions: 1. Handling of legacy XML domain configurations I'm reluctant to define LIBVIRT_XEND_CLOCK_STRICT, since this would probably break many existing XML configuration files, since they would be rejected libvirt now for still using clock/@offset='utc'/'localtime'. Luckily for us libvirt doesn't support snapshots with xen, because then this XML configuration would be stored in the snapshot meta data, rendering them all invalid. 2. Error path handling There are now a lot of different cases (PV, HV<3.1, HV>3.1), which all have the same error path. This is somehow ugly to code in C, I hope it's okay to use vmlocaltime=-1 to indicate an error instead of using "goto". But if you have a better idea, please feel free to comments. 3. libvirt-0.9.10 or .11 This patch-series should probably receive some more testing, so for 0.9.10 it's too late. If it's not included, I'd need to update the reference to the version when this patch will get in. Philipp Hahn (3): Support clock=variable relative to localtime Xen: Fix <clock> handling Xen: Adapt <clock> tests docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 8 + src/conf/domain_conf.c | 24 +++- src/conf/domain_conf.h | 15 ++- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 8 +- src/qemu/qemu_process.c | 2 +- src/xenxs/xen_sxpr.c | 161 +++++++++++++++----- src/xenxs/xen_xm.c | 116 +++++++++++--- .../qemuxml2argv-clock-variable.xml | 2 +- tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg | 1 + tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 2 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 1 + tests/xmconfigdata/test-paravirt-net-vifname.cfg | 1 + .../test-paravirt-new-pvfb-vncdisplay.cfg | 1 + tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 1 + .../test-paravirt-old-pvfb-vncdisplay.cfg | 1 + tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-vcpu.cfg | 1 + tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 1 + .../xml2sexpr-disk-block-shareable.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 5 +- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 1 + .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 3 +- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 1 + .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +- .../xml2sexpr-pv-bootloader-cmdline.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv.sexpr | 2 +- 72 files changed, 363 insertions(+), 108 deletions(-)

2 9

[libvirt] virsh bash completion file
by Serge E. Hallyn 14 Feb '12

14 Feb '12

Hi, I've been trying out a bash autocompletion file by Geoff Low (slight hack by me, don't blame him for my hack), and it's working pretty nicely. I'm not sure where to put it in the git tree, but it seems like it'd be nice to have upstream? thanks, -serge ==================================================== #!/bin/bash ############################################################################# # # virsh bash completion # Author: Geoff Low (glow(a)cmedresearch.com) # ############################################################################ VIRSH=$(which virsh) function get_main_option_list { # assume options are specified as [--option1 | --option2 | ...] OPTIONS=$(${VIRSH} help | grep '|' | sed -e 's/.*\[$.*$\]/\1/g;s/|//g') } function get_option_list { # get the options for a choice local option=$1; # assume options are specified as [--option1 | --option2 | ...] OPTIONS=$(${VIRSH} help ${option} 2> /dev/null | grep '|' | sed -e 's/.*\[$.*$\]/\1/g;s/|//g') } function _virsh_complete() { local cur prev opts COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" cnxn="" i=0 while [[ $i -lt $COMP_CWORD ]]; do if [ ${COMP_WORDS[i]} = "-c" ]; then tgt=`echo ${COMP_LINE} | sed -e 's/^.* -c $[^ \t]*$.*$/\1/'` cnxn="-c $tgt" break fi let i++ done if [ ! -z $tgt ]; then if [ $COMP_CWORD -eq 5 ]; then prev="${COMP_WORDS[0]}" fi fi _all_domains=$(${VIRSH} ${cnxn} --q list --all 2> /dev/null | grep -E "(running|shut off)$" | awk '{print $2,$3}') all_domains=$(echo "$_all_domains" | cut -d " " -f 1) all_networks=$(${VIRSH} --q net-list --all 2> /dev/null | grep 'active' | cut -d " " -f 1) live_domains=$(echo "$_all_domains" | grep -E "running$" | awk '{print $1}') shutoff_domains=$(echo "$_all_domains" | grep -E "shut$" | awk '{print $1}') case "${prev}" in virsh | --help) get_main_option_list ALL_OPTS=$(${VIRSH} -q help 2> /dev/null | sed '1,2d' | awk '{print $1}') COMPREPLY=( $(compgen -W "$OPTIONS $ALL_OPTS" -- ${cur}) ) ;; list) get_option_list ${prev} COMPREPLY=( $(compgen -W "$OPTIONS" -- ${cur}) ) ;; autostart | dominfo | domuuid | domid | dominfo | domname | dumpxml | setmem ) get_option_list ${prev} COMPREPLY=( $(compgen -W "$OPTIONS $all_domains" -- ${cur}) ) ;; start | undefine) get_option_list ${prev} COMPREPLY=( $(compgen -W "$OPTIONS $shutoff_domains" -- ${cur}) ) ;; create | define) get_option_list ${prev} xml_files=$(ls *.xml) COMPREPLY=( $(compgen -W "$OPTIONS $xml_files" -- ${cur}) ) ;; shutdown | domstate | console | destroy | reboot | save | suspend | resume | vcpuinfo | vncdisplay) get_option_list ${prev} COMPREPLY=( $(compgen -W "$OPTIONS $live_domains" -- ${cur}) ) ;; connect) get_option_list ${prev} URI_TEMPLATES="xen:// qemu:// test:// xen+ssh:// test+tcp:// qemu+unix:// qemu+tls:// qemu+ssh://" COMPREPLY=( $(compgen -W "$OPTIONS $URI_TEMPLATES" -- ${cur}) ) ;; *) COMPREPLY=( $(compgen -f -- ${cur}) ) return 0 ;; esac } complete -F _virsh_complete virsh

4 8

[libvirt] [PATCH v2] qemu: Implement DomainPMSuspendForDuration
by Michal Privoznik 14 Feb '12

14 Feb '12

via user agent. --- diff to v1: -allow mem and hybrid targets iff system_wakeup monitor command is presented src/qemu/qemu_agent.c | 31 +++++++++++++++ src/qemu/qemu_agent.h | 2 + src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 87 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 21 +++++----- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 15 ++++--- src/qemu/qemu_monitor_json.h | 5 ++- src/qemu/qemu_process.c | 2 +- 10 files changed, 149 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 9df5546..a17d025 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1184,3 +1184,34 @@ cleanup: virJSONValueFree(reply); return ret; } + +VIR_ENUM_DECL(qemuAgentSuspendMode); + +VIR_ENUM_IMPL(qemuAgentSuspendMode, + VIR_NODE_SUSPEND_TARGET_LAST, + "guest-suspend-ram", + "guest-suspend-disk", + "guest-suspend-hybrid"); + +int +qemuAgentSuspend(qemuAgentPtr mon, + unsigned int target) +{ + int ret = -1; + virJSONValuePtr cmd; + virJSONValuePtr reply = NULL; + + cmd = qemuAgentMakeCommand(qemuAgentSuspendModeTypeToString(target), + NULL); + if (!cmd) + return -1; + + ret = qemuAgentCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuAgentCheckError(cmd, reply); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index df59ef7..98c23b0 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -69,4 +69,6 @@ int qemuAgentShutdown(qemuAgentPtr mon, int qemuAgentFSFreeze(qemuAgentPtr mon); int qemuAgentFSThaw(qemuAgentPtr mon); +int qemuAgentSuspend(qemuAgentPtr mon, + unsigned int target); #endif /* __QEMU_AGENT_H__ */ diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 426637c..6d35676 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -152,6 +152,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "fsdev-writeout", "drive-iotune", /* 85 */ + "system_wakeup", ); struct qemu_feature_flags { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 18d6bc8..b9666e1 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -120,6 +120,7 @@ enum qemuCapsFlags { QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */ + QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 160cb37..d342fae 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12041,6 +12041,92 @@ cleanup: return ret; } +static int +qemuDomainPMSuspendForDuration(virDomainPtr dom, + unsigned int target, + unsigned long long duration, + unsigned int flags) +{ + struct qemud_driver *driver = dom->conn->privateData; + qemuDomainObjPrivatePtr priv; + virDomainObjPtr vm; + int ret = -1; + + virCheckFlags(0, -1); + + if (duration) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("Duration not supported. Use 0 for now")); + return -1; + } + + if (!(target == VIR_NODE_SUSPEND_TARGET_MEM || + target == VIR_NODE_SUSPEND_TARGET_DISK || + target == VIR_NODE_SUSPEND_TARGET_HYBRID)) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("Unknown suspend target: %u"), + target); + return -1; + } + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + priv = vm->privateData; + + if (!qemuCapsGet(priv->qemuCaps, QEMU_CAPS_WAKEUP) && + (target == VIR_NODE_SUSPEND_TARGET_MEM || + target == VIR_NODE_SUSPEND_TARGET_HYBRID)) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("Unable to suspend domain due to " + "missing system_wakeup monitor command")); + goto cleanup; + } + + if (priv->agentError) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("QEMU guest agent is not available due to an error")); + goto cleanup; + } + + if (!priv->agent) { + qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("QEMU guest agent is not configured")); + goto cleanup; + } + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + + qemuDomainObjEnterAgent(driver, vm); + ret = qemuAgentSuspend(priv->agent, target); + qemuDomainObjExitAgent(driver, vm); + +endjob: + if (qemuDomainObjEndJob(driver, vm) == 0) + vm = NULL; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = "QEMU", @@ -12198,6 +12284,7 @@ static virDriver qemuDriver = { .domainGetDiskErrors = qemuDomainGetDiskErrors, /* 0.9.10 */ .domainSetMetadata = qemuDomainSetMetadata, /* 0.9.10 */ .domainGetMetadata = qemuDomainGetMetadata, /* 0.9.10 */ + .domainPMSuspendForDuration = qemuDomainPMSuspendForDuration, /* 0.9.10 */ }; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7872e3d..93f3505 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -996,9 +996,11 @@ int qemuMonitorEmitBlockJob(qemuMonitorPtr mon, -int qemuMonitorSetCapabilities(qemuMonitorPtr mon) +int qemuMonitorSetCapabilities(qemuMonitorPtr mon, + virBitmapPtr qemuCaps) { int ret; + int json_hmp; VIR_DEBUG("mon=%p", mon); if (!mon) { @@ -1009,19 +1011,16 @@ int qemuMonitorSetCapabilities(qemuMonitorPtr mon) if (mon->json) { ret = qemuMonitorJSONSetCapabilities(mon); - if (ret == 0) { - int hmp = qemuMonitorJSONCheckHMP(mon); - if (hmp < 0) { - /* qemu may quited unexpectedly when we call - * qemuMonitorJSONCheckHMP() */ - ret = -1; - } else { - mon->json_hmp = hmp > 0; - } - } + if (ret) + goto cleanup; + + ret = qemuMonitorJSONCheckCommands(mon, qemuCaps, &json_hmp); + mon->json_hmp = json_hmp > 0; } else { ret = 0; } + +cleanup: return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 5945d3e..7c6c52b 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -29,6 +29,7 @@ # include "domain_conf.h" # include "qemu_conf.h" +# include "bitmap.h" # include "virhash.h" typedef struct _qemuMonitor qemuMonitor; @@ -135,7 +136,8 @@ qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm, void qemuMonitorClose(qemuMonitorPtr mon); -int qemuMonitorSetCapabilities(qemuMonitorPtr mon); +int qemuMonitorSetCapabilities(qemuMonitorPtr mon, + virBitmapPtr qemuCaps); int qemuMonitorCheckHMP(qemuMonitorPtr mon, const char *cmd); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index b0ae570..513788a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -34,6 +34,7 @@ #include "qemu_monitor_text.h" #include "qemu_monitor_json.h" #include "qemu_command.h" +#include "qemu_capabilities.h" #include "memory.h" #include "logging.h" #include "driver.h" @@ -800,7 +801,9 @@ qemuMonitorJSONSetCapabilities(qemuMonitorPtr mon) * human-monitor-command worked or -1 on failure */ int -qemuMonitorJSONCheckHMP(qemuMonitorPtr mon) +qemuMonitorJSONCheckCommands(qemuMonitorPtr mon, + virBitmapPtr qemuCaps, + int *json_hmp) { int ret = -1; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-commands", NULL); @@ -828,13 +831,13 @@ qemuMonitorJSONCheckHMP(qemuMonitorPtr mon) !(name = virJSONValueObjectGetString(entry, "name"))) goto cleanup; - if (STREQ(name, "human-monitor-command")) { - ret = 1; - goto cleanup; - } + if (STREQ(name, "human-monitor-command")) + *json_hmp = 1; + + if (STREQ(name, "system_wakeup")) + qemuCapsSet(qemuCaps, QEMU_CAPS_WAKEUP); } - /* human-monitor-command is not supported */ ret = 0; cleanup: diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index d221e59..d0b3000 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -28,6 +28,7 @@ # include "internal.h" # include "qemu_monitor.h" +# include "bitmap.h" int qemuMonitorJSONIOProcess(qemuMonitorPtr mon, const char *data, @@ -41,7 +42,9 @@ int qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon, int qemuMonitorJSONSetCapabilities(qemuMonitorPtr mon); -int qemuMonitorJSONCheckHMP(qemuMonitorPtr mon); +int qemuMonitorJSONCheckCommands(qemuMonitorPtr mon, + virBitmapPtr qemuCaps, + int *json_hmp); int qemuMonitorJSONStartCPUs(qemuMonitorPtr mon, virConnectPtr conn); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2d92d66..7afb585 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1086,7 +1086,7 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjEnterMonitorWithDriver(driver, vm); - ret = qemuMonitorSetCapabilities(priv->mon); + ret = qemuMonitorSetCapabilities(priv->mon, priv->qemuCaps); qemuDomainObjExitMonitorWithDriver(driver, vm); error: -- 1.7.3.4

2 2

[libvirt] [PATCH] python: Avoid memory leaks on libvirt_virNodeGetMemoryStats
by ajia＠redhat.com 14 Feb '12

14 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks are introduced in commit 17c7795. * python/libvirt-override.c (libvirt_virNodeGetMemoryStats): fix memory leaks and improve codes return value. For details, please see the following link: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=770944 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 4e8a97e..ecb11ea 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2426,7 +2426,9 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) static PyObject * libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *ret; + PyObject *info, *ret; + PyObject *key = NULL; + PyObject *val = NULL; PyObject *pyobj_conn; virConnectPtr conn; unsigned int flags; @@ -2446,28 +2448,45 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) if (nparams) { if (VIR_ALLOC_N(stats, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetMemoryStats(conn, cellNum, stats, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { - VIR_FREE(stats); - return VIR_PY_NONE; + ret = VIR_PY_NONE; + goto cleanup; } } - if (!(ret = PyDict_New())) { - VIR_FREE(stats); - return VIR_PY_NONE; + if (!(info = PyDict_New())) { + ret = VIR_PY_NONE; + goto cleanup; } + for (i = 0; i < nparams; i++) { - PyDict_SetItem(ret, - libvirt_constcharPtrWrap(stats[i].field), - libvirt_ulonglongWrap(stats[i].value)); + key = libvirt_constcharPtrWrap(stats[i].field); + val = libvirt_ulonglongWrap(stats[i].value); + + if (!key || !val) + goto cleanup; + + if (PyDict_SetItem(info, key, val) < 0) { + Py_DECREF(info); + goto cleanup; + } + + Py_DECREF(key); + Py_DECREF(val); } VIR_FREE(stats); - return ret; + return info; + +cleanup: + VIR_FREE(stats); + Py_XDECREF(key); + Py_XDECREF(val); + return NULL; } static PyObject * -- 1.7.1

4 6

[libvirt] [PATCHv2] python: Avoid memory leaks on libvirt_virNodeGetMemoryStats
by ajia＠redhat.com 14 Feb '12

14 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks are introduced in commit 17c7795. * python/libvirt-override.c (libvirt_virNodeGetMemoryStats): fix memory leaks and improve codes return value. For details, please see the following link: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=770944 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 4e8a97e..594aae6 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2426,7 +2426,9 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) static PyObject * libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *ret; + PyObject *ret = VIR_PY_NONE; + PyObject *key = NULL; + PyObject *val = NULL; PyObject *pyobj_conn; virConnectPtr conn; unsigned int flags; @@ -2442,32 +2444,45 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) c_retval = virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) - return VIR_PY_NONE; + return ret; if (nparams) { if (VIR_ALLOC_N(stats, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetMemoryStats(conn, cellNum, stats, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - VIR_FREE(stats); - return VIR_PY_NONE; - } - } - if (!(ret = PyDict_New())) { - VIR_FREE(stats); - return VIR_PY_NONE; + if (c_retval < 0) + goto error; } + if (!(ret = PyDict_New())) + goto error; + for (i = 0; i < nparams; i++) { - PyDict_SetItem(ret, - libvirt_constcharPtrWrap(stats[i].field), - libvirt_ulonglongWrap(stats[i].value)); + key = libvirt_constcharPtrWrap(stats[i].field); + val = libvirt_ulonglongWrap(stats[i].value); + + if (!key || !val) + goto error; + + if (PyDict_SetItem(ret, key, val) < 0) { + Py_DECREF(ret); + goto error; + } + + Py_DECREF(key); + Py_DECREF(val); } VIR_FREE(stats); return ret; + +error: + VIR_FREE(stats); + Py_XDECREF(key); + Py_XDECREF(val); + return ret; } static PyObject * -- 1.7.1

3 2

[libvirt] [PATCH] correct security_require_confined default value
by ajia＠redhat.com 14 Feb '12

14 Feb '12

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu.conf: set security_require_confined default value to 0. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 95428c1..6cb3707 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -145,7 +145,7 @@ # If set to non-zero, then attempts to create unconfined # guests will be blocked. Defaults to 0. -# security_require_confined = 1 +# security_require_confined = 0 # The user ID for QEMU processes run by the system instance. #user = "root" -- 1.7.1

3 2

[libvirt] [PATCH 0/4 v2] New command for changing media
by Osier Yang 14 Feb '12

14 Feb '12

[PATCH 0/4] introduces two new helper functions: vshFindDisk is to find the disk XML node in xml doc with the flags (indicates it's normal disk or changeable disk). VshPrepareDiskXML is to prepare the disk XML for disk changing commands' use, such as detach-disk. The purpose of this patch is to prepare for upcoming new command "change-disk", which will use the two helper functions too. Please see [PATCH 4/4] for a overall description of the new command. v1 - v2 * No changes, only rebasing [PATCH 1/4] virsh: Two new helper functions for disk device changes [PATCH 2/4] virsh: Use vshFindDisk and vshPrepareDiskXML in [PATCH 3/4] virsh: New command cmdChangeMedia [PATCH 4/4] virsh: Add document for cmdChangeMedia Regards, Osier

3 14

[libvirt] [PATCH 0/3 v3] New command for changing media
by Osier Yang 14 Feb '12

14 Feb '12

[PATCH 0/3] introduces two new helper functions: vshFindDisk is to find the disk XML node in xml doc with the type (indicates it's normal disk or changeable disk). VshPrepareDiskXML is to prepare the disk XML for disk changing commands' use, such as detach-disk. The purpose of this patch is to prepare for upcoming new command "change-disk", which will use the two helper functions too. Please see [PATCH 3/3] for a overall description of the new command. v2 - v3 * Update vshFindDisk to support search the disk node with both the source path and target name. * Change names of the two new enums ([PATCH 1/3]). * Use virXMLParseStringCtxt instead of xmlReadDoc * Use VIR_ALLOC_N instead of vshCalloc. * [PATCH 3/4] and [PATCH 4/4] are merged into [PATCH 3/3] * Change option "--target" into "--path". * Defaults to use "--update" if none of "--eject", "--insert", and "--update" is specified. * Update docs to be consistent with the changes on codes. * Other nits. [PATCH 1/3] virsh: Two new helper functions for disk device changes [PATCH 2/3] virsh: Use vshFindDisk and vshPrepareDiskXML in cmdDetachDisk [PATCH 3/3] virsh: New command cmdChangeMedia Regards, Osier

1 3

[libvirt] Add a new api, get this error.gnutls_record_recv: A TLS packet with unexpected length was received.
by chang liu 14 Feb '12

14 Feb '12

hi all, Sorry to disturb you. I wanna to add a new api to get some sheepdog cluster info, but I has get this error, I don't know how to do. I have add a function to daemon/remote.c that call the libvirt.c 's api, remoteDispatchConnectExecuteCommand, and here i get the return value. struct remote_connect_execute_command_ret { remote_nonnull_string ret_val; }; typedef struct remote_connect_execute_command_ret remote_connect_execute_command_ret; static int remoteDispatchConnectExecuteCommand (struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, remote_error *rerr, remote_connect_execute_command_args *args, remote_connect_execute_command_ret *ret) the return value has been in ret->ret_val. I know the func remoteDispatchDomainDumpXml returns it's values by ret->xml. And after this, the things is the same, but when I dump xml, it's ok, but when i wanna to get my value, it's cause this error: error : qemudClientReadBuf:1708 : gnutls_record_recv: A TLS packet with unexpected length was received. Could any body tell me, if I wanna to get a string data, do I need to do any additional actions?

3 3

[libvirt] [ANNOUNCE] Perl binding Sys-Virt release 0.9.10
by Daniel P. Berrange 13 Feb '12

13 Feb '12

I am pleased to announce that release 0.9.10 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.9.10.tar.gz Changed in this release: - Add all new APIs in libvirt 0.9.10 - Add some constants missing from previous releases - Clarify docs for shutdown/destroy APIs (rt #73908) Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH v4 0/1] Add netlink events to virnetlink
by D. Herrendoerfer 13 Feb '12

13 Feb '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> This is the updated netlink event code based upon the updated virnetlink.[ch] files. Most of the previous remarks have been addressed. This has also seen some preliminary testing. D. Herrendoerfer (1): util: Add netlink event handling to virnetlink.c daemon/libvirtd.c | 8 + src/libvirt_private.syms | 6 + src/util/virnetlink.c | 436 +++++++++++++++++++++++++++++++++++++++++++++- src/util/virnetlink.h | 29 +++ 4 files changed, 478 insertions(+), 1 deletions(-) -- 1.7.7.5

2 2

[libvirt] [PATCH] qemu: make block io tuning smarter
by Eric Blake 13 Feb '12

13 Feb '12

When blkdeviotune was first committed in 0.9.8, we had the limitation that setting one value reset all others. But bytes and iops should be relatively independent. Furthermore, setting tuning values on a live domain followed by dumpxml did not output the new settings. * src/qemu/qemu_driver.c (qemuDiskPathToAlias): Add parameter, and update callers. (qemuDomainSetBlockIoTune): Don't lose previous unrelated settings. Make live changes reflect to dumpxml output. * tools/virsh.pod (blkdeviotune): Update documentation. --- src/qemu/qemu_driver.c | 45 +++++++++++++++++++++++++++++++++++++++++---- tools/virsh.pod | 5 +++-- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45c4100..dea52bf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11309,7 +11309,7 @@ cleanup: } static char * -qemuDiskPathToAlias(virDomainObjPtr vm, const char *path) +qemuDiskPathToAlias(virDomainObjPtr vm, const char *path, int *idx) { int i; char *ret = NULL; @@ -11320,6 +11320,8 @@ qemuDiskPathToAlias(virDomainObjPtr vm, const char *path) goto cleanup; disk = vm->def->disks[i]; + if (idx) + *idx = i; if (disk->type != VIR_DOMAIN_DISK_TYPE_BLOCK && disk->type != VIR_DOMAIN_DISK_TYPE_FILE) @@ -11361,7 +11363,7 @@ qemuDomainBlockJobImpl(virDomainPtr dom, const char *path, const char *base, goto cleanup; } - device = qemuDiskPathToAlias(vm, path); + device = qemuDiskPathToAlias(vm, path, NULL); if (!device) { goto cleanup; } @@ -11529,11 +11531,14 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainObjPrivatePtr priv; virDomainDefPtr persistentDef = NULL; virDomainBlockIoTuneInfo info; + virDomainBlockIoTuneInfo *oldinfo; char uuidstr[VIR_UUID_STRING_BUFLEN]; const char *device = NULL; int ret = -1; int i; int idx = -1; + bool set_bytes = false; + bool set_iops = false; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -11564,7 +11569,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, goto cleanup; } - device = qemuDiskPathToAlias(vm, disk); + device = qemuDiskPathToAlias(vm, disk, &idx); if (!device) { goto cleanup; } @@ -11581,21 +11586,27 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC)) { info.total_bytes_sec = param->value.ul; + set_bytes = true; } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC)) { info.read_bytes_sec = param->value.ul; + set_bytes = true; } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC)) { info.write_bytes_sec = param->value.ul; + set_bytes = true; } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC)) { info.total_iops_sec = param->value.ul; + set_iops = true; } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC)) { info.read_iops_sec = param->value.ul; + set_iops = true; } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC)) { info.write_iops_sec = param->value.ul; + set_iops = true; } } @@ -11614,10 +11625,25 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { + /* If the user didn't specify bytes limits, inherit previous + * values; likewise if the user didn't specify iops + * limits. */ + oldinfo = &vm->def->disks[idx]->blkdeviotune; + if (!set_bytes) { + info.total_bytes_sec = oldinfo->total_bytes_sec; + info.read_bytes_sec = oldinfo->read_bytes_sec; + info.write_bytes_sec = oldinfo->write_bytes_sec; + } + if (!set_iops) { + info.total_iops_sec = oldinfo->total_iops_sec; + info.read_iops_sec = oldinfo->read_iops_sec; + info.write_iops_sec = oldinfo->write_iops_sec; + } priv = vm->privateData; qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSetBlockIoThrottle(priv->mon, device, &info); qemuDomainObjExitMonitorWithDriver(driver, vm); + vm->def->disks[idx]->blkdeviotune = info; if (ret < 0) goto endjob; } @@ -11627,6 +11653,17 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, idx = virDomainDiskIndexByName(persistentDef, disk, true); if (idx < 0) goto endjob; + oldinfo = &persistentDef->disks[idx]->blkdeviotune; + if (!set_bytes) { + info.total_bytes_sec = oldinfo->total_bytes_sec; + info.read_bytes_sec = oldinfo->read_bytes_sec; + info.write_bytes_sec = oldinfo->write_bytes_sec; + } + if (!set_iops) { + info.total_iops_sec = oldinfo->total_iops_sec; + info.read_iops_sec = oldinfo->read_iops_sec; + info.write_iops_sec = oldinfo->write_iops_sec; + } persistentDef->disks[idx]->blkdeviotune = info; ret = virDomainSaveConfig(driver->configDir, persistentDef); if (ret < 0) { @@ -11688,7 +11725,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, goto cleanup; } - device = qemuDiskPathToAlias(vm, disk); + device = qemuDiskPathToAlias(vm, disk, NULL); if (!device) { goto cleanup; diff --git a/tools/virsh.pod b/tools/virsh.pod index bd79b4c..a67c2eb 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -604,8 +604,9 @@ I<--total_iops_sec> specifies total I/O operations limit per second. I<--read_iops_sec> specifies read I/O operations limit per second. I<--write_iops_sec> specifies write I/O operations limit per second. -When setting any value, all remaining values are reset to unlimited, -an explicit 0 also clears any limit. A non-zero value for a given total +Bytes and iops values are independent, but setting only one value (such +as --read_bytes_sec) resets the other two in that category to unlimited. +An explicit 0 also clears any limit. A non-zero value for a given total cannot be mixed with non-zero values for read or write. If I<--live> is specified, affect a running guest. -- 1.7.7.6

2 2

[libvirt] [PATCH] Install API XML desc to a standard location
by Daniel P. Berrange 13 Feb '12

13 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Language bindings may well want to use the libvirt-api.xml and libvirt-qemu-api.xml files to either auto-generate themselves, or sanity check the manually written bindings for completeness. Currently these XML files are not installed as standard, merely ending up as a %doc file in the RPM. This changes them to be installed into $prefix/share/libvirt/apis/ The *-refs.xml files are not installed, since those are only useful during generation of the online API doc files. The pkg-config file is enhanced so that you cann query the install location of the API files. eg # pkg-config --variable=libvirt_qemu_api libvirt /home/berrange/builder/i686-pc-mingw32/sys-root/mingw/share/libvirt/libvirt-qemu-api.xml * docs/Makefile.am: Install libvirt-api.xml & libvirt-qemu-api.xml * libvirt.pc.in: Add vars for querying API install location * libvirt.spec.in, mingw32-libvirt.spec.in: Include API XML files --- docs/Makefile.am | 3 +++ libvirt.pc.in | 3 +++ libvirt.spec.in | 4 ++++ mingw32-libvirt.spec.in | 4 ++++ 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 5644fe2..2bef982 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -85,6 +85,9 @@ qemu_xml = \ libvirt-qemu-api.xml \ libvirt-qemu-refs.xml +apidir = $(pkgdatadir)/api +api_DATA = libvirt-api.xml libvirt-qemu-api.xml + fig = \ libvirt-net-logical.fig \ libvirt-net-physical.fig \ diff --git a/libvirt.pc.in b/libvirt.pc.in index d7a5e55..c64a7ca 100644 --- a/libvirt.pc.in +++ b/libvirt.pc.in @@ -3,6 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +libvirt_api=@datadir@/libvirt/libvirt-api.xml +libvirt_qemu_api=@datadir@/libvirt/libvirt-qemu-api.xml + Name: libvirt Version: @VERSION@ Description: libvirt library diff --git a/libvirt.spec.in b/libvirt.spec.in index 62b0ed4..d04fba9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1249,6 +1249,10 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %doc %{_datadir}/gtk-doc/html/libvirt/*.png %doc %{_datadir}/gtk-doc/html/libvirt/*.css +%dir %{_datadir}/libvirt/apis/ +%{_datadir}/libvirt/apis/libvirt-api.xml +%{_datadir}/libvirt/apis/libvirt-qemu-api.xml + %doc docs/*.html docs/html docs/*.gif %doc docs/libvirt-api.xml %doc examples/hellolibvirt diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index 7937e22..659d649 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -156,6 +156,10 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libvirt-qemu.dll.a %{_mingw32_libdir}/libvirt-qemu.la +%dir %{_mingw32_datadir}/libvirt/apis/ +%{_mingw32_datadir}/libvirt/apis/libvirt-api.xml +%{_mingw32_datadir}/libvirt/apis/libvirt-qemu-api.xml + %dir %{_mingw32_datadir}/libvirt/ %dir %{_mingw32_datadir}/libvirt/schemas/ %{_mingw32_datadir}/libvirt/schemas/basictypes.rng -- 1.7.7.6

2 1

[libvirt] [PATCH 0/2] add ibmvscsi and virtio-scsi controller models
by Paolo Bonzini 13 Feb '12

13 Feb '12

Hi, these patches let you specify explicitly all supported controller models for QEMU, and add the new virtio-scsi model. Paolo Bonzini (2): qemu: add ibmvscsi controller model qemu: add virtio-scsi controller model docs/formatdomain.html.in | 4 +- docs/schemas/domaincommon.rng | 2 + src/conf/domain_conf.c | 4 ++- src/conf/domain_conf.h | 2 + src/qemu/qemu_command.c | 26 ++++++++++++++-- src/vmx/vmx.c | 10 ++++-- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 9 ++++++ .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 31 ++++++++++++++++++++ .../qemuxml2argv-disk-scsi-vscsi.args | 8 +++++ .../qemuxml2argv-disk-scsi-vscsi.xml | 31 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ tests/qemuxml2xmltest.c | 2 + 12 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml -- 1.7.7.1

4 8

[libvirt] Start of freeze for libvirt-0.9.10 and availability of rc1
by Daniel Veillard 13 Feb '12

13 Feb '12

We are now entering the freeze for libvirt-0.9.10 Hopefully all the API changes needed for that version are already commited to git head. I have made a release candidate 1 tarball (and associated rpms) at ftp://libvirt.org/libvirt/libvirt-0.9.10-rc1.tar.gz and the git tree is tagged. I think I will make an release candidate 2 tarball on Wednesday, and I'm hoping for a final release next Monday the 13th. Please give it a try ! thanks in advance, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

9 23

[libvirt] [PATCH] virsh: Fix name of domain suspend command
by Michal Privoznik 13 Feb '12

13 Feb '12

It's dompmsuspend, not suspend-duration. --- Pushed under trivial rule. tools/virsh.pod | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index bd79b4c..877533b 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1280,7 +1280,7 @@ Moves a domain out of the suspended state. This will allow a previously suspended domain to now be eligible for scheduling by the underlying hypervisor. -=item B<suspend-duration> I<domain-id> I<target> +=item B<dompmsuspend> I<domain-id> I<target> Suspend a running domain into one of these states (possible I<target> values): -- 1.7.3.4

1 0

[libvirt] [PATCH] virpidfile: Allow whitespace character on the end of pidfile
by Michal Privoznik 13 Feb '12

13 Feb '12

Some programs, notably dnsmasq, which are writing pidfiles on their own do append a whitespace character after pid, e.g. '\n'. --- src/util/virpidfile.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 34d1250..9c29967 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -34,7 +34,7 @@ #include "intprops.h" #include "logging.h" #include "virterror_internal.h" - +#include "c-ctype.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -119,6 +119,7 @@ int virPidFileReadPath(const char *path, ssize_t bytes; long long pid_value = 0; char pidstr[INT_BUFSIZE_BOUND(pid_value)]; + char *endptr = NULL; *pid = 0; @@ -135,7 +136,8 @@ int virPidFileReadPath(const char *path, } pidstr[bytes] = '\0'; - if (virStrToLong_ll(pidstr, NULL, 10, &pid_value) < 0 || + if (virStrToLong_ll(pidstr, &endptr, 10, &pid_value) < 0 || + !(*endptr == '\0' || c_isspace(*endptr)) || (pid_t) pid_value != pid_value) { rc = -1; goto cleanup; -- 1.7.3.4

2 2

[libvirt] [test-API][PATCH] Add 3 APIs in snapshotAPI
by Wayne Sun 13 Feb '12

13 Feb '12

* new APIs get_parent(self, domname, snapname, flag = 0) children_num(self, domname, snapname, flag) children_names_list(self, domname, snapname, flag) the flag in children_num and children_names_list could be in 0-7, which is the OR operation result of (VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_LIST_METADATA | VIR_DOMAIN_SNAPSHOT_LIST_LEAVES) * deleted redundancy spaces and fixed a typo in function domain() * getConnect(), getDomain() and getName() API are not added in, current snapshotAPI requires user to offer connection obj, domain name and snapshot name. --- lib/snapshotAPI.py | 59 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 13 deletions(-) diff --git a/lib/snapshotAPI.py b/lib/snapshotAPI.py index 43ccb89..d866b60 100644 --- a/lib/snapshotAPI.py +++ b/lib/snapshotAPI.py @@ -24,14 +24,14 @@ import libvirt import re import os -def append_path(path): +def append_path(path): """Append root path of package""" if path in sys.path: pass else: sys.path.append(path) - -pwd = os.getcwd() + +pwd = os.getcwd() result = re.search('(.*)libvirt-test-API', pwd) append_path(result.group(0)) @@ -39,7 +39,7 @@ import exception class SnapshotAPI(object): def __init__(self, connection): - self.conn = connection + self.conn = connection def create(self, domname, xml_desc, flag = 0): try: @@ -57,7 +57,7 @@ class SnapshotAPI(object): except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() - raise exception.LibvirtAPI(message, code) + raise exception.LibvirtAPI(message, code) def snapshot_name_list(self, domname, flag = 0): try: @@ -66,7 +66,7 @@ class SnapshotAPI(object): except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() - raise exception.LibvirtAPI(message, code) + raise exception.LibvirtAPI(message, code) def snapshot_nums(self, domname, flag = 0): try: @@ -95,31 +95,64 @@ class SnapshotAPI(object): message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - + def delete(self, domname, snapname, flag = 0): try: - snap = self.snapshot_lookup_by_name(domname, snapname, flag = 0) + snap = self.snapshot_lookup_by_name(domname, snapname) return snap.delete(flag) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() - raise exception.LibvirtAPI(message, code) + raise exception.LibvirtAPI(message, code) def get_xml_desc(self, domname, snapname, flag = 0): try: - snap = self.snapshot_lookup_by_name(domname, snapname, flag = 0) + snap = self.snapshot_lookup_by_name(domname, snapname) return snap.getXMLDesc(flag) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def domain(self, domname): + def domain(self, domname, snapname): try: - snap = self.snapshot_lookup_by_name(domname, snapname, flag = 0) + snap = self.snapshot_lookup_by_name(domname, snapname) return snap.domain() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - + + def get_parent(self, domname, snapname, flag = 0): + try: + snap = self.snapshot_lookup_by_name(domname, snapname) + return snap.getParent(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def children_num(self, domname, snapname, flag): + try: + snap = self.snapshot_lookup_by_name(domname, snapname) + return snap.numChildren(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def children_names_list(self, domname, snapname, flag): + try: + snap = self.snapshot_lookup_by_name(domname, snapname) + return snap.listChildrenNames(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + +# virDomainSnapshotListFlags +VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS = 1 +VIR_DOMAIN_SNAPSHOT_LIST_ROOTS = 1 +VIR_DOMAIN_SNAPSHOT_LIST_METADATA = 2 +VIR_DOMAIN_SNAPSHOT_LIST_LEAVES = 4 + -- 1.7.1

2 1

[libvirt] [PATCH] python: make other APIs share common {get, set}PyVirTypedParameter
by Guannan Ren 12 Feb '12

12 Feb '12

*libvirt_virDomainBlockStatsFlags *libvirt_virDomainGetSchedulerParameters *libvirt_virDomainGetSchedulerParametersFlags *libvirt_virDomainSetSchedulerParameters *libvirt_virDomainSetSchedulerParametersFlags *libvirt_virDomainSetBlkioParameters *libvirt_virDomainGetBlkioParameters *libvirt_virDomainSetMemoryParameters *libvirt_virDomainGetMemoryParameters *libvirt_virDomainSetBlockIoTune *libvirt_virDomainGetBlockIoTune --- python/libvirt-override-api.xml | 12 +- python/libvirt-override.c | 885 +++++++++++++-------------------------- 2 files changed, 295 insertions(+), 602 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 8eed0bb..563dd46 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -144,7 +144,7 @@ </function> <function name='virDomainBlockStatsFlags' file='python'> <info>Extracts block device statistics parameters of a running domain</info> - <return type='virTypedParameterPtr' info='None in case of error, returns a dictionary of params'/> + <return type='str *' info='None in case of error, returns a dictionary of params'/> <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='path' type='char *' info='the path for the block device'/> <arg name='flags' type='int' info='flags (unused; pass 0)'/> @@ -169,12 +169,12 @@ </function> <function name='virDomainGetSchedulerParameters' file='python'> <info>Get the scheduler parameters, the @params array will be filled with the values.</info> - <return type='int' info='-1 in case of error, 0 in case of success.'/> + <return type='str *' info='None in case of error, returns a dictionary of params.'/> <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> </function> <function name='virDomainGetSchedulerParametersFlags' file='python'> <info>Get the scheduler parameters</info> - <return type='virSchedParameterPtr' info='None in case of error, returns a dictionary of params'/> + <return type='str *' info='None in case of error, returns a dictionary of params'/> <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> @@ -231,7 +231,7 @@ </function> <function name='virDomainGetBlkioParameters' file='python'> <info>Get the blkio parameters</info> - <return type='virSchedParameterPtr' info='None in case of error, returns a dictionary of params'/> + <return type='str *' info='None in case of error, returns a dictionary of params'/> <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> @@ -244,7 +244,7 @@ </function> <function name='virDomainGetMemoryParameters' file='python'> <info>Get the memory parameters</info> - <return type='virSchedParameterPtr' info='None in case of error, returns a dictionary of params'/> + <return type='str *' info='None in case of error, returns a dictionary of params'/> <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> @@ -415,7 +415,7 @@ <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> <arg name='disk' type='const char *' info='disk name'/> <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainModificationImpact'/> - <return type='virTypedParameterPtr' info='the I/O tunables value or None in case of error'/> + <return type='str *' info='the I/O tunables value or None in case of error'/> </function> <function name='virDomainBlockPeek' file='python'> <info>Read the contents of domain's disk device</info> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index e7c2bd5..3ffdb62 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -330,18 +330,20 @@ libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { static PyObject * libvirt_virDomainBlockStatsFlags(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *info; + PyObject *pyobj_domain; + PyObject *ret = NULL; int i_retval; - int nparams = 0, i; + int nparams = 0; unsigned int flags; virTypedParameterPtr params; const char *path; if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainBlockStatsFlags", &pyobj_domain, &path, &flags)) - return(NULL); + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); LIBVIRT_BEGIN_ALLOW_THREADS; @@ -351,67 +353,29 @@ libvirt_virDomainBlockStatsFlags(PyObject *self ATTRIBUTE_UNUSED, if (i_retval < 0) return VIR_PY_NONE; + if (!nparams) + return PyDict_New(); + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainBlockStatsFlags(domain, path, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_NONE; - } - - /* convert to a Python tuple of long objects */ - if ((info = PyDict_New()) == NULL) { - VIR_FREE(params); - return VIR_PY_NONE; + ret = VIR_PY_NONE; + goto cleanup; } - for (i = 0 ; i < nparams ; i++) { - PyObject *key, *val; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - val = PyInt_FromLong((long)params[i].value.i); - break; - - case VIR_TYPED_PARAM_UINT: - val = PyInt_FromLong((long)params[i].value.ui); - break; - - case VIR_TYPED_PARAM_LLONG: - val = PyLong_FromLongLong((long long)params[i].value.l); - break; - - case VIR_TYPED_PARAM_ULLONG: - val = PyLong_FromLongLong((long long)params[i].value.ul); - break; - - case VIR_TYPED_PARAM_DOUBLE: - val = PyFloat_FromDouble((double)params[i].value.d); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - val = PyBool_FromLong((long)params[i].value.b); - break; - - default: - VIR_FREE(params); - Py_DECREF(info); - return VIR_PY_NONE; - } - - key = libvirt_constcharPtrWrap(params[i].field); - PyDict_SetItem(info, key, val); - } + ret = getPyVirTypedParameter(params, nparams); +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return(info); + return ret; } - static PyObject * libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; @@ -530,17 +494,19 @@ libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED, static PyObject * libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *info; + PyObject *pyobj_domain; + PyObject *ret = NULL; char *c_retval; int i_retval; - int nparams, i; + int nparams = 0; virTypedParameterPtr params; if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetScedulerParameters", &pyobj_domain)) - return(NULL); + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); LIBVIRT_BEGIN_ALLOW_THREADS; @@ -551,78 +517,45 @@ libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; VIR_FREE(c_retval); + if (!nparams) + return PyDict_New(); + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetSchedulerParameters(domain, params, &nparams); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_NONE; + ret = VIR_PY_NONE; + goto cleanup; } - /* convert to a Python tuple of long objects */ - if ((info = PyDict_New()) == NULL) { - VIR_FREE(params); - return VIR_PY_NONE; - } - for (i = 0 ; i < nparams ; i++) { - PyObject *key, *val; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - val = PyInt_FromLong((long)params[i].value.i); - break; - - case VIR_TYPED_PARAM_UINT: - val = PyInt_FromLong((long)params[i].value.ui); - break; - - case VIR_TYPED_PARAM_LLONG: - val = PyLong_FromLongLong((long long)params[i].value.l); - break; - - case VIR_TYPED_PARAM_ULLONG: - val = PyLong_FromLongLong((long long)params[i].value.ul); - break; - - case VIR_TYPED_PARAM_DOUBLE: - val = PyFloat_FromDouble((double)params[i].value.d); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - val = PyBool_FromLong((long)params[i].value.b); - break; - - default: - VIR_FREE(params); - Py_DECREF(info); - return VIR_PY_NONE; - } + ret = getPyVirTypedParameter(params, nparams); - key = libvirt_constcharPtrWrap(params[i].field); - PyDict_SetItem(info, key, val); - } +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return(info); + return ret; } static PyObject * libvirt_virDomainGetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *info; + PyObject *pyobj_domain; + PyObject *ret = NULL; char *c_retval; int i_retval; - int nparams, i; + int nparams = 0; unsigned int flags; virTypedParameterPtr params; if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetScedulerParametersFlags", &pyobj_domain, &flags)) - return(NULL); + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); LIBVIRT_BEGIN_ALLOW_THREADS; @@ -633,79 +566,55 @@ libvirt_virDomainGetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_NONE; VIR_FREE(c_retval); + if (!nparams) + return PyDict_New(); + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetSchedulerParametersFlags(domain, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_NONE; - } - - /* convert to a Python tuple of long objects */ - if ((info = PyDict_New()) == NULL) { - VIR_FREE(params); - return VIR_PY_NONE; + ret = VIR_PY_NONE; + goto cleanup; } - for (i = 0 ; i < nparams ; i++) { - PyObject *key, *val; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - val = PyInt_FromLong((long)params[i].value.i); - break; - - case VIR_TYPED_PARAM_UINT: - val = PyInt_FromLong((long)params[i].value.ui); - break; - case VIR_TYPED_PARAM_LLONG: - val = PyLong_FromLongLong((long long)params[i].value.l); - break; - - case VIR_TYPED_PARAM_ULLONG: - val = PyLong_FromLongLong((long long)params[i].value.ul); - break; - - case VIR_TYPED_PARAM_DOUBLE: - val = PyFloat_FromDouble((double)params[i].value.d); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - val = PyBool_FromLong((long)params[i].value.b); - break; - - default: - VIR_FREE(params); - Py_DECREF(info); - return VIR_PY_NONE; - } + ret = getPyVirTypedParameter(params, nparams); - key = libvirt_constcharPtrWrap(params[i].field); - PyDict_SetItem(info, key, val); - } +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return(info); + return ret; } static PyObject * libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; PyObject *pyobj_domain, *info; + PyObject *ret = NULL; char *c_retval; int i_retval; - int nparams, i; - virTypedParameterPtr params; + int nparams = 0, size = 0; + virTypedParameterPtr params, new_params; if (!PyArg_ParseTuple(args, (char *)"OO:virDomainSetScedulerParameters", &pyobj_domain, &info)) - return(NULL); + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (size == 0) { + PyErr_Format(PyExc_LookupError, + "Need non-empty dictionary to set attributes"); + return NULL; + } + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetSchedulerType(domain, &nparams); LIBVIRT_END_ALLOW_THREADS; @@ -714,95 +623,74 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_INT_FAIL; VIR_FREE(c_retval); + if (nparams == 0) { + PyErr_Format(PyExc_LookupError, + "Domain has no settable attributes"); + return NULL; + } + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetSchedulerParameters(domain, params, &nparams); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + ret = VIR_PY_INT_FAIL; + goto cleanup; } - /* convert to a Python tuple of long objects */ - for (i = 0 ; i < nparams ; i++) { - PyObject *key, *val; - key = libvirt_constcharPtrWrap(params[i].field); - val = PyDict_GetItem(info, key); - Py_DECREF(key); - - if (val == NULL) - continue; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - params[i].value.i = (int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_UINT: - params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_LLONG: - params[i].value.l = (long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_ULLONG: - params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_DOUBLE: - params[i].value.d = (double)PyFloat_AsDouble(val); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - { - /* Hack - Python's definition of Py_True breaks strict - * aliasing rules, so can't directly compare :-( - */ - PyObject *hacktrue = PyBool_FromLong(1); - params[i].value.b = hacktrue == val ? 1 : 0; - Py_DECREF(hacktrue); - } - break; - - default: - VIR_FREE(params); - return VIR_PY_INT_FAIL; - } - } + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainSetSchedulerParameters(domain, params, nparams); + i_retval = virDomainSetSchedulerParameters(domain, new_params, size); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + ret = VIR_PY_INT_FAIL; + goto cleanup; } + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return VIR_PY_INT_SUCCESS; + VIR_FREE(new_params); + return ret; } static PyObject * libvirt_virDomainSetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; PyObject *pyobj_domain, *info; + PyObject *ret = NULL; char *c_retval; int i_retval; - int nparams, i; + int nparams = 0, size = 0; unsigned int flags; - virTypedParameterPtr params; + virTypedParameterPtr params, new_params; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetScedulerParametersFlags", &pyobj_domain, &info, &flags)) - return(NULL); + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (size == 0) { + PyErr_Format(PyExc_LookupError, + "Need non-empty dictionary to set attributes"); + return NULL; + } + LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetSchedulerType(domain, &nparams); LIBVIRT_END_ALLOW_THREADS; @@ -811,95 +699,73 @@ libvirt_virDomainSetSchedulerParametersFlags(PyObject *self ATTRIBUTE_UNUSED, return VIR_PY_INT_FAIL; VIR_FREE(c_retval); + if (nparams == 0) { + PyErr_Format(PyExc_LookupError, + "Domain has no settable attributes"); + return NULL; + } + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetSchedulerParametersFlags(domain, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + ret = VIR_PY_INT_FAIL; + goto cleanup; } - /* convert to a Python tuple of long objects */ - for (i = 0; i < nparams; i++) { - PyObject *key, *val; - key = libvirt_constcharPtrWrap(params[i].field); - val = PyDict_GetItem(info, key); - Py_DECREF(key); - - if (val == NULL) - continue; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - params[i].value.i = (int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_UINT: - params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_LLONG: - params[i].value.l = (long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_ULLONG: - params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_DOUBLE: - params[i].value.d = (double)PyFloat_AsDouble(val); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - { - /* Hack - Python's definition of Py_True breaks strict - * aliasing rules, so can't directly compare :-( - */ - PyObject *hacktrue = PyBool_FromLong(1); - params[i].value.b = hacktrue == val ? 1: 0; - Py_DECREF(hacktrue); - } - break; - - default: - VIR_FREE(params); - return VIR_PY_INT_FAIL; - } - } + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainSetSchedulerParametersFlags(domain, params, nparams, flags); + i_retval = virDomainSetSchedulerParametersFlags(domain, new_params, size, flags); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + ret = VIR_PY_INT_FAIL; + goto cleanup; } + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return VIR_PY_INT_SUCCESS; + VIR_FREE(new_params); + return ret; } - static PyObject * libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; PyObject *pyobj_domain, *info; + PyObject *ret = NULL; int i_retval; - int nparams = 0, i; + int nparams = 0, size = 0; unsigned int flags; - virTypedParameterPtr params; + virTypedParameterPtr params, new_params; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetBlkioParameters", &pyobj_domain, &info, &flags)) - return(NULL); + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (size == 0) { + PyErr_Format(PyExc_LookupError, + "Need non-empty dictionary to set attributes"); + return NULL; + } + LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetBlkioParameters(domain, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; @@ -907,91 +773,61 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, if (i_retval < 0) return VIR_PY_INT_FAIL; + if (nparams == 0) { + PyErr_Format(PyExc_LookupError, + "Domain has no settable attributes"); + return NULL; + } + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetBlkioParameters(domain, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + ret = VIR_PY_INT_FAIL; + goto cleanup; } - /* convert to a Python tuple of long objects */ - for (i = 0; i < nparams; i++) { - PyObject *key, *val; - key = libvirt_constcharPtrWrap(params[i].field); - val = PyDict_GetItem(info, key); - Py_DECREF(key); - - if (val == NULL) - continue; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - params[i].value.i = (int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_UINT: - params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_LLONG: - params[i].value.l = (long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_ULLONG: - params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_DOUBLE: - params[i].value.d = (double)PyFloat_AsDouble(val); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - { - /* Hack - Python's definition of Py_True breaks strict - * aliasing rules, so can't directly compare :-( - */ - PyObject *hacktrue = PyBool_FromLong(1); - params[i].value.b = hacktrue == val ? 1: 0; - Py_DECREF(hacktrue); - } - break; - - default: - VIR_FREE(params); - return VIR_PY_INT_FAIL; - } - } + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainSetBlkioParameters(domain, params, nparams, flags); + i_retval = virDomainSetBlkioParameters(domain, new_params, size, flags); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + ret = VIR_PY_INT_FAIL; + goto cleanup; } + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return VIR_PY_INT_SUCCESS; + VIR_FREE(new_params); + return ret; } static PyObject * libvirt_virDomainGetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *info; + PyObject *pyobj_domain; + PyObject *ret = NULL; int i_retval; - int nparams = 0, i; + int nparams = 0; unsigned int flags; virTypedParameterPtr params; if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetBlkioParameters", &pyobj_domain, &flags)) - return(NULL); + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); LIBVIRT_BEGIN_ALLOW_THREADS; @@ -1001,80 +837,56 @@ libvirt_virDomainGetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, if (i_retval < 0) return VIR_PY_NONE; + if (!nparams) + return PyDict_New(); + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetBlkioParameters(domain, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_NONE; - } - - /* convert to a Python tuple of long objects */ - if ((info = PyDict_New()) == NULL) { - VIR_FREE(params); - return VIR_PY_NONE; + ret = VIR_PY_NONE; + goto cleanup; } - for (i = 0 ; i < nparams ; i++) { - PyObject *key, *val; - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - val = PyInt_FromLong((long)params[i].value.i); - break; - - case VIR_TYPED_PARAM_UINT: - val = PyInt_FromLong((long)params[i].value.ui); - break; - - case VIR_TYPED_PARAM_LLONG: - val = PyLong_FromLongLong((long long)params[i].value.l); - break; - - case VIR_TYPED_PARAM_ULLONG: - val = PyLong_FromLongLong((long long)params[i].value.ul); - break; - - case VIR_TYPED_PARAM_DOUBLE: - val = PyFloat_FromDouble((double)params[i].value.d); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - val = PyBool_FromLong((long)params[i].value.b); - break; - - default: - VIR_FREE(params); - Py_DECREF(info); - return VIR_PY_NONE; - } + ret = getPyVirTypedParameter(params, nparams); - key = libvirt_constcharPtrWrap(params[i].field); - PyDict_SetItem(info, key, val); - } +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return(info); + return ret; } static PyObject * libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; PyObject *pyobj_domain, *info; + PyObject *ret = NULL; int i_retval; - int nparams = 0, i; + int nparams = 0, size = 0; unsigned int flags; - virTypedParameterPtr params; + virTypedParameterPtr params, new_params; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetMemoryParameters", &pyobj_domain, &info, &flags)) - return(NULL); + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (size == 0) { + PyErr_Format(PyExc_LookupError, + "Need non-empty dictionary to set attributes"); + return NULL; + } + LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetMemoryParameters(domain, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; @@ -1082,91 +894,61 @@ libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, if (i_retval < 0) return VIR_PY_INT_FAIL; + if (nparams == 0) { + PyErr_Format(PyExc_LookupError, + "Domain has no settable attributes"); + return NULL; + } + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetMemoryParameters(domain, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + ret = VIR_PY_INT_FAIL; + goto cleanup; } - /* convert to a Python tuple of long objects */ - for (i = 0; i < nparams; i++) { - PyObject *key, *val; - key = libvirt_constcharPtrWrap(params[i].field); - val = PyDict_GetItem(info, key); - Py_DECREF(key); - - if (val == NULL) - continue; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - params[i].value.i = (int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_UINT: - params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_LLONG: - params[i].value.l = (long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_ULLONG: - params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_DOUBLE: - params[i].value.d = (double)PyFloat_AsDouble(val); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - { - /* Hack - Python's definition of Py_True breaks strict - * aliasing rules, so can't directly compare :-( - */ - PyObject *hacktrue = PyBool_FromLong(1); - params[i].value.b = hacktrue == val ? 1: 0; - Py_DECREF(hacktrue); - } - break; - - default: - VIR_FREE(params); - return VIR_PY_INT_FAIL; - } - } + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainSetMemoryParameters(domain, params, nparams, flags); + i_retval = virDomainSetMemoryParameters(domain, new_params, size, flags); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + ret = VIR_PY_INT_FAIL; + goto cleanup; } + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return VIR_PY_INT_SUCCESS; + VIR_FREE(new_params); + return ret; } static PyObject * libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) { + PyObject *args) +{ virDomainPtr domain; - PyObject *pyobj_domain, *info; + PyObject *pyobj_domain; + PyObject *ret = NULL; int i_retval; - int nparams = 0, i; + int nparams = 0; unsigned int flags; virTypedParameterPtr params; if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainGetMemoryParameters", &pyobj_domain, &flags)) - return(NULL); + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); LIBVIRT_BEGIN_ALLOW_THREADS; @@ -1176,62 +958,27 @@ libvirt_virDomainGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, if (i_retval < 0) return VIR_PY_NONE; + if (!nparams) + return PyDict_New(); + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetMemoryParameters(domain, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_NONE; - } - - /* convert to a Python tuple of long objects */ - if ((info = PyDict_New()) == NULL) { - VIR_FREE(params); - return VIR_PY_NONE; + ret = VIR_PY_NONE; + goto cleanup; } - for (i = 0 ; i < nparams ; i++) { - PyObject *key, *val; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - val = PyInt_FromLong((long)params[i].value.i); - break; - - case VIR_TYPED_PARAM_UINT: - val = PyInt_FromLong((long)params[i].value.ui); - break; - - case VIR_TYPED_PARAM_LLONG: - val = PyLong_FromLongLong((long long)params[i].value.l); - break; - - case VIR_TYPED_PARAM_ULLONG: - val = PyLong_FromLongLong((long long)params[i].value.ul); - break; - case VIR_TYPED_PARAM_DOUBLE: - val = PyFloat_FromDouble((double)params[i].value.d); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - val = PyBool_FromLong((long)params[i].value.b); - break; - - default: - VIR_FREE(params); - Py_DECREF(info); - return VIR_PY_NONE; - } + ret = getPyVirTypedParameter(params, nparams); - key = libvirt_constcharPtrWrap(params[i].field); - PyDict_SetItem(info, key, val); - } +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return(info); + return ret; } static PyObject * @@ -3650,93 +3397,73 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; - PyObject *pyobj_domain, *pyinfo; + PyObject *pyobj_domain, *info; + PyObject *ret = NULL; + int i_retval; + int nparams = 0, size = 0; const char *disk; unsigned int flags; - virTypedParameterPtr params; - int nparams = 0, i; - int c_ret; + virTypedParameterPtr params, new_params; if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainSetBlockIoTune", - &pyobj_domain, &disk, &pyinfo, &flags)) - return(NULL); + &pyobj_domain, &disk, &info, &flags)) + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + if ((size = PyDict_Size(info)) < 0) + return NULL; + + if (size == 0) { + PyErr_Format(PyExc_LookupError, + "Need non-empty dictionary to set attributes"); + return NULL; + } + LIBVIRT_BEGIN_ALLOW_THREADS; - c_ret = virDomainGetBlockIoTune(domain, disk, NULL, &nparams, flags); + i_retval = virDomainGetBlockIoTune(domain, disk, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_ret < 0) + if (i_retval < 0) return VIR_PY_INT_FAIL; + if (nparams == 0) { + PyErr_Format(PyExc_LookupError, + "Domain has no settable attributes"); + return NULL; + } + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; - c_ret = virDomainGetBlockIoTune(domain, disk, params, &nparams, flags); + i_retval = virDomainGetBlockIoTune(domain, disk, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_ret < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; } - /* convert to a Python tuple of long objects */ - for (i = 0; i < nparams; i++) { - PyObject *key, *val; - key = libvirt_constcharPtrWrap(params[i].field); - val = PyDict_GetItem(pyinfo, key); - Py_DECREF(key); - - if (val == NULL) - continue; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - params[i].value.i = (int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_UINT: - params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_LLONG: - params[i].value.l = (long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_ULLONG: - params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_DOUBLE: - params[i].value.d = (double)PyFloat_AsDouble(val); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - { - PyObject *hacktrue = PyBool_FromLong(1); - params[i].value.b = hacktrue == val ? 1: 0; - Py_DECREF(hacktrue); - } - break; - - default: - VIR_FREE(params); - return VIR_PY_INT_FAIL; - } - } + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; LIBVIRT_BEGIN_ALLOW_THREADS; - c_ret = virDomainSetBlockIoTune(domain, disk, params, nparams, flags); + i_retval = virDomainSetBlockIoTune(domain, disk, new_params, size, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_ret < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + if (i_retval < 0) { + ret = VIR_PY_INT_FAIL; + goto cleanup; } + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return VIR_PY_INT_SUCCESS; + VIR_FREE(new_params); + return ret; } static PyObject * @@ -3744,81 +3471,47 @@ libvirt_virDomainGetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; - PyObject *pyobj_domain, *pyreply; + PyObject *pyobj_domain; + PyObject *ret = NULL; + int i_retval; + int nparams = 0; const char *disk; - int nparams = 0, i; unsigned int flags; virTypedParameterPtr params; - int c_ret; if (!PyArg_ParseTuple(args, (char *)"Ozi:virDomainGetBlockIoTune", &pyobj_domain, &disk, &flags)) - return(NULL); + return NULL; domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); LIBVIRT_BEGIN_ALLOW_THREADS; - c_ret = virDomainGetBlockIoTune(domain, disk, NULL, &nparams, flags); + i_retval = virDomainGetBlockIoTune(domain, disk, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_ret < 0) + if (i_retval < 0) return VIR_PY_NONE; + if (!nparams) + return PyDict_New(); + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; - c_ret = virDomainGetBlockIoTune(domain, disk, params, &nparams, flags); + i_retval = virDomainGetBlockIoTune(domain, disk, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_ret < 0) { - VIR_FREE(params); - return VIR_PY_NONE; - } - - /* convert to a Python tuple of long objects */ - if ((pyreply = PyDict_New()) == NULL) { - VIR_FREE(params); - return VIR_PY_NONE; + if (i_retval < 0) { + ret = VIR_PY_NONE; + goto cleanup; } - for (i = 0 ; i < nparams ; i++) { - PyObject *key, *val; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - val = PyInt_FromLong((long)params[i].value.i); - break; - - case VIR_TYPED_PARAM_UINT: - val = PyInt_FromLong((long)params[i].value.ui); - break; - - case VIR_TYPED_PARAM_LLONG: - val = PyLong_FromLongLong((long long)params[i].value.l); - break; - - case VIR_TYPED_PARAM_ULLONG: - val = PyLong_FromLongLong((unsigned long long)params[i].value.ul); - break; - - case VIR_TYPED_PARAM_DOUBLE: - val = PyFloat_FromDouble((double)params[i].value.d); - break; - case VIR_TYPED_PARAM_BOOLEAN: - val = PyBool_FromLong((long)params[i].value.b); - break; - - default: - VIR_FREE(params); - Py_DECREF(pyreply); - return VIR_PY_NONE; - } + ret = getPyVirTypedParameter(params, nparams); - key = libvirt_constcharPtrWrap(params[i].field); - PyDict_SetItem(pyreply, key, val); - } +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return(pyreply); + return ret; } static PyObject * -- 1.7.7.5

2 2

[libvirt] [PATCHv3] python: Fix problems of virDomain{Set, Get}BlkioParameters bindings
by ajia＠redhat.com 11 Feb '12

11 Feb '12

From: Alex Jia <ajia(a)redhat.com> The parameter 'device_weight' is a string, however, the 'VIR_TYPED_PARAM_STRING' type condition is missed by libvirt_virDomain{Set, Get}BlkioParameters bindings, the result is we can't get or change 'device_weight' value. The latest python binding codes are refactored and added related 'VIR_TYPED_PARAM_STRING' type argument process, the v3 patch follows latest codes change to resolve the above issue. The v2 patch added missed 'VIR_TYPED_PARAM_STRING' condition into libvirt_virDomain{Set, Get}BlkioParameters bindings and free allocated memory. https://www.redhat.com/archives/libvir-list/2011-December/msg01122.html RHBZ:https://bugzilla.redhat.com/show_bug.cgi?id=770795 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 142 +++++++++++++-------------------------------- 1 files changed, 40 insertions(+), 102 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index e7c2bd5..203ffa1 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -889,10 +889,11 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; PyObject *pyobj_domain, *info; + PyObject *ret = NULL; int i_retval; - int nparams = 0, i; + int nparams = 0, size = 0; unsigned int flags; - virTypedParameterPtr params; + virTypedParameterPtr params, new_params; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetBlkioParameters", @@ -900,6 +901,9 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + if ((size = PyDict_Size(info)) < 0) + return NULL; + LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetBlkioParameters(domain, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; @@ -907,85 +911,54 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, if (i_retval < 0) return VIR_PY_INT_FAIL; + if (size == 0) { + PyErr_Format(PyExc_LookupError, + "Domain has no settable attributes"); + return NULL; + } + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_INT_FAIL; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetBlkioParameters(domain, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + ret = VIR_PY_INT_FAIL; + goto cleanup; } - /* convert to a Python tuple of long objects */ - for (i = 0; i < nparams; i++) { - PyObject *key, *val; - key = libvirt_constcharPtrWrap(params[i].field); - val = PyDict_GetItem(info, key); - Py_DECREF(key); - - if (val == NULL) - continue; - - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - params[i].value.i = (int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_UINT: - params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); - break; - - case VIR_TYPED_PARAM_LLONG: - params[i].value.l = (long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_ULLONG: - params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); - break; - - case VIR_TYPED_PARAM_DOUBLE: - params[i].value.d = (double)PyFloat_AsDouble(val); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - { - /* Hack - Python's definition of Py_True breaks strict - * aliasing rules, so can't directly compare :-( - */ - PyObject *hacktrue = PyBool_FromLong(1); - params[i].value.b = hacktrue == val ? 1: 0; - Py_DECREF(hacktrue); - } - break; - - default: - VIR_FREE(params); - return VIR_PY_INT_FAIL; - } - } + new_params = setPyVirTypedParameter(info, params, nparams); + if (!new_params) + goto cleanup; LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainSetBlkioParameters(domain, params, nparams, flags); LIBVIRT_END_ALLOW_THREADS; + if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_INT_FAIL; + ret = VIR_PY_INT_FAIL; + goto cleanup; } + ret = VIR_PY_INT_SUCCESS; + +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return VIR_PY_INT_SUCCESS; + VIR_FREE(new_params); + return ret; } static PyObject * libvirt_virDomainGetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; - PyObject *pyobj_domain, *info; + PyObject *pyobj_domain; + PyObject *ret = NULL; int i_retval; - int nparams = 0, i; + int nparams = 0; unsigned int flags; virTypedParameterPtr params; @@ -1001,62 +974,27 @@ libvirt_virDomainGetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, if (i_retval < 0) return VIR_PY_NONE; + if (!nparams) + return PyDict_New(); + if (VIR_ALLOC_N(params, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virDomainGetBlkioParameters(domain, params, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { - VIR_FREE(params); - return VIR_PY_NONE; - } - - /* convert to a Python tuple of long objects */ - if ((info = PyDict_New()) == NULL) { - VIR_FREE(params); - return VIR_PY_NONE; + ret = VIR_PY_NONE; + goto cleanup; } - for (i = 0 ; i < nparams ; i++) { - PyObject *key, *val; - switch (params[i].type) { - case VIR_TYPED_PARAM_INT: - val = PyInt_FromLong((long)params[i].value.i); - break; - - case VIR_TYPED_PARAM_UINT: - val = PyInt_FromLong((long)params[i].value.ui); - break; - - case VIR_TYPED_PARAM_LLONG: - val = PyLong_FromLongLong((long long)params[i].value.l); - break; - - case VIR_TYPED_PARAM_ULLONG: - val = PyLong_FromLongLong((long long)params[i].value.ul); - break; - - case VIR_TYPED_PARAM_DOUBLE: - val = PyFloat_FromDouble((double)params[i].value.d); - break; - - case VIR_TYPED_PARAM_BOOLEAN: - val = PyBool_FromLong((long)params[i].value.b); - break; - - default: - VIR_FREE(params); - Py_DECREF(info); - return VIR_PY_NONE; - } + ret = getPyVirTypedParameter(params, nparams); - key = libvirt_constcharPtrWrap(params[i].field); - PyDict_SetItem(info, key, val); - } +cleanup: + virTypedParameterArrayClear(params, nparams); VIR_FREE(params); - return(info); + return ret; } static PyObject * -- 1.7.1

2 2