- Devel - libvirt List Archives

[libvirt] [PATCH] Fixed service handling in specfile
by Martin Kletzander 24 Feb '12

24 Feb '12

After adding the libvirt-guests service into usual runlevels, we used to start the libvirt-guests service. However this is usually not a good practice. As mentioned on fedoraproject wiki, the installations can be in changeroots, in an installer context, or in other situations where we don't want the services autostarted. --- libvirt.spec.in | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 67cde23..072fd8e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1027,14 +1027,6 @@ fi %if %{with_systemd} %else /sbin/chkconfig --add libvirt-guests -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 %endif %postun client -p /sbin/ldconfig -- 1.7.3.4

2 1

[libvirt] Correct a check for capacity arg of storageVolumeResize()
by Zeeshan Ali (Khattak) 24 Feb '12

24 Feb '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- src/storage/storage_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index df0e291..641944d 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1758,7 +1758,7 @@ storageVolumeResize(virStorageVolPtr obj, goto out; } - if (abs_capacity > vol->allocation + pool->def->available) { + if (abs_capacity > vol->capacity + pool->def->available) { virStorageReportError(VIR_ERR_INVALID_ARG, _("Not enough space left on storage pool")); goto out; -- 1.7.7.6

2 2

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

24 Feb '12

Function xmlParseURI does not remove square brackets around IPv6 address when parsing. One of the solutions is making wrappers around functions working with xmlURI*. This assures that uri->server will be always properly assigned and it doesn't have to be changed when used on some new place in the code. For this purpose, functions virParseURI and virSaveURI were added. These function are wrappers around xmlParseURI and xmlSaveUri respectively. Also there is one new syntax check function to prohibit these functions anywhere else. File changes: - src/util/viruri.h -- declaration - src/util/viruri.c -- definition - src/libvirt_private.syms -- symbol export - src/Makefile.am -- added source and header files - cfg.mk -- added sc_prohibit_xmlURI - all others -- ID name and include fixes --- v3: - wrappers moved to new files - syntax check added - virAsprintf used instead of nasty memory mechanics v2: - added virSaveURI for building back the original string cfg.mk | 8 ++++ src/Makefile.am | 3 +- src/datatypes.h | 2 +- src/driver.h | 2 +- src/esx/esx_driver.c | 5 +- src/esx/esx_util.c | 2 +- src/esx/esx_util.h | 4 +- src/hyperv/hyperv_util.c | 2 +- src/hyperv/hyperv_util.h | 5 +- src/libvirt.c | 10 ++-- src/libvirt_private.syms | 5 ++ 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 | 7 ++- src/remote/remote_driver.c | 9 ++-- src/uml/uml_driver.c | 3 +- src/util/qparams.c | 3 +- src/util/viruri.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ src/util/viruri.h | 18 +++++++++ src/vbox/vbox_tmpl.c | 3 +- src/vmx/vmx.c | 6 +- src/xen/xen_driver.c | 4 +- src/xen/xen_hypervisor.h | 3 +- src/xen/xend_internal.c | 4 +- src/xen/xend_internal.h | 2 +- src/xenapi/xenapi_driver.c | 2 +- src/xenapi/xenapi_utils.c | 4 +- src/xenapi/xenapi_utils.h | 4 +- 30 files changed, 174 insertions(+), 48 deletions(-) create mode 100644 src/util/viruri.c create mode 100644 src/util/viruri.h diff --git a/cfg.mk b/cfg.mk index dcf44bb..9759d87 100644 --- a/cfg.mk +++ b/cfg.mk @@ -457,6 +457,12 @@ sc_prohibit_xmlGetProp: halt='use virXMLPropString, not xmlGetProp' \ $(_sc_search_regexp) +# xml(ParseURI|SaveUri) doesn't handle IPv6 URIs well +sc_prohibit_xmlURI: + @prohibit='\<xml(ParseURI|SaveUri) *\(' \ + halt='use virURI(Parse|Format), not xml(ParseURI|SaveUri)' \ + $(_sc_search_regexp) + # ATTRIBUTE_UNUSED should only be applied in implementations, not # header declarations sc_avoid_attribute_unused_in_header: @@ -758,6 +764,8 @@ exclude_file_name_regexp--sc_prohibit_strncpy = \ exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/xml\.c$$ +exclude_file_name_regexp--sc_prohibit_xmlURI = ^src/util/viruri\.c$$ + exclude_file_name_regexp--sc_require_config_h = ^examples/ exclude_file_name_regexp--sc_require_config_h_first = ^examples/ diff --git a/src/Makefile.am b/src/Makefile.am index d5f52a0..e2542b1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,7 +104,8 @@ UTIL_SOURCES = \ util/virnetlink.c util/virnetlink.h \ util/virrandom.h util/virrandom.c \ util/virsocketaddr.h util/virsocketaddr.c \ - util/virtime.h util/virtime.c + util/virtime.h util/virtime.c \ + util/viruri.h util/viruri.c EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py diff --git a/src/datatypes.h b/src/datatypes.h index 47058ed..fc284d2 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -151,7 +151,7 @@ struct _virConnect { */ unsigned int magic; /* specific value to check */ unsigned int flags; /* a set of connection flags */ - xmlURIPtr uri; /* connection URI */ + virURIPtr uri; /* connection URI */ /* The underlying hypervisor driver and network driver. */ virDriverPtr driver; diff --git a/src/driver.h b/src/driver.h index d27fa99..b04b254 100644 --- a/src/driver.h +++ b/src/driver.h @@ -9,9 +9,9 @@ # include "config.h" # include <unistd.h> -# include <libxml/uri.h> # include "internal.h" +# include "viruri.h" /* * List of registered drivers numbers */ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f5e1cc7..b6b22f8 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 "viruri.h" #define VIR_FROM_THIS VIR_FROM_ESX @@ -3945,7 +3946,7 @@ esxDomainMigratePerform(virDomainPtr domain, { int result = -1; esxPrivate *priv = domain->conn->privateData; - xmlURIPtr parsedUri = NULL; + virURIPtr parsedUri = NULL; char *saveptr; char *path_resourcePool; char *path_hostSystem; @@ -3976,7 +3977,7 @@ esxDomainMigratePerform(virDomainPtr domain, } /* Parse migration URI */ - parsedUri = xmlParseURI(uri); + parsedUri = virURIParse(uri); if (parsedUri == NULL) { virReportOOMError(); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 2c5ac1a..7d4b908 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -42,7 +42,7 @@ int -esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri) +esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) { int result = -1; struct qparam_set *queryParamSet = NULL; diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 2bee510..a69b3f4 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -22,9 +22,9 @@ #ifndef __ESX_UTIL_H__ # define __ESX_UTIL_H__ -# include <libxml/uri.h> # include <netdb.h> # include "internal.h" +# include "viruri.h" typedef struct _esxUtil_ParsedUri esxUtil_ParsedUri; @@ -40,7 +40,7 @@ struct _esxUtil_ParsedUri { char *path; }; -int esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri); +int esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri); void esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri); diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index 298cfe0..2e6a2d4 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -37,7 +37,7 @@ int -hypervParseUri(hypervParsedUri **parsedUri, xmlURIPtr uri) +hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri) { int result = -1; struct qparam_set *queryParamSet = NULL; diff --git a/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h index 9057f55..d9d1c84 100644 --- a/src/hyperv/hyperv_util.h +++ b/src/hyperv/hyperv_util.h @@ -23,9 +23,8 @@ #ifndef __HYPERV_UTIL_H__ # define __HYPERV_UTIL_H__ -# include <libxml/uri.h> - # include "internal.h" +# include "viruri.h" typedef struct _hypervParsedUri hypervParsedUri; @@ -33,7 +32,7 @@ struct _hypervParsedUri { char *transport; }; -int hypervParseUri(hypervParsedUri **parsedUri, xmlURIPtr uri); +int hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri); void hypervFreeParsedUri(hypervParsedUri **parsedUri); diff --git a/src/libvirt.c b/src/libvirt.c index 6294196..3eca512 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -23,7 +23,6 @@ #include <libxml/parser.h> #include <libxml/xpath.h> -#include <libxml/uri.h> #include "getpass.h" #ifdef HAVE_WINSOCK2_H @@ -44,6 +43,7 @@ #include "command.h" #include "virnodesuspend.h" #include "virrandom.h" +#include "viruri.h" #ifndef WITH_DRIVER_MODULES # ifdef WITH_TEST @@ -1127,7 +1127,7 @@ do_open (const char *name, virConnectOpenResolveURIAlias(name, &alias) < 0) goto failed; - ret->uri = xmlParseURI (alias ? alias : name); + ret->uri = virURIParse (alias ? alias : name); if (!ret->uri) { virLibConnError(VIR_ERR_INVALID_ARG, _("could not parse connection URI %s"), @@ -1729,7 +1729,7 @@ virConnectGetURI (virConnectPtr conn) return NULL; } - name = (char *)xmlSaveUri(conn->uri); + name = (char *)virURIFormat(conn->uri); if (!name) { virReportOOMError(); goto error; @@ -4952,7 +4952,7 @@ virDomainMigratePeer2Peer (virDomainPtr domain, const char *uri, unsigned long bandwidth) { - xmlURIPtr tempuri = NULL; + virURIPtr tempuri = NULL; VIR_DOMAIN_DEBUG(domain, "xmlin=%s, flags=%lx, dname=%s, " "dconnuri=%s, uri=%s, bandwidth=%lu", NULLSTR(xmlin), flags, NULLSTR(dname), @@ -4964,7 +4964,7 @@ virDomainMigratePeer2Peer (virDomainPtr domain, return -1; } - tempuri = xmlParseURI(dconnuri); + tempuri = virURIParse(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 9e3573f..15ea2ba 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1430,6 +1430,11 @@ virTypedParameterArrayValidate; virTypedParameterAssign; +# viruri.h +virURIParse; +virURIFormat; + + # xml.h virXMLChildElementCount; virXMLParseHelper; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6cfc5eb..6db33c2 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 "viruri.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 = virURIParse("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 b6962cf7..d77afcc 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -60,6 +60,7 @@ #include "virnodesuspend.h" #include "virtime.h" #include "virtypedparam.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -139,7 +140,7 @@ static virDrvOpenStatus lxcOpen(virConnectPtr conn, if (lxc_driver == NULL) return VIR_DRV_OPEN_DECLINED; - conn->uri = xmlParseURI("lxc:///"); + conn->uri = virURIParse("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..aef1491 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 "viruri.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 = virURIParse("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 717bdf1..c5c7afc 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 = virURIParse(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 f0af494..cf64981 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 "viruri.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -1759,7 +1760,7 @@ static int doNativeMigrate(struct qemud_driver *driver, virConnectPtr dconn) { qemuDomainObjPrivatePtr priv = vm->privateData; - xmlURIPtr uribits = NULL; + virURIPtr uribits = NULL; int ret = -1; qemuMigrationSpec spec; @@ -1775,10 +1776,10 @@ static int doNativeMigrate(struct qemud_driver *driver, virReportOOMError(); return -1; } - uribits = xmlParseURI(tmp); + uribits = virURIParse(tmp); VIR_FREE(tmp); } else { - uribits = xmlParseURI(uri); + uribits = virURIParse(uri); } if (!uribits) { qemuReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2dacb70..8fb46e1 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -26,8 +26,6 @@ #include <unistd.h> #include <assert.h> -#include <libxml/uri.h> - #include "virnetclient.h" #include "virnetclientprogram.h" #include "virnetclientstream.h" @@ -47,6 +45,7 @@ #include "command.h" #include "intprops.h" #include "virtypedparam.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_REMOTE @@ -488,7 +487,7 @@ doRemoteOpen (virConnectPtr conn, /* Allow remote serve to probe */ name = strdup(""); } else { - xmlURI tmpuri = { + virURI tmpuri = { .scheme = conn->uri->scheme, #ifdef HAVE_XMLURI_QUERY_RAW .query_raw = qparam_get_query (vars), @@ -505,7 +504,7 @@ doRemoteOpen (virConnectPtr conn, transport_str[-1] = '\0'; } - name = (char *) xmlSaveUri (&tmpuri); + name = (char *) virURIFormat (&tmpuri); #ifdef HAVE_XMLURI_QUERY_RAW VIR_FREE(tmpuri.query_raw); @@ -719,7 +718,7 @@ doRemoteOpen (virConnectPtr conn, goto failed; VIR_DEBUG("Auto-probed URI is %s", uriret.uri); - conn->uri = xmlParseURI(uriret.uri); + conn->uri = virURIParse(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..cbb2c0e 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 "viruri.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 = virURIParse(uml_driver->privileged ? "uml:///system" : "uml:///session"); if (!conn->uri) { diff --git a/src/util/qparams.c b/src/util/qparams.c index f6d0713..83b568e 100644 --- a/src/util/qparams.c +++ b/src/util/qparams.c @@ -26,12 +26,11 @@ #include <stdlib.h> #include <stdarg.h> -#include <libxml/uri.h> - #include "virterror_internal.h" #include "buf.h" #include "memory.h" #include "qparams.h" +#include "viruri.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/viruri.c b/src/util/viruri.c new file mode 100644 index 0000000..c4bdfec --- /dev/null +++ b/src/util/viruri.c @@ -0,0 +1,91 @@ +/* + * viruri.c: URI parsing wrappers for libxml2 functions + * + * Copyright (C) 2012 Red Hat, Inc. + * + * See COPYING.LIB for the License of this software + */ + +#include <config.h> + +#include "viruri.h" + +#include "memory.h" +#include "util.h" + +/** + * virURIParse: + * @uri: URI to parse + * + * Wrapper for xmlParseURI + * + * Unfortunately there are few things that should be managed after + * parsing the URI. Fortunately there is only one thing now and its + * removing of square brackets around IPv6 addresses. + * + * @returns the parsed uri object with some fixes + */ +xmlURIPtr +virURIParse(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 length = strlen(ret->server); + + /* 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[length - 1] == ']' && strchr(ret->server, ':')) { + memmove(&ret->server[0], &ret->server[1], length - 2); + ret->server[length - 2] = '\0'; + } + /* Even after such modification, it is completely ok to free + * the uri with xmlFreeURI() */ + } + + return ret; +} + +/** + * virURIFormat: + * @uri: URI to format + * + * Wrapper for xmlSaveUri + * + * This function constructs back everything that @ref virURIParse + * changes after parsing + * + * @returns the constructed uri as a string + */ +unsigned char * +virURIFormat(xmlURIPtr uri) +{ + char *tmpserver = NULL, *backupserver = uri->server; + unsigned char *ret; + + /* First check: does it make sense to do anything */ + if (uri != NULL && + uri->server != NULL && + strchr(uri->server, ':') != NULL) { + + if (virAsprintf(&tmpserver, "[%s]", uri->server) == -1) + return NULL; + + uri->server = tmpserver; + } + + ret = xmlSaveUri(uri); + + /* Put the fixed version back */ + if (tmpserver) { + uri->server = backupserver; + VIR_FREE(tmpserver); + } + + return ret; +} diff --git a/src/util/viruri.h b/src/util/viruri.h new file mode 100644 index 0000000..1315488 --- /dev/null +++ b/src/util/viruri.h @@ -0,0 +1,18 @@ +/* + * viruri.h: internal definitions used for URI parsing. + */ + +#ifndef __VIR_URI_H__ +# define __VIR_URI_H__ + +# include <libxml/uri.h> + +# include "internal.h" + +typedef xmlURI virURI; +typedef xmlURIPtr virURIPtr; + +virURIPtr virURIParse(const char *uri); +unsigned char * virURIFormat(virURIPtr uri); + +#endif /* __VIR_URI_H__ */ diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index b168c7d..a39b567 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 "viruri.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 = virURIParse(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 823d5df..9c83de4 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -24,7 +24,6 @@ #include <config.h> #include <c-ctype.h> -#include <libxml/uri.h> #include "internal.h" #include "virterror_internal.h" @@ -33,6 +32,7 @@ #include "logging.h" #include "uuid.h" #include "vmx.h" +#include "viruri.h" /* @@ -2518,7 +2518,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, char network_endPoint_name[48] = ""; char *network_endPoint = NULL; - xmlURIPtr parsedUri = NULL; + virURIPtr parsedUri = NULL; if (def == NULL || *def != NULL) { VMX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -2608,7 +2608,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port, (*def)->target.port = port; (*def)->source.type = VIR_DOMAIN_CHR_TYPE_TCP; - parsedUri = xmlParseURI(fileName); + parsedUri = virURIParse(fileName); if (parsedUri == NULL) { virReportOOMError(); diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 635f468..19ce7da 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -26,7 +26,6 @@ #include <sys/types.h> #include <fcntl.h> #include <xen/dom0_ops.h> -#include <libxml/uri.h> #include "virterror_internal.h" #include "logging.h" @@ -50,6 +49,7 @@ #include "uuid.h" #include "fdstream.h" #include "virfile.h" +#include "viruri.h" #include "command.h" #include "virnodesuspend.h" @@ -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 = virURIParse("xen:///"); if (!conn->uri) { virReportOOMError(); return VIR_DRV_OPEN_ERROR; diff --git a/src/xen/xen_hypervisor.h b/src/xen/xen_hypervisor.h index 77c6f74..55a99f1 100644 --- a/src/xen/xen_hypervisor.h +++ b/src/xen/xen_hypervisor.h @@ -11,11 +11,10 @@ #ifndef __VIR_XEN_INTERNAL_H__ # define __VIR_XEN_INTERNAL_H__ -# include <libxml/uri.h> - # include "internal.h" # include "capabilities.h" # include "driver.h" +# include "viruri.h" /* See xenHypervisorInit() for details. */ struct xenHypervisorVersions { diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 5c3838f..83bfac0 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -27,7 +27,6 @@ #include <netinet/tcp.h> #include <arpa/inet.h> #include <netdb.h> -#include <libxml/uri.h> #include <errno.h> #include "virterror_internal.h" @@ -46,6 +45,7 @@ #include "memory.h" #include "count-one-bits.h" #include "virfile.h" +#include "viruri.h" /* required for cpumap_t */ #include <xen/dom0_ops.h> @@ -3224,7 +3224,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, * "hostname", "hostname:port" or "xenmigr://hostname[:port]/". */ if (strstr (uri, "//")) { /* Full URI. */ - xmlURIPtr uriptr = xmlParseURI (uri); + virURIPtr uriptr = virURIParse (uri); if (!uriptr) { virXendError(VIR_ERR_INVALID_ARG, "%s", _("xenDaemonDomainMigrate: invalid URI")); diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h index eee67b5..3f0b63d 100644 --- a/src/xen/xend_internal.h +++ b/src/xen/xend_internal.h @@ -18,13 +18,13 @@ # include <sys/types.h> # include <stdint.h> -# include <libxml/uri.h> # include "internal.h" # include "capabilities.h" # include "domain_conf.h" # include "driver.h" # include "buf.h" +# include "viruri.h" int xenDaemonOpen_unix(virConnectPtr conn, const char *path); diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index f877f67..94644ae 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -25,7 +25,6 @@ #include <limits.h> #include <stdint.h> #include <string.h> -#include <libxml/uri.h> #include <curl/curl.h> #include <xen/api/xen_all.h> #include "internal.h" @@ -37,6 +36,7 @@ #include "uuid.h" #include "memory.h" #include "buf.h" +#include "viruri.h" #include "xenapi_driver.h" #include "xenapi_driver_private.h" #include "xenapi_utils.h" diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index ddc7736..943b6c0 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -25,7 +25,6 @@ #include <stdio.h> #include <string.h> #include <stdint.h> -#include <libxml/uri.h> #include <xen/api/xen_all.h> #include "internal.h" #include "domain_conf.h" @@ -37,6 +36,7 @@ #include "buf.h" #include "logging.h" #include "qparams.h" +#include "viruri.h" #include "xenapi_driver_private.h" #include "xenapi_utils.h" @@ -94,7 +94,7 @@ xenapiUtil_RequestPassword(virConnectAuthPtr auth, const char *username, } int -xenapiUtil_ParseQuery(virConnectPtr conn, xmlURIPtr uri, int *noVerify) +xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify) { int result = 0; int i; diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h index 40506d5..aa1ff74 100644 --- a/src/xenapi/xenapi_utils.h +++ b/src/xenapi/xenapi_utils.h @@ -23,9 +23,9 @@ # define __VIR_XENAPI_UTILS__ # include <stdint.h> -# include <libxml/uri.h> # include <xen/api/xen_all.h> # include "internal.h" +# include "viruri.h" # include "domain_conf.h" # define NETWORK_DEVID_SIZE (12) @@ -40,7 +40,7 @@ xenapiUtil_RequestPassword(virConnectAuthPtr auth, const char *username, const char *hostname); int -xenapiUtil_ParseQuery(virConnectPtr conn, xmlURIPtr uri, int *noVerify); +xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify); enum xen_on_normal_exit actionShutdownLibvirt2XenapiEnum(enum virDomainLifecycleAction action); -- 1.7.3.4

3 2

[libvirt] [PATCH] virsh: fix informational message in iface-bridge command
by Laine Stump 24 Feb '12

24 Feb '12

See: https://bugzilla.redhat.com/show_bug.cgi?id=797066 The position of the bridge name and ethernet device name were accidentally swapped in the message informing of success creating the bridge. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index b97a888..66bbb0c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8974,7 +8974,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) } vshPrint(ctl, _("Created bridge %s with attached device %s\n"), - if_name, br_name); + br_name, if_name); /* start it up unless requested not to */ if (!nostart) { -- 1.7.7.6

1 1

[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