- Devel - libvirt List Archives

[libvirt] Disabling bootmenu causes boot to skip over cdrom
by Keno Fischer 11 Jun '13

11 Jun '13

Hello, I have domain with the following setup: - 1 VirtIO Disk - 1 VirtIO CDROM - 2 IDE CDROMs Now, depending on whether or not I have the bootmenu flag enabled, the boot sequence skips over booting from CDROM entirely (it does work if the bootmenu is enabled). This started happening after I added the VirtIO CDROM. Is this a bug or am I doing something wrong? Thanks, Keno Fischer

2 1

[libvirt] [PATCH] doc: Explicitly document migration limitations on errors
by Peter Krempa 11 Jun '13

11 Jun '13

Migration of guests that are in error state for example because of I/O errors may not be possible and encountering of such errors may lead to cancellation of such migration. Document this behavior explicitly. --- src/libvirt.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 620dbdd..1bdd193 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5196,7 +5196,10 @@ virDomainMigrateDirect(virDomainPtr domain, * There are many limitations on migration imposed by the underlying * technology - for example it may not be possible to migrate between * different processors even with the same architecture, or between - * different types of hypervisor. + * different types of hypervisor. A domain may not be migratable + * because of configuration or error states. A domain may become + * unmigratable during migration. This will cancel the ongoing + * migration. * * Returns the new domain object if the migration was successful, * or NULL in case of error. Note that the new domain object @@ -5423,7 +5426,10 @@ error: * There are many limitations on migration imposed by the underlying * technology - for example it may not be possible to migrate between * different processors even with the same architecture, or between - * different types of hypervisor. + * different types of hypervisor. A domain may not be migratable + * because of configuration or error states. A domain may become + * unmigratable during migration. This will cancel the ongoing + * migration. * * If the hypervisor supports it, @dxml can be used to alter * host-specific portions of the domain XML that will be used on @@ -5664,7 +5670,10 @@ error: * There are many limitations on migration imposed by the underlying * technology - for example it may not be possible to migrate between * different processors even with the same architecture, or between - * different types of hypervisor. + * different types of hypervisor. A domain may not be migratable + * because of configuration or error states. A domain may become + * unmigratable during migration. This will cancel the ongoing + * migration. * * Returns 0 if the migration succeeded, -1 upon error. */ @@ -5826,7 +5835,10 @@ error: * There are many limitations on migration imposed by the underlying * technology - for example it may not be possible to migrate between * different processors even with the same architecture, or between - * different types of hypervisor. + * different types of hypervisor. A domain may not be migratable + * because of configuration or error states. A domain may become + * unmigratable during migration. This will cancel the ongoing + * migration. * * Returns 0 if the migration succeeded, -1 upon error. */ -- 1.8.2.1

2 1

[libvirt] [PATCH] Fix F_DUPFD_CLOEXEC operation args
by Daniel P. Berrange 11 Jun '13

11 Jun '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The F_DUPFD_CLOEXEC operation with fcntl() expects a single int argument, specifying the minimum FD number for the newly dup'd file descriptor. We were not specifying that causing random stack data to be accessed as the FD number. Sometimes that worked, sometimes it didn't. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/rpc/virnetsocket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e950d7f..dcf98b1 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1055,7 +1055,7 @@ int virNetSocketDupFD(virNetSocketPtr sock, bool cloexec) int fd; if (cloexec) - fd = fcntl(sock->fd, F_DUPFD_CLOEXEC); + fd = fcntl(sock->fd, F_DUPFD_CLOEXEC, 0); else fd = dup(sock->fd); if (fd < 0) { -- 1.8.2.1

4 4

[libvirt] [PATCH 0/2] qemu: Cancel/forbid migration on I/O error
by Peter Krempa 11 Jun '13

11 Jun '13

When qemu has paused itself due to a I/O error it's not safe to migrate it as it still might contain state in kernel buffers. These patches forbid and cancel ongoing migration if a I/O error happens. Peter Krempa (2): qemu: Cancel migration if guest encoutners I/O error while migrating qemu: Forbid migration of machines with I/O errors src/qemu/qemu_migration.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) -- 1.8.2.1

3 7

[libvirt] [PATCH] qemu: Fix memory leak in Prepare phase
by Jiri Denemark 11 Jun '13

11 Jun '13

Avoid leaking virDomainDef if Prepare phase fails before it gets to qemuMigrationPrepareAny. --- src/qemu/qemu_driver.c | 12 ++++-------- src/qemu/qemu_migration.c | 29 ++++++++++++++--------------- src/qemu/qemu_migration.h | 4 ++-- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3bad629..621e184 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9552,8 +9552,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, NULL, 0, NULL, NULL, /* No cookies in v2 */ - st, def, flags); - def = NULL; + st, &def, flags); cleanup: virDomainDefFree(def); @@ -9628,8 +9627,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, ret = qemuMigrationPrepareDirect(driver, dconn, NULL, 0, NULL, NULL, /* No cookies */ uri_in, uri_out, - def, flags); - def = NULL; + &def, flags); cleanup: virDomainDefFree(def); @@ -9864,8 +9862,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, - def, flags); - def = NULL; + &def, flags); cleanup: virDomainDefFree(def); @@ -9926,8 +9923,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, - st, def, flags); - def = NULL; + st, &def, flags); cleanup: virDomainDefFree(def); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index dec04a5..0a54a30 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2016,7 +2016,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, int cookieinlen, char **cookieout, int *cookieoutlen, - virDomainDefPtr def, + virDomainDefPtr *def, virStreamPtr st, unsigned int port, unsigned long flags) @@ -2064,7 +2064,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; - if (!qemuMigrationIsAllowed(driver, NULL, def, true)) + if (!qemuMigrationIsAllowed(driver, NULL, *def, true)) goto cleanup; /* Let migration hook filter domain XML */ @@ -2072,12 +2072,12 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, char *xml; int hookret; - if (!(xml = qemuDomainDefFormatXML(driver, def, + if (!(xml = qemuDomainDefFormatXML(driver, *def, VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_MIGRATABLE))) goto cleanup; - hookret = virHookCall(VIR_HOOK_DRIVER_QEMU, def->name, + hookret = virHookCall(VIR_HOOK_DRIVER_QEMU, (*def)->name, VIR_HOOK_QEMU_OP_MIGRATE, VIR_HOOK_SUBOP_BEGIN, NULL, xml, &xmlout); VIR_FREE(xml); @@ -2098,13 +2098,13 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (!newdef) goto cleanup; - if (!virDomainDefCheckABIStability(def, newdef)) { + if (!virDomainDefCheckABIStability(*def, newdef)) { virDomainDefFree(newdef); goto cleanup; } - virDomainDefFree(def); - def = newdef; + virDomainDefFree(*def); + *def = newdef; } } } @@ -2122,7 +2122,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, .ai_socktype = SOCK_STREAM }; if (!(qemuCaps = virQEMUCapsCacheLookupCopy(driver->qemuCapsCache, - def->emulator))) + (*def)->emulator))) goto cleanup; /* Listen on :: instead of 0.0.0.0 if QEMU understands it @@ -2146,14 +2146,14 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, } } - if (!(vm = virDomainObjListAdd(driver->domains, def, + if (!(vm = virDomainObjListAdd(driver->domains, *def, driver->xmlopt, VIR_DOMAIN_OBJ_LIST_ADD_LIVE | VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, NULL))) goto cleanup; - def = NULL; + *def = NULL; priv = vm->privateData; priv->origname = origname; origname = NULL; @@ -2272,7 +2272,6 @@ cleanup: VIR_FREE(migrateFrom); VIR_FREE(origname); VIR_FREE(xmlout); - virDomainDefFree(def); VIR_FORCE_CLOSE(dataFD[0]); VIR_FORCE_CLOSE(dataFD[1]); if (vm) { @@ -2315,7 +2314,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, char **cookieout, int *cookieoutlen, virStreamPtr st, - virDomainDefPtr def, + virDomainDefPtr *def, unsigned long flags) { int ret; @@ -2324,7 +2323,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, "cookieout=%p, cookieoutlen=%p, st=%p, def=%p, " "flags=%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, - cookieout, cookieoutlen, st, def, flags); + cookieout, cookieoutlen, st, *def, flags); ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, def, @@ -2342,7 +2341,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, int *cookieoutlen, const char *uri_in, char **uri_out, - virDomainDefPtr def, + virDomainDefPtr *def, unsigned long flags) { static int port = 0; @@ -2358,7 +2357,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, "def=%p, flags=%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, - def, flags); + *def, flags); /* The URI passed in may be NULL or a string "tcp://somehostname:port". * diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index b42fe4e..22b04b4 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -98,7 +98,7 @@ int qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, char **cookieout, int *cookieoutlen, virStreamPtr st, - virDomainDefPtr def, + virDomainDefPtr *def, unsigned long flags); int qemuMigrationPrepareDirect(virQEMUDriverPtr driver, @@ -109,7 +109,7 @@ int qemuMigrationPrepareDirect(virQEMUDriverPtr driver, int *cookieoutlen, const char *uri_in, char **uri_out, - virDomainDefPtr def, + virDomainDefPtr *def, unsigned long flags); int qemuMigrationPerform(virQEMUDriverPtr driver, -- 1.8.2.1

2 2

[libvirt] [PATCH v3] selinux: assume 's0' if the range is empty
by Ján Tomko 11 Jun '13

11 Jun '13

This fixes a crash: https://bugzilla.redhat.com/show_bug.cgi?id=969878 --- v3: rewrote the patch to assume 's0' if the range is empty, instead of reporting an error v2: https://www.redhat.com/archives/libvir-list/2013-June/msg00082.html src/security/security_selinux.c | 9 +++++++-- tests/securityselinuxtest.c | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index b862fbf..6fe063e 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -170,11 +170,13 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr, /* * This needs to cope with several styles of range * + * system_u:system_r:virtd_t * system_u:system_r:virtd_t:s0 * system_u:system_r:virtd_t:s0-s0 * system_u:system_r:virtd_t:s0-s0:c0.c1023 * - * In the first two cases, we'll assume c0.c1023 for + * In the first case we'll assume s0:c0.c1023 and + * in the next two cases, we'll assume c0.c1023 for * the category part, since that's what we're really * interested in. This won't work in Enforcing mode, * but will prevent libvirtd breaking in Permissive @@ -189,6 +191,7 @@ virSecuritySELinuxMCSGetProcessRange(char **sens, context_t ourContext = NULL; char *cat = NULL; char *tmp; + const char *contextRange; int ret = -1; if (getcon_raw(&ourSecContext) < 0) { @@ -202,8 +205,10 @@ virSecuritySELinuxMCSGetProcessRange(char **sens, ourSecContext); goto cleanup; } + if (!(contextRange = context_range_get(ourContext))) + contextRange = "s0"; - if (VIR_STRDUP(*sens, context_range_get(ourContext)) < 0) + if (VIR_STRDUP(*sens, contextRange) < 0) goto cleanup; /* Find and blank out the category part (if any) */ diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index bdf248b..8d85c68 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -333,6 +333,12 @@ mymain(void) "system_u", "system_r", "object_r", "svirt_t", "svirt_image_t", 2, 3, 0, 1023); + DO_TEST_GEN_LABEL("dynamic virtd, missing range", + "system_u:system_r:virtd_t", + true, NULL, NULL, + "system_u", "system_r", "object_r", + "svirt_t", "svirt_image_t", + 0, 0, 0, 1023); return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.1.5

2 2

[libvirt] [PATCH] qemu_migrate: Dispose listen address if set from config
by Michal Privoznik 11 Jun '13

11 Jun '13

https://bugzilla.redhat.com/show_bug.cgi?id=971485 As of d7f9d827531bc843b7c5aa9d3e8c08738a1de248 we copy the listen address from the qemu.conf config file in case none has been provided via XML. But later, when migrating, we should not include such listen address in the migratable XML as it is something autogenerated, not requested by user. Moreover, the binding to the listen address will likely fail, unless the address is '0.0.0.0' or its IPv6 equivalent. This patch introduces a new boolean attribute to virDomainGraphicsListenDef to distinguish autofilled listen addresses. However, we must keep the attribute over libvirtd restarts, so it must be kept within status XML. --- src/conf/domain_conf.c | 28 ++++++++++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_process.c | 1 + 3 files changed, 30 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3e81013..2373397 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7688,6 +7688,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, char *type = virXMLPropString(node, "type"); char *address = virXMLPropString(node, "address"); char *network = virXMLPropString(node, "network"); + char *fromConfig = virXMLPropString(node, "fromConfig"); + int tmp; if (!type) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -7724,6 +7726,17 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, network = NULL; } + if (fromConfig && + flags & VIR_DOMAIN_XML_INTERNAL_STATUS) { + if (virStrToLong_i(fromConfig, NULL, 10, &tmp) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid fromConfig value: %s"), + fromConfig); + goto error; + } + def->fromConfig = tmp != 0; + } + ret = 0; error: if (ret < 0) @@ -7731,6 +7744,7 @@ error: VIR_FREE(type); VIR_FREE(address); VIR_FREE(network); + VIR_FREE(fromConfig); return ret; } @@ -15365,6 +15379,11 @@ virDomainGraphicsListenDefFormat(virBufferPtr buf, virDomainGraphicsListenDefPtr def, unsigned int flags) { + /* If generating migratable XML, skip listen address + * dragged in from config file */ + if ((flags & VIR_DOMAIN_XML_MIGRATABLE) && def->fromConfig) + return; + virBufferAddLit(buf, " <listen"); if (def->type) { @@ -15386,6 +15405,9 @@ virDomainGraphicsListenDefFormat(virBufferPtr buf, virBufferEscapeString(buf, " network='%s'", def->network); } + if (flags & VIR_DOMAIN_XML_INTERNAL_STATUS) + virBufferAsprintf(buf, " fromConfig='%d'", def->fromConfig); + virBufferAddLit(buf, "/>\n"); } @@ -15412,6 +15434,9 @@ virDomainGraphicsDefFormat(virBufferPtr buf, for (i = 0; i < def->nListens; i++) { if (virDomainGraphicsListenGetType(def, i) == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { + if (flags & VIR_DOMAIN_XML_MIGRATABLE && + def->listens[i].fromConfig) + continue; listenAddr = virDomainGraphicsListenGetAddress(def, i); break; } @@ -15531,6 +15556,9 @@ virDomainGraphicsDefFormat(virBufferPtr buf, if (virDomainGraphicsListenGetType(def, i) == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE) continue; + if (flags & VIR_DOMAIN_XML_MIGRATABLE && + def->listens[i].fromConfig) + continue; if (!children) { virBufferAddLit(buf, ">\n"); children = true; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b8edb1e..5b159ac 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1420,6 +1420,7 @@ struct _virDomainGraphicsListenDef { int type; /* enum virDomainGraphicsListenType */ char *address; char *network; + bool fromConfig; /* true if the @address is config file originated */ }; struct _virDomainGraphicsDef { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c412ea2..5a0f18b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3486,6 +3486,7 @@ int qemuProcessStart(virConnectPtr conn, VIR_SHRINK_N(graphics->listens, graphics->nListens, 1); goto cleanup; } + graphics->listens[0].fromConfig = true; } } } -- 1.8.1.5

2 1

[libvirt] [PATCH for v1.0.5-maint] Fix use of VIR_STRDUP vs strdup
by Doug Goldstein 11 Jun '13

11 Jun '13

Commit 894f784948a93760629de3cb195c69ef4f4b831f broke the v1.0.5-maint branch because VIR_STRDUP() didn't exist in the v1.0.5 release so the resulting build is missing that symbol. This patch is only for the v1.0.5-maint branch. --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d96805a..606194c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1223,7 +1223,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, virReportOOMError(); goto error; } - } else if (VIR_STRDUP(hoststr, host) < 0) { + } else if ((hoststr = strdup(host)) == NULL) { goto error; } -- 1.8.1.5

4 6

[libvirt] [PATCH] LXC: Allow to input relative path of program for lxc-enter-namespace
by Gao feng 11 Jun '13

11 Jun '13

User execvp to replace execv, so user can use relative path to exec programs in container. Such as "lxc-enter-namespace domain ls" And the user can still use absolute path to exec programs. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 955e882..8161b23 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7902,7 +7902,7 @@ cmdLxcEnterNamespace(vshControl *ctl, const vshCmd *cmd) if (virFork(&pid) < 0) _exit(255); if (pid == 0) { - execv(cmdargv[0], cmdargv); + execvp(cmdargv[0], cmdargv); _exit(255); } else { if (virProcessWait(pid, NULL) < 0) -- 1.8.1.4

1 0

[libvirt] [PATCH] remote: fix dom->id after virDomainCreateWithFlags
by Marek Marczykowski 11 Jun '13

11 Jun '13

The same issue as (already fixed) in virDomainCreate - REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS doesn't return new domain ID, only -1 on error or 0 on success. Besides this one fix it is more general problem - local domain object ID can desynchronize with the real one, for example in case of another client creates/destroys domain in the meantime. Perhaps virDomainGetID should be called remotely (with all performance implications...)? Or some event-based notification used? Signed-off-by: Marek Marczykowski <marmarek(a)invisiblethingslab.com> --- src/remote/remote_driver.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f66304c..0bbfc22 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2423,6 +2423,46 @@ done: return rv; } +static int +remoteDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) +{ + int rv = -1; + struct private_data *priv = dom->conn->privateData; + remote_domain_create_with_flags_args args; + remote_domain_lookup_by_uuid_args args2; + remote_domain_lookup_by_uuid_ret ret2; + + remoteDriverLock(priv); + + make_nonnull_domain(&args.dom, dom); + args.flags = flags; + + if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS, + (xdrproc_t)xdr_remote_domain_create_with_flags_args, (char *)&args, + (xdrproc_t)xdr_void, (char *)NULL) == -1) { + goto done; + } + + /* Need to do a lookup figure out ID of newly started guest, because + * bug in design of REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS means we aren't getting + * it returned. + */ + memcpy(args2.uuid, dom->uuid, VIR_UUID_BUFLEN); + memset(&ret2, 0, sizeof(ret2)); + if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_LOOKUP_BY_UUID, + (xdrproc_t) xdr_remote_domain_lookup_by_uuid_args, (char *) &args2, + (xdrproc_t) xdr_remote_domain_lookup_by_uuid_ret, (char *) &ret2) == -1) + goto done; + + dom->id = ret2.dom.id; + xdr_free((xdrproc_t) &xdr_remote_domain_lookup_by_uuid_ret, (char *) &ret2); + rv = 0; + +done: + remoteDriverUnlock(priv); + return rv; +} + static char * remoteDomainGetSchedulerType(virDomainPtr domain, int *nparams) { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 512ba2e..d2e0175 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3875,7 +3875,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_IO_ERROR_REASON = 195, /** - * @generate: both + * @generate: server */ REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS = 196, -- 1.8.1.4

3 2

[libvirt] [PATCH] storage_backend: Drop unused code
by Cole Robinson 10 Jun '13

10 Jun '13

This has been disabled for years --- src/storage/storage_backend.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index e5c9209..0fd4598 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -115,8 +115,6 @@ static virStorageBackendPtr backends[] = { NULL }; -static int track_allocation_progress = 0; - enum { TOOL_QEMU_IMG, TOOL_KVM_IMG, @@ -342,31 +340,11 @@ createRawFile(int fd, virStorageVolDefPtr vol, } if (remain) { - if (track_allocation_progress) { - while (remain) { - /* Allocate in chunks of 512MiB: big-enough chunk - * size and takes approx. 9s on ext3. A progress - * update every 9s is a fair-enough trade-off - */ - unsigned long long bytes = 512 * 1024 * 1024; - - if (bytes > remain) - bytes = remain; - if (safezero(fd, vol->allocation - remain, bytes) < 0) { - ret = -errno; - virReportSystemError(errno, _("cannot fill file '%s'"), - vol->target.path); - goto cleanup; - } - remain -= bytes; - } - } else { /* No progress bars to be shown */ - if (safezero(fd, 0, remain) < 0) { - ret = -errno; - virReportSystemError(errno, _("cannot fill file '%s'"), - vol->target.path); - goto cleanup; - } + if (safezero(fd, 0, remain) < 0) { + ret = -errno; + virReportSystemError(errno, _("cannot fill file '%s'"), + vol->target.path); + goto cleanup; } } -- 1.8.2.1

3 3

[libvirt] [PATCH] virSocketAddrIsWildcard: Use IN6_IS_ADDR_UNSPECIFIED correctly
by Michal Privoznik 10 Jun '13

10 Jun '13

The IN6_IS_ADDR_UNSPECIFIED macro expects pointer to sin6_addr element instead of s6_addr element. --- src/util/virsocketaddr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index e84c58e..2666574 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -241,7 +241,7 @@ virSocketAddrIsWildcard(const virSocketAddrPtr addr) return memcmp(&addr->data.inet4.sin_addr.s_addr, &tmp, sizeof(addr->data.inet4.sin_addr.s_addr)) == 0; case AF_INET6: - return IN6_IS_ADDR_UNSPECIFIED(&addr->data.inet6.sin6_addr.s6_addr); + return IN6_IS_ADDR_UNSPECIFIED(&addr->data.inet6.sin6_addr); } return false; } -- 1.8.1.5

2 1

[libvirt] [PATCH 0/6] Support to use iscsi storage in domain conf
by Osier Yang 10 Jun '13

10 Jun '13

This supports to use libvirt iscsi storage volume for qemu with either the LUN's path on host (e.g. /dev/disk/by-path/*-lun-1), or the the libiscsi uri (e.g iscsi://demo.org:6000/$iqn/1)in domain conf. Osier Yang (6): storage_iscsi: Reflect the default target port conf: Introduce new XML tag "mode" for disk source qemu: Translate the iscsi pool/volume disk source security: Ignore to manage the volume type disk if its mode is uri conf: Ignore the volume type disk if its mode is "uri" qemu: Translate the volume type disk source before cgroup setting docs/formatdomain.html.in | 9 ++- docs/schemas/domaincommon.rng | 8 +++ src/conf/domain_conf.c | 71 +++++++++++++++++++++- src/conf/domain_conf.h | 25 ++++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 20 ++++-- src/qemu/qemu_conf.c | 117 +++++++++++++++++++++++++++++------- src/qemu/qemu_process.c | 13 ++-- src/security/security_apparmor.c | 10 ++- src/security/security_dac.c | 10 ++- src/security/security_selinux.c | 10 ++- src/storage/storage_backend_iscsi.c | 6 +- tests/qemuxml2xmltest.c | 1 + 13 files changed, 261 insertions(+), 40 deletions(-) -- 1.8.1.4

1 1

[libvirt] [PATCH] virSocketAddrIsWildcard: Drop IN6_IS_ADDR_UNSPECIFIED
by Michal Privoznik 10 Jun '13

10 Jun '13

There's this macro IN6_IS_ADDR_UNSPECIFIED which seems to be portable, but it is not. On other architectures many errors are produced, e.g. on my ARM box I get: CC libvirt_util_la-virsocketaddr.lo util/virsocketaddr.c: In function 'virSocketAddrIsWildcard': util/virsocketaddr.c:244:16: error: cast increases required alignment of target type [-Werror=cast-align] util/virsocketaddr.c: At top level: cc1: error: unrecognized command line option "-Wno-unused-command-line-argument" [-Werror] cc1: all warnings being treated as errors Hence, we should drop its usage and move to memcmp instead. --- src/util/virsocketaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index e84c58e..1cefda7 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -241,7 +241,8 @@ virSocketAddrIsWildcard(const virSocketAddrPtr addr) return memcmp(&addr->data.inet4.sin_addr.s_addr, &tmp, sizeof(addr->data.inet4.sin_addr.s_addr)) == 0; case AF_INET6: - return IN6_IS_ADDR_UNSPECIFIED(&addr->data.inet6.sin6_addr.s6_addr); + return memcmp(addr->data.inet6.sin6_addr.s6_addr, &in6addr_any, + sizeof(addr->data.inet6.sin6_addr.s6_addr)) == 0; } return false; } -- 1.8.1.5

2 2

[libvirt] [PATCH] storage: Small file probing fixup
by Martin Kletzander 10 Jun '13

10 Jun '13

Fallback to possible storage format after nothing else than magic has matched, since this is likely theformat user wants even though we don't know any better. Also fix a comment which wasn't very clear about what "skip" meant. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=836676 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virstoragefile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index b985df4..b083530 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -79,7 +79,8 @@ struct FileTypeInfo { enum lv_endian endian; /* Endianness of file format */ int versionOffset; /* Byte offset from start of file * where we find version number, - * -1 to skip version test */ + * -1 to fail version test, + * -2 to pass version test */ int versionNumber; /* Version number to validate */ int sizeOffset; /* Byte offset from start of file * where we find capacity info, @@ -662,6 +663,10 @@ virStorageFileProbeFormatFromBuf(const char *path, } } + if (format == VIR_STORAGE_FILE_RAW && + possibleFormat != VIR_STORAGE_FILE_RAW) + format = possibleFormat; + cleanup: VIR_DEBUG("format=%d", format); return format; -- 1.8.2.1

2 2

[libvirt] [PATCH] Fix commit 29c1e913e459058c12d02b3f4b767b3dd428a498
by Peter Krempa 10 Jun '13

10 Jun '13

This patch fixes changes done in commit 29c1e913e459058c12d02b3f4b767b3 that was pushed without implementing review feedback. The flag introduced by the patch is changed to VIR_DOMAIN_VCPU_GUEST and documentation makes the difference between regular hotplug and this new functionality more explicit. The virsh options that enable the use of the new flag are changed to "--guest" and the documentation is fixed too. --- include/libvirt/libvirt.h.in | 2 +- src/libvirt.c | 18 +++++++++--------- src/qemu/qemu_driver.c | 8 ++++---- tools/virsh-domain.c | 34 +++++++++++++++++----------------- tools/virsh.pod | 16 ++++++++-------- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index e057be1..574b970 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2120,7 +2120,7 @@ typedef enum { /* Additionally, these flags may be bitwise-OR'd in. */ VIR_DOMAIN_VCPU_MAXIMUM = (1 << 2), /* Max rather than current count */ - VIR_DOMAIN_VCPU_AGENT = (1 << 3), /* Use guest-agent based cpu hotplug */ + VIR_DOMAIN_VCPU_GUEST = (1 << 3), /* Modify state of the cpu in the guest */ } virDomainVcpuFlags; int virDomainSetVcpus (virDomainPtr domain, diff --git a/src/libvirt.c b/src/libvirt.c index 820519a..620dbdd 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -8907,10 +8907,10 @@ error: * current virtual CPU limit, which must be less than or equal to the * maximum limit. * - * If @flags includes VIR_DOMAIN_VCPU_AGENT, then a guest agent is used to - * modify the number of processors used by a domain. This flag can only be used - * with live guests and is incompatible with VIR_DOMAIN_VCPU_MAXIMUM as the - * maximum limit can't be changed using the guest agent. + * If @flags includes VIR_DOMAIN_VCPU_GUEST, then the state of processors is + * modified inside the guest instead of the hypervisor. This flag can only + * be used with live guests and is incompatible with VIR_DOMAIN_VCPU_MAXIMUM. + * The usage of this flag may require a guest agent configured. * * Not all hypervisors can support all flag combinations. * @@ -8937,11 +8937,11 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, goto error; } - if (flags & VIR_DOMAIN_VCPU_AGENT && + if (flags & VIR_DOMAIN_VCPU_GUEST && flags & VIR_DOMAIN_VCPU_MAXIMUM) { virReportInvalidArg(flags, _("flags 'VIR_DOMAIN_VCPU_MAXIMUM' and " - "'VIR_DOMAIN_VCPU_AGENT' in '%s' are mutually " + "'VIR_DOMAIN_VCPU_GUEST' in '%s' are mutually " "exclusive"), __FUNCTION__); goto error; } @@ -8991,9 +8991,9 @@ error: * virtual CPU limit is queried. Otherwise, this call queries the * current virtual CPU count. * - * If @flags includes VIR_DOMAIN_VCPU_AGENT, then a guest agent is used to - * modify the number of processors used by a domain. This flag is only usable on - * live domains. + * If @flags includes VIR_DOMAIN_VCPU_GUEST, then the state of the processors + * is modified in the guest instead of the hypervisor. This flag is only usable + * on live domains. Guest agent may be needed for this flag to be available. * * Returns the number of vCPUs in case of success, -1 in case of failure. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e5f6988..1b5b04f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3792,7 +3792,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_VCPU_MAXIMUM | - VIR_DOMAIN_VCPU_AGENT, -1); + VIR_DOMAIN_VCPU_GUEST, -1); if (!nvcpus || (unsigned short) nvcpus != nvcpus) { virReportError(VIR_ERR_INVALID_ARG, @@ -3834,7 +3834,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } - if (flags & VIR_DOMAIN_VCPU_AGENT) { + if (flags & VIR_DOMAIN_VCPU_GUEST) { if (flags & VIR_DOMAIN_AFFECT_CONFIG) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("chainging of maximum vCPU count isn't supported " @@ -4518,7 +4518,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | VIR_DOMAIN_VCPU_MAXIMUM | - VIR_DOMAIN_VCPU_AGENT, -1); + VIR_DOMAIN_VCPU_GUEST, -1); if (!(vm = qemuDomObjFromDomain(dom))) return -1; @@ -4535,7 +4535,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) if (flags & VIR_DOMAIN_AFFECT_LIVE) def = vm->def; - if (flags & VIR_DOMAIN_VCPU_AGENT) { + if (flags & VIR_DOMAIN_VCPU_GUEST) { if (flags & VIR_DOMAIN_AFFECT_CONFIG) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("vCPU count provided by the guest agent can only be " diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0616487..955e882 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5161,9 +5161,9 @@ static const vshCmdOptDef opts_vcpucount[] = { .type = VSH_OT_BOOL, .help = N_("get value according to current domain state") }, - {.name = "agent", + {.name = "guest", .type = VSH_OT_BOOL, - .help = N_("use guest agent based hotplug") + .help = N_("retrieve vcpu count from the guest instead of the hypervisor") }, {.name = NULL} }; @@ -5207,8 +5207,8 @@ vshCPUCountCollect(vshControl *ctl, last_error->code == VIR_ERR_INVALID_ARG)) goto cleanup; - if (flags & VIR_DOMAIN_VCPU_AGENT) { - vshError(ctl, "%s", _("Failed to retrieve vCPU count via guest agent")); + if (flags & VIR_DOMAIN_VCPU_GUEST) { + vshError(ctl, "%s", _("Failed to retrieve vCPU count from the guest")); goto cleanup; } @@ -5267,8 +5267,8 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd) bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); - bool agent = vshCommandOptBool(cmd, "agent"); - bool all = maximum + active + current + config + live + agent == 0; + bool guest = vshCommandOptBool(cmd, "guest"); + bool all = maximum + active + current + config + live + guest == 0; unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; /* Backwards compatibility: prior to 0.9.4, @@ -5283,7 +5283,7 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); VSH_EXCLUSIVE_OPTIONS_VAR(active, maximum); - VSH_EXCLUSIVE_OPTIONS_VAR(agent, config); + VSH_EXCLUSIVE_OPTIONS_VAR(guest, config); if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; @@ -5291,8 +5291,8 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_AFFECT_CONFIG; if (maximum) flags |= VIR_DOMAIN_VCPU_MAXIMUM; - if (agent) - flags |= VIR_DOMAIN_VCPU_AGENT; + if (guest) + flags |= VIR_DOMAIN_VCPU_GUEST; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -5762,10 +5762,6 @@ static const vshCmdOptDef opts_emulatorpin[] = { .type = VSH_OT_BOOL, .help = N_("affect current domain") }, - {.name = "agent", - .type = VSH_OT_BOOL, - .help = N_("use guest agent based hotplug") - }, {.name = NULL} }; @@ -5889,6 +5885,10 @@ static const vshCmdOptDef opts_setvcpus[] = { .type = VSH_OT_BOOL, .help = N_("affect current domain") }, + {.name = "guest", + .type = VSH_OT_BOOL, + .help = N_("modify cpu state in the guest") + }, {.name = NULL} }; @@ -5902,19 +5902,19 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); - bool agent = vshCommandOptBool(cmd, "agent"); + bool guest = vshCommandOptBool(cmd, "guest"); unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); - VSH_EXCLUSIVE_OPTIONS_VAR(agent, config); + VSH_EXCLUSIVE_OPTIONS_VAR(guest, config); if (config) flags |= VIR_DOMAIN_AFFECT_CONFIG; if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (agent) - flags |= VIR_DOMAIN_VCPU_AGENT; + if (guest) + flags |= VIR_DOMAIN_VCPU_GUEST; /* none of the options were specified */ if (!current && flags == 0) flags = -1; diff --git a/tools/virsh.pod b/tools/virsh.pod index d537653..405b4d2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1585,7 +1585,7 @@ exclusive. If no flag is specified, behavior is different depending on hypervisor. =item B<setvcpus> I<domain> I<count> [I<--maximum>] [[I<--config>] -[I<--live>] | [I<--current>]] [I<--agent>] +[I<--live>] | [I<--current>]] [I<--guest>] Change the number of virtual CPUs active in a guest domain. By default, this command works on active guest domains. To change the settings for an @@ -1611,9 +1611,9 @@ is up to the hypervisor whether the I<--config> flag is also assumed, and therefore whether the XML configuration is adjusted to make the change persistent. -If I<--agent> is specified, then guest agent commands are used to retrieve the -count of available vCPUs from the perspective of the guest. This flag is usable -only for live domains. +If I<--guest> is specified, then the count of cpus is modified in the guest +instead of the hypervisor. This flag is usable only for live domains +and may require guest agent to be configured in the guest. The I<--maximum> flag controls the maximum number of virtual cpus that can be hot-plugged the next time the domain is booted. As such, it must only be @@ -1741,7 +1741,7 @@ NOTE: For an inactive domain, the domain name or UUID must be used as the I<domain>. =item B<vcpucount> I<domain> [{I<--maximum> | I<--active>} -{I<--config> | I<--live> | I<--current>}] [I<--agent>] +{I<--config> | I<--live> | I<--current>}] [I<--guest>] Print information about the virtual cpu counts of the given I<domain>. If no flags are specified, all possible counts are @@ -1759,9 +1759,9 @@ lists current values, and I<--current> queries according to the current state of the domain (corresponding to I<--live> if running, or I<--config> if inactive); these three flags are mutually exclusive. -If I<--agent> is specified, then guest agent commands are used to retrieve the -count of available vCPUs from the perspective of the guest. This flag is usable -only for live domains. +If I<--guest> is specified, then the count of cpus is reported from +the perspective of the guest. This flag is usable only for live domains +and may require guest agent to be configured in the guest. =item B<vcpuinfo> I<domain> -- 1.8.2.1

2 2

[libvirt] [PATCH 0/6] Support to use iscsi storage in domain conf
by Osier Yang 10 Jun '13

10 Jun '13

This supports to use libvirt iscsi storage volume for qemu with either the LUN's path on host (e.g. /dev/disk/by-path/*-lun-1), or the the libiscsi uri (e.g iscsi://demo.org:6000/$iqn/1)in domain conf. Osier Yang (6): storage_iscsi: Reflect the default target port conf: Introduce new XML tag "mode" for disk source qemu: Translate the iscsi pool/volume disk source security: Ignore to manage the volume type disk if its mode is uri conf: Ignore the volume type disk if its mode is "uri" qemu: Translate the volume type disk source before cgroup setting docs/formatdomain.html.in | 9 ++- docs/schemas/domaincommon.rng | 8 +++ src/conf/domain_conf.c | 71 +++++++++++++++++++++- src/conf/domain_conf.h | 25 ++++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 20 ++++-- src/qemu/qemu_conf.c | 117 +++++++++++++++++++++++++++++------- src/qemu/qemu_process.c | 13 ++-- src/security/security_apparmor.c | 10 ++- src/security/security_dac.c | 10 ++- src/security/security_selinux.c | 10 ++- src/storage/storage_backend_iscsi.c | 6 +- tests/qemuxml2xmltest.c | 1 + 13 files changed, 261 insertions(+), 40 deletions(-) -- 1.8.1.4

1 0

[libvirt] [PATCH v3 0/4]Add startupPolicy attribute support for hard disks
by Guannan Ren 09 Jun '13

09 Jun '13

v2 to v3: not only check disk source, startupPolicy should work if any backing file is missing. The commit 039a3283 break the limition of contiguous device boot orders, so I remove my previous patch about it. v1 to v2: added relax schema for disk of block and dir type removed original patch 3/5. The set of patches is trying to add 'startupPolicy' attribute support to the source element of hard disks. Policy levels are using the mandatory, requisite, optional levels as originally documented. For the 'optional' policy, there is a little difference from CDROM and Floppy which only drop its source path, for disks, if missing, the checking function will drop their definitions, because qemu doesn't allow missing source path for hard disk. Guannan Ren [PATCH v3 1/4] conf: add startupPolicy attribute for harddisk [PATCH v3 2/4] storage: report error rather than warning if backing files doesn't exist [PATCH v3 3/4] qemu: drop disk with 'optional' startupPolicy if it is not present [PATCH v3 4/4] security: restore DAC for every disk file in disk chain docs/schemas/domaincommon.rng | 6 +++++ include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 20 ++++++++++------ src/qemu/qemu_domain.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------ src/qemu/qemu_process.c | 7 ------ src/security/security_dac.c | 15 +++++++++++- src/util/virstoragefile.c | 23 +++++++++++------- tests/virstoragetest.c | 16 ++++++------- 8 files changed, 130 insertions(+), 77 deletions(-)

1 4

[libvirt] [PATCH] spec: Drop Requires: vbox
by Cole Robinson 09 Jun '13

09 Jun '13

Since this package isn't provided by any stock RH based distro. The upstream RPMs are called VirtualBox anyways. --- libvirt.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 47902e6..8d43e6d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1050,7 +1050,6 @@ Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} %endif -Requires: vbox %description daemon-vbox Server side daemon and driver required to manage the virtualization -- 1.8.2.1

3 3

[libvirt] How does virsh lxc-enter-namespace work? Does it?
by Richard Weinberger 07 Jun '13

07 Jun '13

Hi! I'm facing the issue that "virsh lxc-enter-namespace ..." does not work for me. setns() always fails with EINVAL. Reading the code confused me a bit, maybe you can help me. :D virsh itself calls: cmdLxcEnterNamespace() virDomainLxcOpenNamespace() conn->driver->domainLxcOpenNamespace() Here comes the first thing that is not clear to me. conn->driver seems to be the remote driver and therefore ->domainLxcOpenNamespace is remoteDomainLxcOpenNamespace() Why is lxc:/// a remote connection? remoteDomainLxcOpenNamespace() does a rpc call to libvirtd. On the remote side libvirtd does: lxcDispatchDomainOpenNamespace(), which opens the namespace fds, and sends them back as result. How can this work? Does it somewhere magic file descriptor passing on AF_UNIX? virsh then receives the fd's (pure numbers) and setns() failed badly. Wouldn't it make much more sense to do the open(/proc/XXX/ns/{mnt, user, ...}) and setns() calls directly on the local side? IOW directly in virsh? driver->domainLxcOpenNamespace() should only report the process id of the container's init process. Thanks, //richard

2 7

[libvirt] [libvirt-designer PATCHv4 0/9] Handle more devices in GVirDesignerDomain
by Christophe Fergeau 07 Jun '13

07 Jun '13

Hey, Here is a new version of that series with the issues raised by Michal addressed. Changes since v3: - don't automatically add USB/smartcard/graphics devices, but add options to virtxml to explicitly request those - return an error when gvir_designer_domain_add_graphics() fails to automatically add the spice agent channel - set a GError when gvir_designer_domain_get_fallback_devices() could not find any device. Christophe

2 11

[libvirt] [PATCH] Prefer VIR_STRDUP over virAsprintf(&dst, "%s", str)
by Michal Privoznik 07 Jun '13

07 Jun '13

There's no sense in using virAsprintf() just to duplicate a string. We should use VIR_STRDUP which is designed just for that. --- daemon/libvirtd-config.c | 2 +- src/conf/domain_audit.c | 2 +- src/libxl/libxl_driver.c | 30 ++++++++++++------------------ src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/phyp/phyp_driver.c | 4 +--- src/storage/storage_backend_scsi.c | 4 +--- 6 files changed, 17 insertions(+), 27 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 66dfb4a..d9357b7 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -283,7 +283,7 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) * running in disconnected operation, and report a less * useful Avahi string */ - ret = virAsprintf(&data->mdns_name, "Virtualization Host"); + ret = VIR_STRDUP(data->mdns_name, "Virtualization Host"); } else { char *tmp; /* Extract the host part of the potentially FQDN */ diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index fd3de5e..97e71f7 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -505,7 +505,7 @@ virDomainAuditRedirdev(virDomainObjPtr vm, virDomainRedirdevDefPtr redirdev, switch (redirdev->bus) { case VIR_DOMAIN_REDIRDEV_BUS_USB: - if (virAsprintf(&address, "USB redirdev") < 0) { + if (VIR_STRDUP_QUIET(address, "USB redirdev") < 0) { VIR_WARN("OOM while encoding audit message"); goto cleanup; } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index bed583b..3990354 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1191,29 +1191,23 @@ libxlStateInitialize(bool privileged, if (!(libxl_driver->domains = virDomainObjListNew())) goto error; - if (virAsprintf(&libxl_driver->configDir, - "%s", LIBXL_CONFIG_DIR) == -1) - goto out_of_memory; + if (VIR_STRDUP(libxl_driver->configDir, LIBXL_CONFIG_DIR) < 0) + goto error; - if (virAsprintf(&libxl_driver->autostartDir, - "%s", LIBXL_AUTOSTART_DIR) == -1) - goto out_of_memory; + if (VIR_STRDUP(libxl_driver->autostartDir, LIBXL_AUTOSTART_DIR) < 0) + goto error; - if (virAsprintf(&libxl_driver->logDir, - "%s", LIBXL_LOG_DIR) == -1) - goto out_of_memory; + if (VIR_STRDUP(libxl_driver->logDir, LIBXL_LOG_DIR) < 0) + goto error; - if (virAsprintf(&libxl_driver->stateDir, - "%s", LIBXL_STATE_DIR) == -1) - goto out_of_memory; + if (VIR_STRDUP(libxl_driver->stateDir, LIBXL_STATE_DIR) < 0) + goto error; - if (virAsprintf(&libxl_driver->libDir, - "%s", LIBXL_LIB_DIR) == -1) - goto out_of_memory; + if (VIR_STRDUP(libxl_driver->libDir, LIBXL_LIB_DIR) < 0) + goto error; - if (virAsprintf(&libxl_driver->saveDir, - "%s", LIBXL_SAVE_DIR) == -1) - goto out_of_memory; + if (VIR_STRDUP(libxl_driver->saveDir, LIBXL_SAVE_DIR) < 0) + goto error; if (virFileMakePath(libxl_driver->logDir) < 0) { VIR_ERROR(_("Failed to create log dir '%s': %s"), diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index c4fcde6..9a54de4 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3008,7 +3008,7 @@ ebtablesCreateTmpSubChain(ebiptablesRuleInstPtr *inst, ignore_value(VIR_STRDUP(protostr, "")); break; case L2_PROTO_STP_IDX: - ignore_value(virAsprintf(&protostr, "-d " NWFILTER_MAC_BGA " ")); + ignore_value(VIR_STRDUP(protostr, "-d " NWFILTER_MAC_BGA " ")); break; default: ignore_value(virAsprintf(&protostr, "-p 0x%04x ", diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 70d3adb..2df082b 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -259,10 +259,8 @@ phypGetSystemType(virConnectPtr conn) char *ret = NULL; int exit_status = 0; - if (virAsprintf(&cmd, "lshmc -V") < 0) { - virReportOOMError(); + if (VIR_STRDUP(cmd, "lshmc -V") < 0) return -1; - } ret = phypExec(session, cmd, &exit_status, conn); VIR_FREE(cmd); diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index bd6a2a9..4dad1eb 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -507,10 +507,8 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool, virFileWaitForDevices(); - if (virAsprintf(&device_path, "/sys/bus/scsi/devices") < 0) { - virReportOOMError(); + if (VIR_STRDUP(device_path, "/sys/bus/scsi/devices") < 0) goto out; - } devicedir = opendir(device_path); -- 1.8.2.1

2 1

[libvirt] [PATCH 0/2] Resolve issues seen with schedinfo
by John Ferlan 07 Jun '13

07 Jun '13

These patches resolve an issue seen using 'virsh schedinfo <domain>' on a non running domain that have been present since 1.0.4 as a result of the cgroup infrastructure changes: https://www.redhat.com/archives/libvir-list/2013-April/msg00783.html The exact commit id that caused the issue is listed in each of the commit messages. I used git bisect to determine, although it was tricky because the TPM changes were made around the same time and required commit '8b934a5c' to be applied in order to actually see domains on my host. Prior to the changes the "CFS Bandwidth" data provided by qemuGetCpuBWStatus() and lxcGetCpuBWStatus() would be obtained as a result of the driver cgroup being mounted. Now it relies on the domain cgroup being mounted which only occurs once the domain is active. This issue also affects the libvirt-cim code in how it defines QEMU domains. Fortunately it only looks for the "cpu_shares" value. A "downside" to the end result of these changes is that for a non-running domain it becomes impossible to obtain the vcpu_period, vcpu_quota, emulator_period, and emulator_quota values. All that can be obtained is the 'cpu_shares" value. As an option, I did consider adding the following to either [qemu|lxc]DomainSchedulerGetType() and DomainSchedulerParameter[Flags]() or just [qemu|lxc]GetCpuBWStatus() APIs in order to get the "host" values if they existed (since they are eventually copied into the domain cgroup): if (cgroup == NULL) { rc = virCgroupNewSelf(&hostgrp); if (rc < 0) { virReportSystemError(-rc, "%s", _("Unable to get schedinfo host cgroup")); goto cleanup; } cgroup = hostgrp; } However, I wasn't sure going that route was desired and figured that I'd use the code review opportunity to get the answer. Furthermore, it wasn't clear that the vcpu_* and emulator_* values made sense for a non running domain. Also, the virReportSystemError may need to change to a VIR_INFO since I believe it would be triggered if cgroups weren't mounted on the system. Another option would be to just add the above code to the GetType() APIs and then ignore the 'cpu_bw_status' for the VIR_DOMAIN_AFFECT_CONFIG path in the ParametersFlags() APIs thus returning all 5 datapoints set to whatever the persistentDef had defined. Since this has been present since 1.0.4 and no one has complained so far, I don't think it's critical for 1.0.6. I suspect the change would need to into the maint trees though. It might be nice to get DanB's opinion on this too. John Ferlan (2): qemu: Resolve issue with virsh schedinfo for non running domain lxc: Resolve issue with virsh schedinfo for non running domain src/lxc/lxc_driver.c | 9 ++++++++- src/qemu/qemu_driver.c | 11 ++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) -- 1.8.1.4

3 8

[libvirt] [PATCHv2 00/14] CPU Hotplug series
by Peter Krempa 07 Jun '13

07 Jun '13

This is a rebased and a bit improved version of the first posting of support for cpu hotplug related stuff. Since nobody reviewed v1 I did't specify changes to the previous version. Peter Krempa (14): virsh-domain-monitor: Remove ATTRIBUTE_UNUSED from a argument qemu: Use bool instead of int in qemuMonitorSetCPU APIs qemu: Extract more information about vCPUs and threads qemu_agent: Introduce helpers for agent based CPU hot(un)plug API: Introduce VIR_DOMAIN_VCPU_AGENT, for agent based CPU hot(un)plug qemu: Implement request of vCPU state using the guest agent qemu: Implement support for VIR_DOMAIN_VCPU in qemuDomainSetVcpusFlags lib: Add API to map virtual cpus of a guest virsh-domain-monitor: Implement command to map guest vCPUs qemu: Implement virDomainGetVCPUMap for the qemu driver qemu: Implement new QMP command for cpu hotplug lib: Add API to modify vCPU state from the guest using the guest agent virsh-domain: Implement command for virDomainSetGuestVcpu qemu: Implement virDomainSetGuestVcpu in qemu driver daemon/remote.c | 54 +++++ include/libvirt/libvirt.h.in | 26 +++ python/generator.py | 1 + python/libvirt-override-api.xml | 7 + python/libvirt-override.c | 66 ++++++ src/driver.h | 14 ++ src/libvirt.c | 153 ++++++++++++- src/libvirt_public.syms | 7 + src/qemu/qemu_agent.c | 148 +++++++++++++ src/qemu/qemu_agent.h | 12 ++ src/qemu/qemu_driver.c | 468 +++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.c | 11 +- src/qemu/qemu_monitor.h | 13 +- src/qemu/qemu_monitor_json.c | 86 ++++++-- src/qemu/qemu_monitor_json.h | 4 +- src/qemu/qemu_monitor_text.c | 94 ++++---- src/qemu/qemu_monitor_text.h | 4 +- src/qemu/qemu_process.c | 63 ++++-- src/remote/remote_driver.c | 48 +++++ src/remote/remote_protocol.x | 31 ++- src/remote_protocol-structs | 20 ++ tools/virsh-domain-monitor.c | 112 +++++++++- tools/virsh-domain.c | 102 ++++++++- tools/virsh.pod | 42 +++- 24 files changed, 1452 insertions(+), 134 deletions(-) -- 1.8.2.1

3 29

[libvirt] [PATCH] qemuDomainGetVcpusFlags: Initialize ncpuinfo
by Michal Privoznik 07 Jun '13

07 Jun '13

Currently, there's a path to use the ncpuinfo variable uninitialized, which leads to a compiler warning: qemu/qemu_driver.c: In function 'qemuDomainGetVcpusFlags': qemu/qemu_driver.c:4573:9: error: 'ncpuinfo' may be used uninitialized in this function [-Werror=maybe-uninitialized] for (i = 0; i < ncpuinfo; i++) { ^ --- Pushed under trivial & build-breaker rules. src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e5f6988..c24f39c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4512,7 +4512,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) int ret = -1; virCapsPtr caps = NULL; qemuAgentCPUInfoPtr cpuinfo = NULL; - int ncpuinfo; + int ncpuinfo = -1; int i; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | -- 1.8.2.1

1 0

[libvirt] [PATCH RESEND 0/5] VirtualBox version 4.2 support for libvirt vbox driver
by Manuel VIVES 07 Jun '13

07 Jun '13

Hello, I'm re-sending this patch for reviewing. If necessary I'm willing to make some changes to those patches. I'm currently working on a better management for snapshots with virtualbox, and my work is based on Virtualbox 4.2 so that's why I'm re sending this patch. Regards, Manuel VIVES Ryan Woodsmall said originally: "This patch set adds VirtualBox 4.2 initial support for the libvirt vbox driver. I've tested enough to check capabilities, create a VM, destroy it, etc. Five patches total: - Patch 1 is the C API header file from Oracle, cleaned up for libvirt. - Patch 2 is the version specific source file for version dependency. - Patch 3 is the src/Makefile.am change to pick up the two new files. - Patch 4 is the vbox driver support for the new VirtualBox API/version. - Patch 5 is the vbox_tmpl.c template support for the new version. A few things have changed in the VirtualBox API - some small (capitalizations of things in function names like Ip to IP and Dhcp to DHCP) and some much larger (FindMedium is superceded by OpenMedium). The biggest change for the sake of this patch set is the signature of CreateMachine is quite a bit different. Using the Oracle source as a guide, to spin up a VM with a given UUID, it looks like a text flag has to be passed in a new argument to CreateMachine. This flag is built in the VirtualBox 4.2 specific ifdefs and is kind of ugly but works. Additionally, there is now (unused) VM groups support in CreateMachine and the previous 'osTypeId' arg is currently set to nsnull as in the Oracle code. The FindMedium to OpenMedium changes were more straightforward and are pretty clear. The rest of the vbox template changes are basically spelling/capitalization changes from the looks of things. This probably isn't perfect, but it works on git and patched against 0.10.2 for a few quick tests. Not currently on the list, so ping me directly if you need any other info on these, or if anything could use additional work. Thanks! " ryan woodsmall (5): vbox C API header for VirtualBox v4.2 vbox version-specific C file for VirtualBox v4.2 Makefile.am additions for VirtualBox v4.2 vbox driver support for VirtualBox v4.2 vbox template support for VirtualBox v4.2 src/Makefile.am | 3 +- src/vbox/vbox_CAPI_v4_2.h | 8855 +++++++++++++++++++++++++++++++++++++++++++++ src/vbox/vbox_V4_2.c | 13 + src/vbox/vbox_driver.c | 8 + src/vbox/vbox_tmpl.c | 90 +- 5 files changed, 8958 insertions(+), 11 deletions(-) create mode 100644 src/vbox/vbox_CAPI_v4_2.h create mode 100644 src/vbox/vbox_V4_2.c -- 1.7.10.4

2 6

[libvirt] [PATCH v2] iscsi: pass hostnames to iscsiadm instead of resolving them
by Ján Tomko 07 Jun '13

07 Jun '13

iscsiadm now supports specifying hostnames in the portal argument [1] Instead of resolving the hostname to a single IPv4 address, pass the hostname to isciadm, allowing IPv6 targets to work. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=907171 [1] https://bugzilla.redhat.com/show_bug.cgi?id=624437 --- v1: https://www.redhat.com/archives/libvir-list/2013-May/msg01930.html src/storage/storage_backend_iscsi.c | 69 +++++++------------------------------ 1 file changed, 12 insertions(+), 57 deletions(-) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index ad38ab2..0a4cd22 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -24,9 +24,6 @@ #include <config.h> #include <dirent.h> -#include <sys/socket.h> -#include <netdb.h> -#include <sys/types.h> #include <sys/wait.h> #include <string.h> #include <stdio.h> @@ -47,55 +44,12 @@ #define VIR_FROM_THIS VIR_FROM_STORAGE -static int -virStorageBackendISCSITargetIP(const char *hostname, - char *ipaddr, - size_t ipaddrlen) -{ - struct addrinfo hints; - struct addrinfo *result = NULL; - int ret; - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_ADDRCONFIG; - hints.ai_family = AF_INET; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = 0; - - ret = getaddrinfo(hostname, NULL, &hints, &result); - if (ret != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("host lookup failed %s"), - gai_strerror(ret)); - return -1; - } - - if (result == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("no IP address for target %s"), - hostname); - return -1; - } - - if (getnameinfo(result->ai_addr, result->ai_addrlen, - ipaddr, ipaddrlen, NULL, 0, - NI_NUMERICHOST) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot format ip addr for %s"), - hostname); - freeaddrinfo(result); - return -1; - } - - freeaddrinfo(result); - return 0; -} - static char * virStorageBackendISCSIPortal(virStoragePoolSourcePtr source) { - char ipaddr[NI_MAXHOST]; - char *portal; + char *portal = NULL; + const char *host; + int port = 3260; if (source->nhost != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -103,15 +57,16 @@ virStorageBackendISCSIPortal(virStoragePoolSourcePtr source) return NULL; } - if (virStorageBackendISCSITargetIP(source->hosts[0].name, - ipaddr, sizeof(ipaddr)) < 0) - return NULL; + host = source->hosts[0].name; + if (source->hosts[0].port != 0) + port = source->hosts[0].port; - if (virAsprintf(&portal, "%s:%d,1", ipaddr, - source->hosts[0].port ? - source->hosts[0].port : 3260) < 0) { - virReportOOMError(); - return NULL; + if (strchr(host, ':')) { + if (virAsprintf(&portal, "[%s]:%d,1", host, port) < 0) + virReportOOMError(); + } else { + if (virAsprintf(&portal, "%s:%d,1", host, port) < 0) + virReportOOMError(); } return portal; -- 1.8.1.5

2 2

[libvirt] [PATCH v2 1/2] virsocket: Introduce virSocketAddrIsAny
by Michal Privoznik 07 Jun '13

07 Jun '13

This internal API checks, if passed address is ANYCAST address. --- src/libvirt_private.syms | 1 + src/util/virsocketaddr.c | 20 ++++++++++++++++++++ src/util/virsocketaddr.h | 1 + tests/sockettest.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b93629f..1ea7467 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1782,6 +1782,7 @@ virSocketAddrGetPort; virSocketAddrGetRange; virSocketAddrIsNetmask; virSocketAddrIsPrivate; +virSocketAddrIsWildcard; virSocketAddrMask; virSocketAddrMaskByPrefix; virSocketAddrParse; diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 1071b00..e84c58e 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -227,6 +227,26 @@ virSocketAddrIsPrivate(const virSocketAddrPtr addr) } /* + * virSocketAddrIsWildcard: + * @addr: address to check + * + * Check if passed address is a variant of ANYCAST address. + */ +bool +virSocketAddrIsWildcard(const virSocketAddrPtr addr) +{ + in_addr_t tmp = INADDR_ANY; + switch (addr->data.stor.ss_family) { + case AF_INET: + return memcmp(&addr->data.inet4.sin_addr.s_addr, &tmp, + sizeof(addr->data.inet4.sin_addr.s_addr)) == 0; + case AF_INET6: + return IN6_IS_ADDR_UNSPECIFIED(&addr->data.inet6.sin6_addr.s6_addr); + } + return false; +} + +/* * virSocketAddrFormat: * @addr: an initialized virSocketAddrPtr * diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index 1c9e54a..b28fe6c 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -123,4 +123,5 @@ bool virSocketAddrEqual(const virSocketAddrPtr s1, const virSocketAddrPtr s2); bool virSocketAddrIsPrivate(const virSocketAddrPtr addr); +bool virSocketAddrIsWildcard(const virSocketAddrPtr addr); #endif /* __VIR_SOCKETADDR_H__ */ diff --git a/tests/sockettest.c b/tests/sockettest.c index 5b36a6c..092de88 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -157,6 +157,28 @@ static int testNetmaskHelper(const void *opaque) return testNetmask(data->addr1, data->addr2, data->netmask, data->pass); } +static int testWildcard(const char *addrstr, + bool pass) +{ + virSocketAddr addr; + + if (virSocketAddrParse(&addr, addrstr, AF_UNSPEC) < 0) + return -1; + + if (virSocketAddrIsWildcard(&addr)) + return pass ? 0 : -1; + return pass ? -1 : 0; +} + +struct testWildcardData { + const char *addr; + bool pass; +}; +static int testWildcardHelper(const void *opaque) +{ + const struct testWildcardData *data = opaque; + return testWildcard(data->addr, data->pass); +} static int mymain(void) @@ -223,6 +245,14 @@ mymain(void) ret = -1; \ } while (0) +#define DO_TEST_WILDCARD(addr, pass) \ + do { \ + struct testWildcardData data = { addr, pass}; \ + if (virtTestRun("Test wildcard " addr, 1, \ + testWildcardHelper, &data) < 0) \ + ret = -1; \ + } while (0) + DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_UNSPEC, true); DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_INET, true); @@ -276,6 +306,14 @@ mymain(void) DO_TEST_NETMASK("2000::1:1", "9000::1:1", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", false); + DO_TEST_WILDCARD("0.0.0.0", true); + DO_TEST_WILDCARD("::", true); + DO_TEST_WILDCARD("0", true); + DO_TEST_WILDCARD("0.0", true); + DO_TEST_WILDCARD("0.0.0", true); + DO_TEST_WILDCARD("1", false); + DO_TEST_WILDCARD("0.1", false); + return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.2.1

3 5

[libvirt] [PATCH 0/3 v3] Cgroup fixes
by Osier Yang 07 Jun '13

07 Jun '13

Instead of only post v2 of 5/7 (v2) in the old mail thread, this resend the left patches of v2 with a independant thread for easy reviewing. v2 - v3: * 1/7 ~ 4/7 of v1 are pushed. * goto label "cleanup" is kept with Daniel's suggestion for 5/7 (v1) * Commit log of 6/7 (v1) are updated a bit to reflect more clear about the cause v1 - v2: * Just resending v2: https://www.redhat.com/archives/libvir-list/2013-May/msg01314.html Osier Yang (3): qemu: Abstract code for the cpu controller setting into a helper qemu: Set cpuset.cpus for domain process qemu: Prohibit getting the numa parameters if mode is not strict src/qemu/qemu_cgroup.c | 94 ++++++++++++++++++++++++++++++++++++-------------- src/qemu/qemu_driver.c | 11 ++++-- 2 files changed, 78 insertions(+), 27 deletions(-) -- 1.8.1.4

2 8

[libvirt] libxl: calculating free pages in libvirt
by Dario Faggioli 07 Jun '13

07 Jun '13

Hi Jim, As I told you in Dublin, I'm looking into libvirt a bit, with the main purpose of implementing the NUMA interface for the libxl driver. While at it I noticed that libxlNodeGetFreeMemory() uses the value contained in phy_info.free_pages to check how many pages of free memory we have. However, starting from (Xen's git) commit bec8f17e, the number of free pages should be computed like this: (phy_info.free_pages - phy_info.outstanding_pages) to take the memory claiming mechanism introduced by Oracle properly into account. You can see an example of that, for instance, looking at the output_physinfo() function in tools/libxl/xl_cmdimpl.c (in the Xen codebase, of course :-) ). Said commit is from last May, and the claim mechanism altogether --which includes adding the outstanding_pages field to the libxl_physinfo struct in libxl-- was introduced during the 4.3 development cycle. So, forgive the possibly dumb question, but what's the preferred way to fix this in libvirt, without breaking build with old libxl versions? (Provided this is something libvirt cares about, does it?) For other features added within this last dev cycle, libxl has a `#define LIBXL_HAVE_<foo>' (e.g., LIBXL_HAVE_DOMAIN_NODEAFFINITY), but I don't see one for this particular field... Konrad, Ian, am I missing it? If no, should we add it? Thanks and Regards, Dario -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

5 5

[libvirt] [PATCH v3 0/2] BSD implementation of virNetDevTapCreate() and virNetDevTapDelete()
by Roman Bogorodskiy 06 Jun '13

06 Jun '13

Changes from v2: * changed error message in virNetDevSetupControl() as per Dan's suggestion * avoid compile time signature change for virNetDevSetupControl() * fixed memleak in virNetDevTapCreate() Roman Bogorodskiy (2): Make virNetDevSetupControl() public. BSD: implement virNetDevTapCreate() and virNetDevTapDelete() src/libvirt_private.syms | 1 + src/util/virnetdev.c | 15 +++++- src/util/virnetdev.h | 15 +++++- src/util/virnetdevtap.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 144 insertions(+), 5 deletions(-) -- 1.8.0

1 3

[libvirt] [PATCH v2 0/2] BSD implementation of virNetDevTapCreate() and virNetDevTapDelete()
by Roman Bogorodskiy 06 Jun '13

06 Jun '13

Changes from the previous version: * virNetDevSetupControl patch: remove pointless <config.h> include from virnetdev.h * virnetdevtap.c patch: rebase to include new tapfdSize param for virNetDevTapCreate() Roman Bogorodskiy (2): Make virNetDevSetupControl() public. BSD: implement virNetDevTapCreate() and virNetDevTapDelete() src/libvirt_private.syms | 1 + src/util/virnetdev.c | 15 ++++- src/util/virnetdev.h | 11 ++++ src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevtap.c | 116 ++++++++++++++++++++++++++++++++++++++- src/util/virnetdevvportprofile.c | 2 +- 6 files changed, 141 insertions(+), 6 deletions(-) -- 1.8.0

2 5

[libvirt] [PATCH] build: only install examples when nwfilter is defined
by Jim Fehlig 06 Jun '13

06 Jun '13

Only install nwfilter example XML files when WITH_NWFILTER is defined. --- examples/xml/nwfilter/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am index 6264428..0344ce9 100644 --- a/examples/xml/nwfilter/Makefile.am +++ b/examples/xml/nwfilter/Makefile.am @@ -39,6 +39,7 @@ confdir = $(sysconfdir)/libvirt NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter" +if WITH_NWFILTER install-data-local: $(MKDIR_P) "$(NWFILTER_DIR)" for f in $(FILTERS); do \ @@ -50,3 +51,7 @@ uninstall-local:: rm -f "$(NWFILTER_DIR)/$$f"; \ done -test -z $(shell ls $(NWFILTER_DIR)) || rmdir $(NWFILTER_DIR) +else +install-data-local: +uninstall-local:: +endif -- 1.8.0.1

3 6

[libvirt] [PATCH v3 0/2] Add new HyperV features
by Ján Tomko 06 Jun '13

06 Jun '13

v1: https://www.redhat.com/archives/libvir-list/2013-May/msg00173.html v2: https://www.redhat.com/archives/libvir-list/2013-May/msg00184.html uses virStringSplit instead of strsep added a missing break to virDomainDefParseXML v3: rebased to use VIR_STRDUP fixed a crash on parsing '-cpu qemu32,hv_' Ján Tomko (2): qemu: simplify CPU command line parsing qemu: add hv_vapic and hv_spinlocks support docs/formatdomain.html.in | 17 ++- docs/schemas/domaincommon.rng | 12 ++ src/conf/domain_conf.c | 40 +++++- src/conf/domain_conf.h | 3 + src/qemu/qemu_command.c | 161 ++++++++++++++---------- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 + 7 files changed, 170 insertions(+), 67 deletions(-) -- 1.8.1.5

2 6

[libvirt] [PATCH 0/4] Assorted bool cleanups
by Ján Tomko 06 Jun '13

06 Jun '13

Found by: git grep '= 1' Ján Tomko (4): Replace two-state local integers with bool Remove redundant two-state integers nwfilter: change two-state int parameters to bool qemu: change two-state int parameters to bool src/conf/domain_conf.c | 18 +++++----- src/conf/network_conf.c | 5 ++- src/conf/nwfilter_conf.c | 56 +++++++++++++++---------------- src/conf/storage_conf.c | 5 ++- src/lxc/lxc_controller.c | 4 +-- src/lxc/lxc_process.c | 4 +-- src/nwfilter/nwfilter_dhcpsnoop.c | 8 +---- src/nwfilter/nwfilter_ebiptables_driver.c | 36 ++++++++++---------- src/nwfilter/nwfilter_gentech_driver.c | 4 +-- src/qemu/qemu_agent.c | 6 ++-- src/qemu/qemu_capabilities.c | 21 ++++++------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 39 ++++++++++----------- src/qemu/qemu_driver.c | 6 ++-- src/qemu/qemu_hostdev.c | 6 ++-- src/qemu/qemu_migration.c | 20 +++++------ src/qemu/qemu_monitor.c | 6 ++-- src/qemu/qemu_monitor_json.c | 8 ++--- src/qemu/qemu_monitor_text.c | 16 ++++----- src/qemu/qemu_process.c | 23 +++++-------- src/remote/remote_driver.c | 5 ++- src/rpc/virnetserver.c | 6 ++-- src/storage/storage_backend.c | 4 +-- src/util/vircgroup.c | 4 +-- src/util/virlog.c | 15 +++++---- src/util/virnetdev.c | 19 +++++------ src/util/virpci.c | 12 +++---- src/util/viruri.c | 5 +-- src/util/virutil.c | 12 +++---- tests/qemuhelptest.c | 5 +-- tests/reconnect.c | 6 ++-- tests/ssh.c | 8 ++--- 32 files changed, 192 insertions(+), 202 deletions(-) -- 1.8.1.5

2 6

[libvirt] [PATCH 1/2] virsocket: Introduce virSocketAddrIsAny
by Michal Privoznik 06 Jun '13

06 Jun '13

This internal API checks, if passed address is ANYCAST address. --- src/libvirt_private.syms | 1 + src/util/virsocketaddr.c | 22 ++++++++++++++++++++++ src/util/virsocketaddr.h | 1 + tests/sockettest.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b93629f..0b2ce42 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1780,6 +1780,7 @@ virSocketAddrFormatFull; virSocketAddrGetIpPrefix; virSocketAddrGetPort; virSocketAddrGetRange; +virSocketAddrIsAny; virSocketAddrIsNetmask; virSocketAddrIsPrivate; virSocketAddrMask; diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 1071b00..4bfc86d 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -227,6 +227,28 @@ virSocketAddrIsPrivate(const virSocketAddrPtr addr) } /* + * virSocketAddrIsAny: + * @addr: address to check + * + * Check if passed address is a variant of ANYCAST address. + */ +bool +virSocketAddrIsAny(const virSocketAddrPtr addr) +{ + unsigned long tmp; + switch (addr->data.stor.ss_family) { + case AF_INET: + tmp = INADDR_ANY; + return memcmp(&addr->data.inet4.sin_addr.s_addr, &tmp, + sizeof(addr->data.inet4.sin_addr.s_addr)) == 0; + case AF_INET6: + return memcmp(addr->data.inet6.sin6_addr.s6_addr, &in6addr_any, + sizeof(addr->data.inet6.sin6_addr.s6_addr)) == 0; + } + return false; +} + +/* * virSocketAddrFormat: * @addr: an initialized virSocketAddrPtr * diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index 1c9e54a..d4d7ccf 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -123,4 +123,5 @@ bool virSocketAddrEqual(const virSocketAddrPtr s1, const virSocketAddrPtr s2); bool virSocketAddrIsPrivate(const virSocketAddrPtr addr); +bool virSocketAddrIsAny(const virSocketAddrPtr addr); #endif /* __VIR_SOCKETADDR_H__ */ diff --git a/tests/sockettest.c b/tests/sockettest.c index 5b36a6c..e4a998b 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -157,6 +157,28 @@ static int testNetmaskHelper(const void *opaque) return testNetmask(data->addr1, data->addr2, data->netmask, data->pass); } +static int testAnycast(const char *addrstr, + bool pass) +{ + virSocketAddr addr; + + if (virSocketAddrParse(&addr, addrstr, AF_UNSPEC) < 0) + return -1; + + if (virSocketAddrIsAny(&addr)) + return pass ? 0 : -1; + return pass ? -1 : 0; +} + +struct testAnycastData { + const char *addr; + bool pass; +}; +static int testAnycastHelper(const void *opaque) +{ + const struct testAnycastData *data = opaque; + return testAnycast(data->addr, data->pass); +} static int mymain(void) @@ -223,6 +245,14 @@ mymain(void) ret = -1; \ } while (0) +#define DO_TEST_ANYCAST(addr, pass) \ + do { \ + struct testAnycastData data = { addr, pass}; \ + if (virtTestRun("Test anycast " addr, 1, \ + testAnycastHelper, &data) < 0) \ + ret = -1; \ + } while (0) + DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_UNSPEC, true); DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_INET, true); @@ -276,6 +306,14 @@ mymain(void) DO_TEST_NETMASK("2000::1:1", "9000::1:1", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", false); + DO_TEST_ANYCAST("0.0.0.0", true); + DO_TEST_ANYCAST("::", true); + DO_TEST_ANYCAST("0", true); + DO_TEST_ANYCAST("0.0", true); + DO_TEST_ANYCAST("0.0.0", true); + DO_TEST_ANYCAST("1", false); + DO_TEST_ANYCAST("0.1", false); + return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.2.1

3 4

[libvirt] [PATCH] tool/virsh-domain.c: Fix the display of Affinity in function cmdVcpuinfo.
by yangdongsheng 06 Jun '13

06 Jun '13

(1).Introduce a symbol 'x' to mean the physical cpu on host is offline. (2).And the symbol '-' means the physical cpu on host is online but the affinity of domain for this cpu is not set. There was no diffrence in display between the two kinds of cpu state before this patch, both are '-'. Signed-off-by: yangdongsheng <yangds.fnst(a)cn.fujitsu.com> --- I have removed the vshNodeGetCPUMap patch from this patchset. So this patch will only fix the display of virsh vcpuinfo, please give me your comment. Thanx~ tools/virsh-domain.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0402aef..6e13076 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5271,6 +5271,7 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; virVcpuInfoPtr cpuinfo; unsigned char *cpumaps; + unsigned char *hostcpumap; int ncpus, maxcpu; size_t cpumaplen; bool ret = true; @@ -5284,6 +5285,11 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) return false; } + if ((virNodeGetCPUMap(ctl->conn, &hostcpumap, NULL, 0)) < 0) { + virDomainFree(dom); + return false; + } + if (virDomainGetInfo(dom, &info) != 0) { virDomainFree(dom); return false; @@ -5310,7 +5316,13 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) } vshPrint(ctl, "%-15s ", _("CPU Affinity:")); for (m = 0; m < maxcpu; m++) { - vshPrint(ctl, "%c", VIR_CPU_USABLE(cpumaps, cpumaplen, n, m) ? 'y' : '-'); + if VIR_CPU_USED(hostcpumap, m) { + vshPrint(ctl, "%c", VIR_CPU_USABLE(cpumaps, + cpumaplen, n, m) ? 'y' : '-'); + } + else { + vshPrint(ctl, "%c", 'x'); + } } vshPrint(ctl, "\n"); if (n < (ncpus - 1)) { @@ -5332,8 +5344,13 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%-15s %s\n", _("CPU time"), _("N/A")); vshPrint(ctl, "%-15s ", _("CPU Affinity:")); for (m = 0; m < maxcpu; m++) { - vshPrint(ctl, "%c", - VIR_CPU_USABLE(cpumaps, cpumaplen, n, m) ? 'y' : '-'); + if VIR_CPU_USED(hostcpumap, m) { + vshPrint(ctl, "%c", VIR_CPU_USABLE(cpumaps, + cpumaplen, n, m) ? 'y' : '-'); + } + else { + vshPrint(ctl, "%c", 'x'); + } } vshPrint(ctl, "\n"); if (n < (ncpus - 1)) { @@ -5346,6 +5363,7 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(cpumaps); + VIR_FREE(hostcpumap); VIR_FREE(cpuinfo); virDomainFree(dom); return ret; -- 1.7.10.1

2 1

[libvirt] [PATCH] storage: Refresh pool after creating volume
by Osier Yang 06 Jun '13

06 Jun '13

https://bugzilla.redhat.com/show_bug.cgi?id=965442 One has to refresh the pool to get the correct pool info, this patch refreshes the pool after creating a volume in code instead. Pool refreshing failure is fine to ignore with a warning. --- src/storage/storage_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index a2b0c21..2a55095 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1443,6 +1443,9 @@ storageVolCreateXML(virStoragePoolPtr obj, } + if (backend->refreshPool && backend->refreshPool(obj->conn, pool) < 0) + VIR_WARN("Failed to refresh pool after creating volume"); + VIR_INFO("Creating volume '%s' in storage pool '%s'", volobj->name, pool->def->name); ret = volobj; @@ -1606,6 +1609,9 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } + if (backend->refreshPool && backend->refreshPool(obj->conn, pool) < 0) + VIR_WARN("Failed to refresh pool after creating volume"); + VIR_INFO("Creating volume '%s' in storage pool '%s'", volobj->name, pool->def->name); ret = volobj; -- 1.8.1.4

4 9

[libvirt] [PATCHv2] storage: Avoid unnecessary ternary operators and refactor the code
by Peter Krempa 06 Jun '13

06 Jun '13

Setting of local variables in virStorageBackendCreateQemuImgCmd was unnecessarily cluttered with ternary operators and repeated testing of of conditions. This patch refactors the function to use if statements and improves error reporting in case inputvol is specified but does not contain target path. Previously we would complain about "unknown storage vol type 0" instead of the actual problem. --- Notes: Version 2: - retured preallocation check that was removed by mistake - returned backing store check to the correct condition - improve error reporting src/storage/storage_backend.c | 69 ++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 5a61381..4d90d52 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -663,53 +663,58 @@ virStorageBackendCreateQemuImgCmd(virConnectPtr conn, virCommandPtr cmd = NULL; bool do_encryption = (vol->target.encryption != NULL); unsigned long long int size_arg; - bool preallocate = false; - - /* Treat output block devices as 'raw' format */ - const char *type = - virStorageFileFormatTypeToString(vol->type == VIR_STORAGE_VOL_BLOCK ? - VIR_STORAGE_FILE_RAW : - vol->target.format); - - const char *backingType = vol->backingStore.path ? - virStorageFileFormatTypeToString(vol->backingStore.format) : NULL; - - const char *inputBackingPath = (inputvol ? inputvol->backingStore.path - : NULL); - const char *inputPath = inputvol ? inputvol->target.path : NULL; - /* Treat input block devices as 'raw' format */ - const char *inputType = inputPath ? - virStorageFileFormatTypeToString(inputvol->type == VIR_STORAGE_VOL_BLOCK ? - VIR_STORAGE_FILE_RAW : - inputvol->target.format) : - NULL; + bool preallocate = !!(flags & VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA); + const char *type; + const char *backingType = NULL; + const char *inputPath = NULL; + const char *inputType = NULL; virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL); - preallocate = !!(flags & VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA); + /* Treat output block devices as 'raw' format */ + type = virStorageFileFormatTypeToString(vol->type == VIR_STORAGE_VOL_BLOCK ? + VIR_STORAGE_FILE_RAW : + vol->target.format); - if (type == NULL) { + if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unknown storage vol type %d"), vol->target.format); return NULL; } - if (inputvol && inputType == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown storage vol type %d"), - inputvol->target.format); - return NULL; - } + if (preallocate && vol->target.format != VIR_STORAGE_FILE_QCOW2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("metadata preallocation only available with qcow2")); return NULL; } + if (inputvol) { + if (!(inputPath = inputvol->target.path)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("missing target volume path")); + return NULL; + } + + inputType = virStorageFileFormatTypeToString(inputvol->type == VIR_STORAGE_VOL_BLOCK ? + VIR_STORAGE_FILE_RAW : + inputvol->target.format); + + if (!inputType) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown storage vol type %d"), + inputvol->target.format); + return NULL; + } + + } + if (vol->backingStore.path) { int accessRetCode = -1; char *absolutePath = NULL; + backingType = virStorageFileFormatTypeToString(vol->backingStore.format); + if (preallocate) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("metadata preallocation conflicts with backing" @@ -722,11 +727,9 @@ virStorageBackendCreateQemuImgCmd(virConnectPtr conn, * may cause issues with lvm. Untested essentially. */ if (inputvol && - (!inputBackingPath || - STRNEQ(inputBackingPath, vol->backingStore.path))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("a different backing store cannot " - "be specified.")); + STRNEQ_NULLABLE(inputvol->backingStore.path, vol->backingStore.path)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("a different backing store cannot be specified.")); return NULL; } -- 1.8.2.1

2 2

[libvirt] [PATCH] iscsi: support IPv6 targets
by Ján Tomko 06 Jun '13

06 Jun '13

Instead of resolving the host as IPv4 and only using the first result, resolve it as IPv6 as well and use the first address we've succesfully connected to as the portal name. --- src/libvirt_private.syms | 1 + src/storage/storage_backend_iscsi.c | 64 +++++---------------------- src/util/virutil.c | 87 +++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 4 ++ 4 files changed, 102 insertions(+), 54 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9d5f74b..26c4553 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1931,6 +1931,7 @@ virEnumFromString; virEnumToString; virFindFCHostCapableVport; virFormatIntDecimal; +virGetConnectableIPAsString; virGetDeviceID; virGetDeviceUnprivSGIO; virGetFCHostNameByWWN; diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index ad38ab2..f98fbce 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -1,7 +1,7 @@ /* * storage_backend_iscsi.c: storage backend for iSCSI handling * - * Copyright (C) 2007-2008, 2010-2012 Red Hat, Inc. + * Copyright (C) 2007-2008, 2010-2013 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -44,58 +44,16 @@ #include "vircommand.h" #include "virrandom.h" #include "virstring.h" +#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_STORAGE -static int -virStorageBackendISCSITargetIP(const char *hostname, - char *ipaddr, - size_t ipaddrlen) -{ - struct addrinfo hints; - struct addrinfo *result = NULL; - int ret; - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_ADDRCONFIG; - hints.ai_family = AF_INET; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = 0; - - ret = getaddrinfo(hostname, NULL, &hints, &result); - if (ret != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("host lookup failed %s"), - gai_strerror(ret)); - return -1; - } - - if (result == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("no IP address for target %s"), - hostname); - return -1; - } - - if (getnameinfo(result->ai_addr, result->ai_addrlen, - ipaddr, ipaddrlen, NULL, 0, - NI_NUMERICHOST) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot format ip addr for %s"), - hostname); - freeaddrinfo(result); - return -1; - } - - freeaddrinfo(result); - return 0; -} - static char * virStorageBackendISCSIPortal(virStoragePoolSourcePtr source) { - char ipaddr[NI_MAXHOST]; - char *portal; + char *ip; + char *portal = NULL; + int port; if (source->nhost != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -103,17 +61,15 @@ virStorageBackendISCSIPortal(virStoragePoolSourcePtr source) return NULL; } - if (virStorageBackendISCSITargetIP(source->hosts[0].name, - ipaddr, sizeof(ipaddr)) < 0) + port = source->hosts[0].port ? source->hosts[0].port : 3260; + + if (!(ip = virGetConnectableIPAsString(source->hosts[0].name, port))) return NULL; - if (virAsprintf(&portal, "%s:%d,1", ipaddr, - source->hosts[0].port ? - source->hosts[0].port : 3260) < 0) { + if (virAsprintf(&portal, "%s,1", ip) < 0) virReportOOMError(); - return NULL; - } + VIR_FREE(ip); return portal; } diff --git a/src/util/virutil.c b/src/util/virutil.c index 028f1d1..d8400db 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -650,6 +650,93 @@ cleanup: return result; } +/* + * Resolve 'host' and return the first address we've connected to + * as a string: + * address:port + * for IPv4 addresses and + * [address]:port + * for IPv6 addresses. + */ +char * +virGetConnectableIPAsString(const char *host, + int port) +{ + struct addrinfo hints; + struct addrinfo *res, *rp; + int saved_errno = EINVAL; + char *ret = NULL; + char *buf = NULL; + char *portstr = NULL; + int rc; + + if (VIR_ALLOC_N(buf, NI_MAXHOST) < 0) + goto no_memory; + + if (virAsprintf(&portstr, "%d", port) < 0) + goto no_memory; + + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_ADDRCONFIG; + + if ((rc = getaddrinfo(host, portstr, &hints, &res))) { + virReportError(VIR_ERR_UNKNOWN_HOST, + _("unable to resolve '%s': %s"), + host, gai_strerror(rc)); + goto cleanup; + } + + for (rp = res; rp; rp = rp->ai_next) { + int sockfd; + + sockfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); + if (sockfd == -1) { + saved_errno = errno; + continue; + } + if (connect(sockfd, rp->ai_addr, rp->ai_addrlen) != -1) { + VIR_FORCE_CLOSE(sockfd); + break; + } + saved_errno = errno; + VIR_FORCE_CLOSE(sockfd); + } + + if (!rp) { + virReportSystemError(saved_errno, + _("unable to connect to '%s:%s'"), + host, portstr); + goto cleanup; + } + + if ((rc = getnameinfo(rp->ai_addr, rp->ai_addrlen, buf, NI_MAXHOST, + NULL, 0, NI_NUMERICHOST)) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Cannot convert IP address to string: %s"), + gai_strerror(rc)); + goto cleanup; + } + + if (rp->ai_family == AF_INET6) { + if (virAsprintf(&ret, "[%s]:%d", buf, port) < 0) + goto no_memory; + } else if (virAsprintf(&ret, "%s:%d", buf, port) < 0) { + goto no_memory; + } + +cleanup: + if (res) + freeaddrinfo(res); + VIR_FREE(buf); + VIR_FREE(portstr); + return ret; + +no_memory: + virReportOOMError(); + goto cleanup; +} + #ifdef HAVE_GETPWUID_R enum { VIR_USER_ENT_DIRECTORY, diff --git a/src/util/virutil.h b/src/util/virutil.h index 280a18d..93f4007 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -27,8 +27,10 @@ # include "verify.h" # include "internal.h" +# include <netdb.h> # include <unistd.h> # include <sys/select.h> +# include <sys/socket.h> # include <sys/types.h> # ifndef MIN @@ -108,6 +110,8 @@ static inline int getgid (void) { return 0; } # endif char *virGetHostname(void); +char *virGetConnectableIPAsString(const char *host, + int port); char *virGetUserDirectory(void); char *virGetUserConfigDirectory(void); -- 1.8.1.5

2 1

[libvirt] [PATCH] Fix code coverage issue in OpenVZ driver
by Alvaro Polo 06 Jun '13

06 Jun '13

After fixing an invalid usage of virDomainNetDef in OpenVZ driver, a coverage issue appeared. This was caused by a still invalid usage of net->data.ethernet.dev for non ethernet networking. --- src/openvz/openvz_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index db738a4..d8abe9c 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -859,7 +859,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, /* if user doesn't specified host interface name, * than we need to generate it */ if (net->ifname == NULL) { - net->ifname = openvzGenerateVethName(veid, net->data.ethernet.dev); + net->ifname = openvzGenerateVethName(veid, guest_ifname); if (net->ifname == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not generate veth name")); -- 1.7.12.4 (Apple Git-37)

2 1

[libvirt] [PATCH] LXC: fix order in virProcessGetNamespaces
by Richard Weinberger 06 Jun '13

06 Jun '13

virProcessGetNamespaces() opens files in /proc/XXX/ns/ which will later be passed to setns(). We have to make sure that the file descriptors in the array are in the correct order. Otherwise setns() may fail. The order has been taken from util-linux's sys-utils/nsenter.c Signed-off-by: Richard Weinberger <richard(a)nod.at> --- src/util/virprocess.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index bc028d7..fce0d46 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -513,11 +513,11 @@ int virProcessGetNamespaces(pid_t pid, int **fdlist) { int ret = -1; - DIR *dh = NULL; struct dirent *de; char *nsdir = NULL; char *nsfile = NULL; - size_t i; + char *ns_files[] = { "user", "ipc", "uts", "net", "pid", "mnt", NULL }; + size_t i = 0; *nfdlist = 0; *fdlist = NULL; @@ -528,45 +528,32 @@ int virProcessGetNamespaces(pid_t pid, goto cleanup; } - if (!(dh = opendir(nsdir))) { - virReportSystemError(errno, - _("Cannot read directory %s"), - nsdir); - goto cleanup; - } - - while ((de = readdir(dh))) { + while (ns_files[i]) { int fd; - if (de->d_name[0] == '.') - continue; - - if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) { + if (virAsprintf(&nsfile, "%s/%s", nsdir, ns_files[i]) < 0) { virReportOOMError(); goto cleanup; } - if (virAsprintf(&nsfile, "%s/%s", nsdir, de->d_name) < 0) { - virReportOOMError(); - goto cleanup; + if ((fd = open(nsfile, O_RDWR)) < 0) { + goto next; } - if ((fd = open(nsfile, O_RDWR)) < 0) { - virReportSystemError(errno, - _("Unable to open %s"), - nsfile); + if (VIR_EXPAND_N(*fdlist, *nfdlist, 1) < 0) { + virReportOOMError(); goto cleanup; } (*fdlist)[(*nfdlist)-1] = fd; +next: VIR_FREE(nsfile); + i++; } ret = 0; cleanup: - if (dh) - closedir(dh); VIR_FREE(nsdir); VIR_FREE(nsfile); if (ret < 0) { -- 1.8.3

2 4

[libvirt] [PATCH v2] qemu: Report the offset from host UTC for RTC_CHANGE event
by Osier Yang 06 Jun '13

06 Jun '13

https://bugzilla.redhat.com/show_bug.cgi?id=964177 Though both libvirt and QEMU's document say RTC_CHANGE returns the offset from the host UTC, qemu actually returns the offset from the specified date instead when specific date is provided (-rtc base=$date). It's not safe for qemu to fix it in code, it worked like that for 3 years, changing it now may break other QEMU use cases. What qemu tries to do is to fix the document: http://lists.gnu.org/archive/html/qemu-devel/2013-05/msg04782.html And in libvirt side, instead of reply on the qemu, this convert the offset returned from qemu to the offset from host UTC, by: /* * a: the offset from qemu RTC_CHANGE event * b: The specified date (-rtc base=$date) * c: the host date when libvirt gets the RTC_CHANGE event * offset: What libvirt will report */ offset = a + (b - c); The specified date (-rtc base=$date) is recorded in clock's def as an internal only member (may be useful to exposed outside?). Internal only XML tag "starttime" is introduced to not lose the domain process's starttime after libvirt restarting/reloading: <clock offset='variable' adjustment='304' basis='utc' starttime='1370423588'/> --- src/conf/domain_conf.c | 27 +++++++++++++++++++++++---- src/conf/domain_conf.h | 3 +++ src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_process.c | 13 +++++++++++++ 4 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a16ebd1..7773abf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -96,6 +96,7 @@ typedef enum { VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES = (1<<18), VIR_DOMAIN_XML_INTERNAL_ALLOW_ROM = (1<<19), VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT = (1<<20), + VIR_DOMAIN_XML_INTERNAL_STARTTIME = (1 << 21) } virDomainXMLInternalFlags; VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, @@ -11193,6 +11194,16 @@ virDomainDefParseXML(xmlDocPtr xml, break; } + if (def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE && + flags & VIR_DOMAIN_XML_INTERNAL_STARTTIME) { + if (virXPathULongLong("number(./clock/@starttime)", ctxt, + &def->clock.data.variable.starttime) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid starttime")); + goto error; + } + } + if ((n = virXPathNodeSet("./clock/timer", ctxt, &nodes)) < 0) goto error; @@ -15788,7 +15799,8 @@ virDomainResourceDefFormat(virBufferPtr buf, verify(((VIR_DOMAIN_XML_INTERNAL_STATUS | VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | - VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES) + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES | + VIR_DOMAIN_XML_INTERNAL_STARTTIME) & DUMPXML_FLAGS) == 0); /* This internal version can accept VIR_DOMAIN_XML_INTERNAL_*, @@ -15810,7 +15822,8 @@ virDomainDefFormatInternal(virDomainDefPtr def, virCheckFlags(DUMPXML_FLAGS | VIR_DOMAIN_XML_INTERNAL_STATUS | VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | - VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES, + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES | + VIR_DOMAIN_XML_INTERNAL_STARTTIME, -1); if (!(type = virDomainVirtTypeToString(def->virtType))) { @@ -16208,6 +16221,10 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAsprintf(buf, " adjustment='%lld' basis='%s'", def->clock.data.variable.adjustment, virDomainClockBasisTypeToString(def->clock.data.variable.basis)); + + if (flags & VIR_DOMAIN_XML_INTERNAL_STARTTIME) + virBufferAsprintf(buf, " starttime='%llu'", + def->clock.data.variable.starttime); break; case VIR_DOMAIN_CLOCK_OFFSET_TIMEZONE: virBufferEscapeString(buf, " timezone='%s'", def->clock.data.timezone); @@ -16586,7 +16603,8 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, unsigned int flags = (VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_INTERNAL_STATUS | VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | - VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES); + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES | + VIR_DOMAIN_XML_INTERNAL_STARTTIME); int ret = -1; char *xml; @@ -16674,7 +16692,8 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms, if (!(obj = virDomainObjParseFile(statusFile, caps, xmlopt, expectedVirtTypes, VIR_DOMAIN_XML_INTERNAL_STATUS | VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | - VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES))) + VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES | + VIR_DOMAIN_XML_INTERNAL_STARTTIME))) goto error; virUUIDFormat(obj->def->uuid, uuidstr); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3a71d6c..cca92b4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1767,6 +1767,9 @@ struct _virDomainClockDef { struct { long long adjustment; int basis; + + /* Store the start time of guest process, internal only */ + unsigned long long starttime; } variable; /* Timezone name, when diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c4a162a..9254525 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5518,6 +5518,9 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) now += def->data.variable.adjustment; gmtime_r(&now, &nowbits); + /* Store the starttime of qemu process */ + def->data.variable.starttime = now; + virBufferAsprintf(&buf, "base=%d-%02d-%02dT%02d:%02d:%02d", nowbits.tm_year + 1900, nowbits.tm_mon + 1, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d4fd4fb..39c62b3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -796,6 +796,19 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virObjectLock(vm); + + /* QEMU's RTC_CHANGE event returns the offset from the specified + * date instead of the host UTC if a specific date is provided + * (-rtc base=$date). We need to convert it to be offset from + * host UTC. + */ + if (vm->def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) { + time_t now = time(NULL); + + offset += vm->def->clock.data.variable.starttime - + (unsigned long long)now; + } + event = virDomainEventRTCChangeNewFromObj(vm, offset); if (vm->def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) -- 1.8.1.4

2 2

[libvirt] [PATCH] build: fix build without posix_fallocate
by Eric Blake 06 Jun '13

06 Jun '13

Such as on FreeBSD. Broken in commit aa2a4cff7 * src/util/virstoragefile.c (virStorageFileResize): Add missing ';'. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index bf668c8..b861fd8 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1074,7 +1074,7 @@ virStorageFileResize(const char *path, } #else virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("preallocate is not supported on this platform")) + _("preallocate is not supported on this platform")); goto cleanup; #endif } else { -- 1.8.1.4

1 1

[libvirt] [PATCH v4 0/5] libvirt supports Guest Panicked
by Chen Fan 06 Jun '13

06 Jun '13

Changes: v3-v4: 1. Supports the dumpcore options of the oncrash element in the XML. 2. Move the previous code to processWatchdogEvent(). v2-v3: 1. split into 3 patches v1-v2: 1. fix the incorrect domain state: paused -> crashed, when crash the guest while libvirt isn't running, then restart libvirtd. Chen Fan (5): libvirt: Define domain crash event types qemu: Supports guest panicked virsh: supports guest panicked libvirt: Define crash dumpcore events in watchdogAction. qemu: Implement the oncrash events in processWatchdogEvent. examples/domain-events/events-c/event-test.c | 10 ++ include/libvirt/libvirt.h.in | 16 +++ src/conf/domain_conf.c | 16 ++- src/conf/domain_conf.h | 4 + src/qemu/qemu_driver.c | 197 +++++++++++++++++++++------ src/qemu/qemu_monitor.c | 14 +- src/qemu/qemu_monitor.h | 5 + src/qemu/qemu_monitor_json.c | 7 + src/qemu/qemu_process.c | 127 ++++++++++++++--- src/qemu/qemu_process.h | 2 + tools/virsh-domain-monitor.c | 8 ++ 11 files changed, 338 insertions(+), 68 deletions(-) -- 1.8.1.4

5 13

[libvirt] Serial port creation issue
by arvind viswanathan 05 Jun '13

05 Jun '13

Hi, I have a serial port defined in vm config file. However after I create the vm using virsh, I notice that the serial ports I have specified translate to -chardev when kvm-quemu is called. I am having trouble accessing the vm if it is configured as a chardev with isserial option. If i can directly call the qemu with -serial, I can access the vm, thanks arvind

1 0

[libvirt] [PATCH] qemu: Reformat listen address prior checking
by Michal Privoznik 05 Jun '13

05 Jun '13

Currently, a listen address for a SPICE server can be specified. Later, when the domain is migrated, we need to relocate the graphics which involves telling new destination to the SPICE server. However, we can't just assume the listen address is the new location, because the listen address can be ANYCAST (0.0.0.0 for IPv4, :: for IPv6). In which case, we want to pass the remote hostname. But there are some troubles with ANYCAST. In both IPv4 and IPv6 it has many ways for specifying such address. For instance, in IPv4: 0, 0.0, 0.0.0, 0.0.0.0. The number of variations gets bigger in IPv6 world. Hence, in order to check for ANYCAST address sanely, we should take the provided listen address, parse it and format back in it's full form. Which is exactly what this patch does. --- src/qemu/qemu_migration.c | 18 +++++++++++++++++- tests/sockettest.c | 24 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7aa0476..3ca3f32 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1735,42 +1735,58 @@ static int qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuMigrationCookiePtr cookie) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; char *listenAddress; + virSocketAddr addr; + bool reformatted = false; if (!cookie) return 0; if (!cookie->graphics) return 0; /* QEMU doesn't support VNC relocation yet, so * skip it to avoid generating an error */ if (cookie->graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) return 0; listenAddress = cookie->graphics->listen; + + /* Okay, here's the magic: some mgmt applications set bare '0' as listen + * address. On the other hand, it's a valid IPv4 address. This means, we + * need to reformat the address so the if statement below can check just + * for two ANYCAST addresses and not all their variants. */ + if (listenAddress && + virSocketAddrParse(&addr, listenAddress, AF_UNSPEC) > 0) { + listenAddress = virSocketAddrFormat(&addr); + reformatted = true; + } + if (!listenAddress || STREQ(listenAddress, "0.0.0.0") || - STREQ(listenAddress, "::")) + STREQ(listenAddress, "::")) { + if (reformatted) + VIR_FREE(listenAddress); listenAddress = cookie->remoteHostname; + } ret = qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); if (ret == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, cookie->graphics->type, listenAddress, cookie->graphics->port, cookie->graphics->tlsPort, cookie->graphics->tlsSubject); qemuDomainObjExitMonitor(driver, vm); } return ret; } diff --git a/tests/sockettest.c b/tests/sockettest.c index 156ef45..5b36a6c 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -162,96 +162,120 @@ static int mymain(void) { int ret = 0; /* Some of our tests deliberately test failure cases, so * register a handler to stop error messages cluttering * up display */ if (!virTestGetDebug()) virSetErrorFunc(NULL, testQuietError); #define DO_TEST_PARSE(addrstr, family, pass) \ do { \ virSocketAddr addr; \ struct testParseData data = { &addr, addrstr, family, pass }; \ memset(&addr, 0, sizeof(addr)); \ if (virtTestRun("Test parse " addrstr, \ 1, testParseHelper, &data) < 0) \ ret = -1; \ } while (0) #define DO_TEST_PARSE_AND_FORMAT(addrstr, family, pass) \ do { \ virSocketAddr addr; \ struct testParseData data = { &addr, addrstr, family, pass }; \ memset(&addr, 0, sizeof(addr)); \ if (virtTestRun("Test parse " addrstr " family " #family, \ 1, testParseHelper, &data) < 0) \ ret = -1; \ struct testFormatData data2 = { &addr, addrstr, pass }; \ if (virtTestRun("Test format " addrstr " family " #family, \ 1, testFormatHelper, &data2) < 0) \ ret = -1; \ } while (0) +#define DO_TEST_PARSE_AND_CHECK_FORMAT(addrstr, addrformated, family, pass) \ + do { \ + virSocketAddr addr; \ + struct testParseData data = { &addr, addrstr, family, true}; \ + memset(&addr, 0, sizeof(addr)); \ + if (virtTestRun("Test parse " addrstr " family " #family, \ + 1, testParseHelper, &data) < 0) \ + ret = -1; \ + struct testFormatData data2 = { &addr, addrformated, pass }; \ + if (virtTestRun("Test format " addrstr " family " #family, \ + 1, testFormatHelper, &data2) < 0) \ + ret = -1; \ + } while (0) + #define DO_TEST_RANGE(saddr, eaddr, size, pass) \ do { \ struct testRangeData data = { saddr, eaddr, size, pass }; \ if (virtTestRun("Test range " saddr " -> " eaddr " size " #size, \ 1, testRangeHelper, &data) < 0) \ ret = -1; \ } while (0) #define DO_TEST_NETMASK(addr1, addr2, netmask, pass) \ do { \ struct testNetmaskData data = { addr1, addr2, netmask, pass }; \ if (virtTestRun("Test netmask " addr1 " + " addr2 " in " netmask, \ 1, testNetmaskHelper, &data) < 0) \ ret = -1; \ } while (0) DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_UNSPEC, true); DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_INET, true); DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_INET6, false); DO_TEST_PARSE_AND_FORMAT("127.0.0.1", AF_UNIX, false); DO_TEST_PARSE_AND_FORMAT("127.0.0.256", AF_UNSPEC, false); + DO_TEST_PARSE_AND_CHECK_FORMAT("127.0.0.2", "127.0.0.2", AF_INET, true); + DO_TEST_PARSE_AND_CHECK_FORMAT("127.0.0.2", "127.0.0.3", AF_INET, false); + DO_TEST_PARSE_AND_CHECK_FORMAT("0", "0.0.0.0", AF_INET, true); + DO_TEST_PARSE_AND_CHECK_FORMAT("127", "0.0.0.127", AF_INET, true); + DO_TEST_PARSE_AND_CHECK_FORMAT("127", "127.0.0.0", AF_INET, false); + DO_TEST_PARSE_AND_CHECK_FORMAT("127.2", "127.0.0.2", AF_INET, true); + DO_TEST_PARSE_AND_CHECK_FORMAT("127.2", "127.2.0.0", AF_INET, false); + DO_TEST_PARSE_AND_CHECK_FORMAT("1.2.3", "1.2.0.3", AF_INET, true); + DO_TEST_PARSE_AND_CHECK_FORMAT("1.2.3", "1.2.3.0", AF_INET, false); + DO_TEST_PARSE_AND_FORMAT("::1", AF_UNSPEC, true); DO_TEST_PARSE_AND_FORMAT("::1", AF_INET, false); DO_TEST_PARSE_AND_FORMAT("::1", AF_INET6, true); DO_TEST_PARSE_AND_FORMAT("::1", AF_UNIX, false); DO_TEST_PARSE_AND_FORMAT("::ffff", AF_UNSPEC, true); DO_TEST_RANGE("192.168.122.1", "192.168.122.1", 1, true); DO_TEST_RANGE("192.168.122.1", "192.168.122.20", 20, true); DO_TEST_RANGE("192.168.122.0", "192.168.122.255", 256, true); DO_TEST_RANGE("192.168.122.20", "192.168.122.1", -1, false); DO_TEST_RANGE("10.0.0.1", "192.168.122.20", -1, false); DO_TEST_RANGE("192.168.122.20", "10.0.0.1", -1, false); DO_TEST_RANGE("2000::1", "2000::1", 1, true); DO_TEST_RANGE("2000::1", "2000::2", 2, true); DO_TEST_RANGE("2000::2", "2000::1", -1, false); DO_TEST_RANGE("2000::1", "9001::1", -1, false); DO_TEST_NETMASK("192.168.122.1", "192.168.122.2", "255.255.255.0", true); DO_TEST_NETMASK("192.168.122.1", "192.168.122.4", "255.255.255.248", true); DO_TEST_NETMASK("192.168.122.1", "192.168.123.2", "255.255.255.0", false); DO_TEST_NETMASK("192.168.122.1", "192.168.123.2", "255.255.0.0", true); DO_TEST_NETMASK("2000::1:1", "2000::1:1", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", true); DO_TEST_NETMASK("2000::1:1", "2000::2:1", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", false); DO_TEST_NETMASK("2000::1:1", "2000::2:1", "ffff:ffff:ffff:ffff:ffff:ffff:fff8:0", true); DO_TEST_NETMASK("2000::1:1", "9000::1:1", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:0", false); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.2.1

2 1

[libvirt] [PATCH] Fix a invalid usage of virDomainNetDef in OpenVZ driver
by Alvaro Polo 05 Jun '13

05 Jun '13

OpenVZ was accessing ethernet data to obtain the guest iface name regardless the domain is configured to use ethernet or bridged networking. This prevented the guest network interface to be rightly named for bridged networking. --- src/openvz/openvz_driver.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index c8081ce..db738a4 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -815,6 +815,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, char host_macaddr[VIR_MAC_STRING_BUFLEN]; struct openvz_driver *driver = conn->privateData; virCommandPtr cmd = NULL; + char *guest_ifname = NULL; if (net == NULL) return 0; @@ -840,11 +841,15 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, virBuffer buf = VIR_BUFFER_INITIALIZER; int veid = openvzGetVEID(vpsid); - /* if user doesn't specify guest interface name, - * then we need to generate it */ - if (net->data.ethernet.dev == NULL) { - net->data.ethernet.dev = openvzGenerateContainerVethName(veid); - if (net->data.ethernet.dev == NULL) { + /* if net is ethernet and the user has specified guest interface name, + * let's use it; otherwise generate a new one */ + if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET && + net->data.ethernet.dev != NULL) { + if (VIR_STRDUP(guest_ifname, net->data.ethernet.dev) == -1) + goto cleanup; + } else { + guest_ifname = openvzGenerateContainerVethName(veid); + if (guest_ifname == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not generate eth name for container")); goto cleanup; @@ -862,7 +867,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, } } - virBufferAdd(&buf, net->data.ethernet.dev, -1); /* Guest dev */ + virBufferAdd(&buf, guest_ifname, -1); /* Guest dev */ virBufferAsprintf(&buf, ",%s", macaddr); /* Guest dev mac */ virBufferAsprintf(&buf, ",%s", net->ifname); /* Host dev */ virBufferAsprintf(&buf, ",%s", host_macaddr); /* Host dev mac */ @@ -871,7 +876,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, if (driver->version >= VZCTL_BRIDGE_MIN_VERSION) { virBufferAsprintf(&buf, ",%s", net->data.bridge.brname); /* Host bridge */ } else { - virBufferAsprintf(configBuf, "ifname=%s", net->data.ethernet.dev); + virBufferAsprintf(configBuf, "ifname=%s", guest_ifname); virBufferAsprintf(configBuf, ",mac=%s", macaddr); /* Guest dev mac */ virBufferAsprintf(configBuf, ",host_ifname=%s", net->ifname); /* Host dev */ virBufferAsprintf(configBuf, ",host_mac=%s", host_macaddr); /* Host dev mac */ @@ -895,6 +900,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid, cleanup: virCommandFree(cmd); + VIR_FREE(guest_ifname); return rc; } -- 1.7.12.4 (Apple Git-37)

5 5

[libvirt] [PATCH] qemu.conf: update vnc_password docs
by Ján Tomko 05 Jun '13

05 Jun '13

QEMU does accept empty VNC passwords now and allows anyone to connect with an empty password. https://bugzilla.redhat.com/show_bug.cgi?id=969542 --- src/qemu/qemu.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cdf1ec4..49ef75f 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -62,9 +62,9 @@ # VNC passwords. This parameter is only used if the per-domain # XML config does not already provide a password. To allow # access without passwords, leave this commented out. An empty -# string will still enable passwords, but be rejected by QEMU, -# effectively preventing any use of VNC. Obviously change this -# example here before you set this. +# string might either prevent any use of VNC or allow access +# with an empty password depending on QEMU version. Obviously +# change this example here before you set this. # #vnc_password = "XYZ12345" -- 1.8.1.5

3 2

[libvirt] [PATCH 0/4] Cleanup storage volume creation and tests and provide better error messages
by Peter Krempa 05 Jun '13

05 Jun '13

This series cleans up a few aspects when creating storage volumes and adds error messages if the metadata preallocation flag is not supported. Peter Krempa (4): storagevolxml2argvtest: Report better error messages on test failure storage: Clean up function header and reflow error message storage: Avoid unnecessary ternary operators and refactor the code storage: Provide better error message if metadata pre-alloc is unsupported src/storage/storage_backend.c | 132 +++++++++++++++++++++++------------------ tests/storagevolxml2argvtest.c | 7 ++- 2 files changed, 77 insertions(+), 62 deletions(-) -- 1.8.2.1

2 9

[libvirt] [PATCH] maint: don't use config.h in .h files
by Eric Blake 05 Jun '13

05 Jun '13

Enforce the rule that .h files don't need to (redundantly) include <config.h>. * cfg.mk (sc_prohibit_config_h_in_headers): New rule. (_virsh_includes): Delete; instead, inline a smaller number of exclusions... (exclude_file_name_regexp--sc_require_config_h) (exclude_file_name_regexp--sc_require_config_h_first): ...here. * daemon/libvirtd.h (includes): Fix offenders. * src/driver.h (includes): Likewise. * src/gnutls_1_0_compat.h (includes): Likewise. * src/libxl/libxl_conf.h (includes): Likewise. * src/libxl/libxl_driver.h (includes): Likewise. * src/lxc/lxc_conf.h (includes): Likewise. * src/lxc/lxc_driver.h (includes): Likewise. * src/lxc/lxc_fuse.h (includes): Likewise. * src/network/bridge_driver.h (includes): Likewise. * src/phyp/phyp_driver.h (includes): Likewise. * src/qemu/qemu_conf.h (includes): Likewise. * src/util/virnetlink.h (includes): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Not a build-breaker, and not trivial enough to push without review; but it should have no impact on the resulting binary so it is safe for 1.0.6 if I get a review in time. cfg.mk | 16 +++++++++++++--- daemon/libvirtd.h | 4 +--- src/driver.h | 2 -- src/gnutls_1_0_compat.h | 4 +--- src/libxl/libxl_conf.h | 2 -- src/libxl/libxl_driver.h | 2 -- src/lxc/lxc_conf.h | 4 +--- src/lxc/lxc_driver.h | 2 -- src/lxc/lxc_fuse.h | 1 - src/network/bridge_driver.h | 4 +--- src/phyp/phyp_driver.h | 3 +-- src/qemu/qemu_conf.h | 2 -- src/util/virnetlink.h | 3 +-- 13 files changed, 19 insertions(+), 30 deletions(-) diff --git a/cfg.mk b/cfg.mk index 4ffa020..c093bf2 100644 --- a/cfg.mk +++ b/cfg.mk @@ -797,6 +797,15 @@ sc_prohibit_include_public_headers_brackets: halt='Do not include libvirt/*.h in internal source' \ $(_sc_search_regexp) +# <config.h> is only needed in .c files; .h files do not need it since +# .c files must include config.h before any other .h. +sc_prohibit_config_h_in_headers: + @prohibit='^# *include\>.*config\.h' \ + in_vc_files='\.h$$' \ + halt='headers should not include <config.h>' \ + $(_sc_search_regexp) + + # We don't use this feature of maint.mk. prev_version_file = /dev/null @@ -937,10 +946,11 @@ exclude_file_name_regexp--sc_prohibit_xmlURI = ^src/util/viruri\.c$$ exclude_file_name_regexp--sc_prohibit_return_as_function = \.py$$ -_virsh_includes=(edit|domain-monitor|domain|volume|pool|network|interface|nwfilter|secret|snapshot|host|nodedev) -exclude_file_name_regexp--sc_require_config_h = ^(examples/|tools/virsh-$(_virsh_includes)\.c$$) +exclude_file_name_regexp--sc_require_config_h = \ + ^(examples/|tools/virsh-edit\.c$$) -exclude_file_name_regexp--sc_require_config_h_first = ^(examples/|tools/virsh-$(_virsh_includes)\.c$$) +exclude_file_name_regexp--sc_require_config_h_first = \ + ^(examples/|tools/virsh-edit\.c$$) exclude_file_name_regexp--sc_trailing_blank = \ (/qemuhelpdata/|/sysinfodata/.*\.data|\.(fig|gif|ico|png)$$) diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index c07637a..d0afdc8 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -1,7 +1,7 @@ /* * libvirtd.h: daemon data structure definitions * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -27,8 +27,6 @@ # define VIR_ENUM_SENTINELS -# include <config.h> - # include <rpc/types.h> # include <rpc/xdr.h> # include "remote_protocol.h" diff --git a/src/driver.h b/src/driver.h index e998adf..ec5fc53 100644 --- a/src/driver.h +++ b/src/driver.h @@ -22,8 +22,6 @@ #ifndef __VIR_DRIVER_H__ # define __VIR_DRIVER_H__ -# include "config.h" - # include <unistd.h> # include "internal.h" diff --git a/src/gnutls_1_0_compat.h b/src/gnutls_1_0_compat.h index 217bc8c..b006e2b 100644 --- a/src/gnutls_1_0_compat.h +++ b/src/gnutls_1_0_compat.h @@ -1,7 +1,7 @@ /* * gnutls_1_0_compat.h: GnuTLS 1.0 compatibility * - * Copyright (C) 2007 Red Hat, Inc. + * Copyright (C) 2007, 2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,8 +23,6 @@ #ifndef LIBVIRT_GNUTLS_1_0_COMPAT_H__ # define LIBVIRT_GNUTLS_1_0_COMPAT_H__ -# include <config.h> - # include <gnutls/gnutls.h> /* enable backward compatibility macros for gnutls 1.x.y */ diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index fed878d..44ecd41 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -25,8 +25,6 @@ #ifndef LIBXL_CONF_H # define LIBXL_CONF_H -# include <config.h> - # include <libxl.h> # include "internal.h" diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h index cb8921f..fba6c5a 100644 --- a/src/libxl/libxl_driver.h +++ b/src/libxl/libxl_driver.h @@ -23,8 +23,6 @@ #ifndef LIBXL_DRIVER_H # define LIBXL_DRIVER_H -# include <config.h> - int libxlRegister(void); #endif /* LIBXL_DRIVER_H */ diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index 4332fb9..5a5b9aa 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010, 2013 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_conf.h: header file for linux container config functions @@ -25,8 +25,6 @@ #ifndef LXC_CONF_H # define LXC_CONF_H -# include <config.h> - # include "internal.h" # include "domain_conf.h" # include "domain_event.h" diff --git a/src/lxc/lxc_driver.h b/src/lxc/lxc_driver.h index 113d1ce..656831c 100644 --- a/src/lxc/lxc_driver.h +++ b/src/lxc/lxc_driver.h @@ -24,8 +24,6 @@ #ifndef LXC_DRIVER_H # define LXC_DRIVER_H -# include <config.h> - /* Function declarations */ int lxcRegister(void); diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h index a42c39a..b3713af 100644 --- a/src/lxc/lxc_fuse.h +++ b/src/lxc/lxc_fuse.h @@ -26,7 +26,6 @@ # define FUSE_USE_VERSION 26 -# include <config.h> # if WITH_FUSE # include <fuse.h> # endif diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 4bf64ea..50258b5 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -1,7 +1,7 @@ /* * network_driver.h: core driver methods for managing networks * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -25,8 +25,6 @@ #ifndef __VIR_NETWORK__DRIVER_H # define __VIR_NETWORK__DRIVER_H -# include <config.h> - # include "internal.h" # include "network_conf.h" # include "domain_conf.h" diff --git a/src/phyp/phyp_driver.h b/src/phyp/phyp_driver.h index 59a4370..ad05b15 100644 --- a/src/phyp/phyp_driver.h +++ b/src/phyp/phyp_driver.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010, 2013 Red Hat, Inc. * Copyright IBM Corp. 2009 * * phyp_driver.c: ssh layer to access Power Hypervisors @@ -27,7 +27,6 @@ # include "conf/capabilities.h" # include "conf/domain_conf.h" -# include <config.h> # include <libssh2.h> # define LPAR_EXEC_ERR -1 diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 42566b4..19893c8 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -24,8 +24,6 @@ #ifndef __QEMUD_CONF_H # define __QEMUD_CONF_H -# include <config.h> - # include "virebtables.h" # include "internal.h" # include "capabilities.h" diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 9a69a0b..8351000 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 Red Hat, Inc. * Copyright (C) 2010-2012 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -20,7 +20,6 @@ #ifndef __VIR_NETLINK_H__ # define __VIR_NETLINK_H__ -# include "config.h" # include "internal.h" # include "virmacaddr.h" -- 1.8.1.4

2 3

[libvirt] [libvirt-designer PATCHv3] Handle more devices in GVirDesignerDomain
by Christophe Fergeau 05 Jun '13

05 Jun '13

Hi, Resending once more, only change since v2 is a small fix in 1/9 to avoid calling g_str_has_suffix on a NULL string when no short_id is available. Christophe

2 20

[libvirt] [PATCH 0/3] Support --allocate and --shrink for vol-resize
by Osier Yang 05 Jun '13

05 Jun '13

https://bugzilla.redhat.com/show_bug.cgi?id=804516 Though the bug's title is about the document, but I prefer to implement it instead of changing document. Those two flags were added long time ago, but never implemented, it's not good to say they are not supported now while they were already exposed outside. A few examples of vol-resize with the patches: 1) Create 5M a parse vol % dd of=/var/lib/libvirt/images/sparse.raw bs=1k seek=5120 count=0 0+0 records in 0+0 records out 0 bytes (0 B) copied, 7.904e-06 s, 0.0 kB/s % ./tools/virsh pool-refresh default Pool default refreshed %s ./tools/virsh vol-info /var/lib/libvirt/images/sparse.raw Name: sparse.raw Type: file Capacity: 5.00 MiB Allocation: 0.00 B 2) Resize the vol to 6M with --allocate, I.E. The capacity (5M - 6M) is preallocated. % ./tools/virsh vol-resize /var/lib/libvirt/images/sparse.raw 6M --allocate Size of volume 'sparse.raw' successfully changed to 6M % ./tools/virsh vol-info /var/lib/libvirt/images/sparse.raw Name: sparse.raw Type: file Capacity: 6.00 MiB Allocation: 1.00 MiB 3) Resize the vol to 7M without --allocate. I.E. The new 1M capacity (6M - 7M) is sparse. % ./tools/virsh vol-resize /var/lib/libvirt/images/sparse.raw 7M Size of volume 'sparse.raw' successfully changed to 7M %s ./tools/virsh vol-info /var/lib/libvirt/images/sparse.raw Name: sparse.raw Type: file Capacity: 7.00 MiB Allocation: 1.00 MiB 3) Resize the vol to 8M with --allocate, I.E. The new 1 M capacity (7M - 8M) is preallocated % ./tools/virsh vol-resize /var/lib/libvirt/images/sparse.raw 8M --allocate Size of volume 'sparse.raw' successfully changed to 8M % ./tools/virsh vol-info /var/lib/libvirt/images/sparse.raw Name: sparse.raw Type: file Capacity: 8.00 MiB Allocation: 2.00 MiB ====== Now the parse file's allocation is like: 0 5 6 7 8 ----------------------------------------------------------------- | zero | allocated | zero | allocated | ----------------------------------------------------------------- %s ./tools/virsh vol-resize /var/lib/libvirt/images/sparse.raw 6M --shrink Size of volume 'sparse.raw' successfully changed to 6M %s ./tools/virsh vol-info /var/lib/libvirt/images/sparse.raw Name: sparse.raw Type: file Capacity: 6.00 MiB Allocation: 1.00 MiB ===== The vol still get 1M preallocate space kept, expected. Osier Yang (3): storage: Support preallocate the new capacity for vol-resize storage: Forbid to shrink the vol's capacity if no --shrink is specified storage: Allow --shrink for raw type volume of fs pool src/storage/storage_backend_fs.c | 22 ++++++++++++++++++---- src/storage/storage_driver.c | 12 +++++++++++- src/util/virstoragefile.c | 39 ++++++++++++++++++++++++++++++++++++--- src/util/virstoragefile.h | 6 +++++- 4 files changed, 70 insertions(+), 9 deletions(-) -- 1.8.1.4

2 8

[libvirt] [libvirt-glib PATCHv3 0/6] gconfig: Add classes/methods for snapshot configuration
by Christophe Fergeau 05 Jun '13

05 Jun '13

Hi, This is a resend of this patch series, the only changes since v2 is the rename of gvir_config_domain_disk_[gs]et_driver_type_enum to gvir_config_domain_disk_[gs]et_driver_format and the rename of gvir_config_domain_snapshot_disk_set_driver_type to gvir_config_domain_snapshot_disk_set_driver_format Christophe

2 11

[libvirt] [PATCH] virtlockd: fix socket path
by Ján Tomko 05 Jun '13

05 Jun '13

Change the socket path to match the one used by lockd driver. https://bugzilla.redhat.com/show_bug.cgi?id=968128 --- src/locking/virtlockd.socket.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in index a6eef4f..a38b1f4 100644 --- a/src/locking/virtlockd.socket.in +++ b/src/locking/virtlockd.socket.in @@ -2,7 +2,7 @@ Description=Virtual machine lock manager socket [Socket] -ListenStream=@localstatedir@/run/libvirt/virtlockd/virtlockd.sock +ListenStream=@localstatedir@/run/libvirt/virtlockd-sock [Install] WantedBy=multi-user.target -- 1.8.1.5

2 2

[libvirt] [PATCH] snapshot: remove mutually exclusive memory and disk-only duplicate check
by Guannan Ren 05 Jun '13

05 Jun '13

The work was done at the time of snapshot xmlstring parsing if (offline && def->memory && def->memory != VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { virReportError(...); } --- src/qemu/qemu_driver.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9d3f632..db56823 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11730,14 +11730,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, "with external checkpoints")); goto cleanup; } - if ((def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL || - def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL) && - flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("disk-only snapshot creation is not compatible with " - "memory snapshot")); - goto cleanup; - } if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) { /* Prevent circular chains */ -- 1.8.1.4

2 2

[libvirt] [PATCH] Ensure non-root can read /proc/meminfo file in LXC containers
by Daniel P. Berrange 05 Jun '13

05 Jun '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> By default files in a FUSE mount can only be accessed by the user which created them, even if the file permissions would otherwise allow it. To allow other users to access the FUSE mount the 'allow_other' mount option must be used. This bug prevented non-root users in an LXC container from reading the /proc/meminfo file. https://bugzilla.redhat.com/show_bug.cgi?id=967977 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_fuse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index b6df99c..32886cd 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -307,6 +307,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) /* process name is libvirt_lxc */ if (fuse_opt_add_arg(&args, "libvirt_lxc") == -1 || fuse_opt_add_arg(&args, "-odirect_io") == -1 || + fuse_opt_add_arg(&args, "-oallow_other") == -1 || fuse_opt_add_arg(&args, "-ofsname=libvirt") == -1) goto cleanup1; -- 1.8.1.4

3 2

[libvirt] [PATCH v2] nwfilter: grab driver lock earlier during init (bz96649)
by Stefan Berger 04 Jun '13

04 Jun '13

This patch is in _relation_ to Bug 966449: https://bugzilla.redhat.com/show_bug.cgi?id=966449 Below is a possible patch addressing the coredump. Thread 1 must be calling nwfilterDriverRemoveDBusMatches(). It does so with nwfilterDriverLock held. In the patch below I am now moving the nwfilterDriverLock(driverState) further up so that the initialization, which seems to either take a long time or is entirely stuck, occurs with the lock held and the shutdown cannot occur at the same time. Remove the lock in virNWFilterDriverIsWatchingFirewallD to avoid trying to lock the same lock again. --- src/nwfilter/nwfilter_driver.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) Index: libvirt/src/nwfilter/nwfilter_driver.c =================================================================== --- libvirt.orig/src/nwfilter/nwfilter_driver.c +++ libvirt/src/nwfilter/nwfilter_driver.c @@ -191,6 +191,8 @@ nwfilterStateInitialize(bool privileged, if (!privileged) return 0; + nwfilterDriverLock(driverState); + if (virNWFilterIPAddrMapInit() < 0) goto err_free_driverstate; if (virNWFilterLearnInit() < 0) @@ -203,8 +205,6 @@ nwfilterStateInitialize(bool privileged, if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0) goto err_techdrivers_shutdown; - nwfilterDriverLock(driverState); - /* * startup the DBus late so we don't get a reload signal while * initializing @@ -316,16 +316,10 @@ nwfilterStateReload(void) { bool virNWFilterDriverIsWatchingFirewallD(void) { - bool ret; - if (!driverState) return false; - nwfilterDriverLock(driverState); - ret = driverState->watchingFirewallD; - nwfilterDriverUnlock(driverState); - - return ret; + return driverState->watchingFirewallD; } /**

2 1

[libvirt] [PATCH] Ensure non-root can read /proc/meminfo file in LXC containers
by Daniel P. Berrange 04 Jun '13

04 Jun '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> By default files in a FUSE mount can only be accessed by the user which created them, even if the file permissions would otherwise allow it. To allow other users to access the FUSE mount the 'allow_other' mount option must be used. This bug prevented non-root users in an LXC container from reading the /proc/meminfo file. https://bugzilla.redhat.com/show_bug.cgi?id=967977 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_fuse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index b6df99c..32886cd 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -307,6 +307,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) /* process name is libvirt_lxc */ if (fuse_opt_add_arg(&args, "libvirt_lxc") == -1 || fuse_opt_add_arg(&args, "-odirect_io") == -1 || + fuse_opt_add_arg(&args, "-oallow_other") == -1 || fuse_opt_add_arg(&args, "-ofsname=libvirt") == -1) goto cleanup1; -- 1.8.1.4

1 0

[libvirt] [PATCH] docs: add spaces to formatstorage.html
by Ján Tomko 04 Jun '13

04 Jun '13

Let the pool types breathe. --- Trivial. docs/formatstorage.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 9c3be67..1a45915 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -17,9 +17,9 @@ <p> The top level tag for a storage pool document is 'pool'. It has a single attribute <code>type</code>, which is one of <code>dir</code>, - <code>fs</code>,<code>netfs</code>,<code>disk</code>,<code>iscsi</code>, - <code>logical</code>. This corresponds to the storage backend drivers - listed further along in this document. + <code>fs</code>, <code>netfs</code>, <code>disk</code>, + <code>iscsi</code>, <code>logical</code>. This corresponds to the + storage backend drivers listed further along in this document. The storage pool XML format is available <span class="since">since 0.4.1</span> </p> <h3><a name="StoragePoolFirst">General metadata</a></h3> -- 1.8.1.5

1 0

[libvirt] [PATCH] qemu: Report the offset from host UTC for RTC_CHANGE event
by Osier Yang 04 Jun '13

04 Jun '13

https://bugzilla.redhat.com/show_bug.cgi?id=964177 Though both libvirt and QEMU's document say RTC_CHANGE returns the offset from the host UTC, qemu actually returns the offset from the specified date instead when specific date is privided (-rtc base=$date). It's not safe for qemu to fix it in code, it worked like that for 3 years, changing it now may break other QEMU use cases. What qemu tries to do is to fix the document: http://lists.gnu.org/archive/html/qemu-devel/2013-05/msg04782.html And in libvirt side, instead of reply on the qemu, this covert the offset returned from qemu to the offset from host UTC, by: /* * a: the offset from qemu RTC_CHANGE event * b: The specified date (-rtc base=$date) * c: the host date when libvirt gets the RTC_CHANGE event * offset: What libvirt will report */ offset = a + (b - c); The specified date (-rtc base=$date) is recorded in clock's def as an internal only member (may be useful to exposed outside?). --- src/conf/domain_conf.h | 3 +++ src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_process.c | 12 ++++++++++++ 3 files changed, 18 insertions(+) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3a71d6c..3947a56 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1767,6 +1767,9 @@ struct _virDomainClockDef { struct { long long adjustment; int basis; + + /* Store the start time of guest process, internaly only */ + time_t starttime; } variable; /* Timezone name, when diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c4a162a..9254525 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5518,6 +5518,9 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) now += def->data.variable.adjustment; gmtime_r(&now, &nowbits); + /* Store the starttime of qemu process */ + def->data.variable.starttime = now; + virBufferAsprintf(&buf, "base=%d-%02d-%02dT%02d:%02d:%02d", nowbits.tm_year + 1900, nowbits.tm_mon + 1, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d4fd4fb..e6f0b6d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -796,6 +796,18 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virObjectLock(vm); + + /* QEMU's RTC_CHANGE event returns the offset from the specified + * date instead of the host UTC if a specific date is provided + * (-rtc base=$date). We need to convert it to be offset from + * host UTC. + */ + if (vm->def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) { + time_t now = time(NULL); + + offset += vm->def->clock.data.variable.starttime - now; + } + event = virDomainEventRTCChangeNewFromObj(vm, offset); if (vm->def->clock.offset == VIR_DOMAIN_CLOCK_OFFSET_VARIABLE) -- 1.8.1.4

3 5

[libvirt] [PATCH] Remove legacy code for single-instance devpts filesystem
by Daniel P. Berrange 04 Jun '13

04 Jun '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> An earlier commit dropped support for using LXC with kernels having single-instance devpts filesystem from the LXC controller. It forgot to remove the same code from the LXC container setup. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c74e3ca..181f6c8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -869,25 +869,14 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths) } } - if (access("/dev/pts/ptmx", W_OK) == 0) { - /* We have private devpts capability, so bind that */ - if (virFileTouch("/dev/ptmx", 0666) < 0) - return -1; + /* We have private devpts capability, so bind that */ + if (virFileTouch("/dev/ptmx", 0666) < 0) + return -1; - if (mount("/dev/pts/ptmx", "/dev/ptmx", "ptmx", MS_BIND, NULL) < 0) { - virReportSystemError(errno, "%s", - _("Failed to bind /dev/pts/ptmx on to /dev/ptmx")); - return -1; - } - } else { - /* Legacy devpts, so we need to just use shared one */ - dev_t dev = makedev(LXC_DEV_MAJ_TTY, LXC_DEV_MIN_PTMX); - if (mknod("/dev/ptmx", S_IFCHR, dev) < 0 || - chmod("/dev/ptmx", 0666)) { - virReportSystemError(errno, "%s", - _("Failed to make device /dev/ptmx")); - return -1; - } + if (mount("/dev/pts/ptmx", "/dev/ptmx", "ptmx", MS_BIND, NULL) < 0) { + virReportSystemError(errno, "%s", + _("Failed to bind /dev/pts/ptmx on to /dev/ptmx")); + return -1; } for (i = 0; i < nttyPaths; i++) { -- 1.8.1.4

2 1

[libvirt] ARM libvirt compiling error
by Michele Paolino 04 Jun '13

04 Jun '13

Hello, I'm trying to set up a development environment on an Arndale (ARM Samsung Exynos 5250) board to work on sVirt. I'm using Debian 7.0, I've downloaded the source code from GIT and than: ./autogen.sh --prefix=$HOME/usr make but in the middle of make execution, the program fails with this error: conf/domain_conf.c: In function 'virDomainHostdevDefParseXML': conf/domain_conf.c:3915:36: error: 'next_unit' may be used uninitialized in this function [-Werror=uninitialized] conf/domain_conf.c:3886:9: note: 'next_unit' was declared here conf/domain_conf.c: At top level: cc1: error: unrecognized command line option "-Wno-unused-command-line-argument" [-Werror] I've solved this problem simply initializing the "next_unit" variable (file src/conf/domain_conf.c, line 3886). This is the diff between the original file and the modified one: 3886c3886 < int next_unit; --- > int next_unit = -1; Another way to solve is obviously with --disable-werror, but I guess this is not the best way. My gcc version is 4.6.3 (Debian 4.6.3-14), kernel version is 3.8.0-rc4. Maybe it's only a compiler problem, but can anyone confirm this? Is it worth to submit a new bug report/patch the source? Regards, Michele -- *Michele Paolino ** *Virtual Open Systems* **Open Source KVM Virtualization Developments Multicore Systems Virtualization Porting Services *Web*:* *www.virtualopensystems.com*

3 2

[libvirt] [PATCHv2 0/2] fix segfault in virSecuritySELinuxMCSGetProcessRange
by Ján Tomko 04 Jun '13

04 Jun '13

Diff to v2: Changed char * to const char * after actually compiling it with selinux. Added a test. James Gilliland (1): selinux: fix segfault in virSecuritySELinuxMCSGetProcessRange Ján Tomko (1): tests: add test for a selinux label without a range src/security/security_selinux.c | 9 ++++++++- tests/securityselinuxtest.c | 44 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 4 deletions(-) -- 1.8.1.5

2 3

[libvirt] NBD drives with literal IPv6 addresses or hostnames starting with a digit
by Ján Tomko 04 Jun '13

04 Jun '13

Hello, since qemu's commit v1.4.0-736-gf17c90b [1]: nbd: Keep hostname and port separate * literal IPv6 addresses no longer work in nbd URIs, because getaddrinfo is called with the surrounding brackets: $ qemu-system-x86_64 -drive file=nbd://[::1]:1234/quack qemu-system-x86_64: -drive file=nbd://[::1]:1234/quack: address resolution failed for [::1]:1234: Name or service not known * hostnames starting with a digit now work in nbd URIs. Before that, or with the non-URI syntax, they fail because inet_parse assumes them to be literal IPv4 addresses: $ qemu-system-x86_64 -drive file=nbd:123flour:1234:exportname=gashunk qemu-system-x86_64: -drive file=nbd:123flour:1234:exportname=gashunk: error parsing IPv4 address '123flour:1234' In libvirt, we use the URI format on the command line only if the host contains ':', so hostnames starting with a digit still don't work. Migration with NBD and a literal IPv6 address doesn't work either, but that's purely libvirt's fault, as we don't escape it with brackets. I've just posted a patch for that. [2] Jan [1] http://git.qemu.org/?p=qemu.git;a=commitdiff;h=f17c90b [2] https://www.redhat.com/archives/libvir-list/2013-May/msg02022.html

2 2

[libvirt] Authoritative source for logging filters descriptions ?
by Kashyap Chamarthy 04 Jun '13

04 Jun '13

Heya, So I usually use these two resources, when tracing/debugging: - https://www.berrange.com/posts/2011/10/03/troubleshooting-libvirt-with-the-… - http://libvirt.org/logging.html For instance, for filters to know what QMP commands libvirt is sending to QEMU: I use: - log_filters="1:qemu_monitor" - log_outputs="1:file:/var/log/libvirt/libvirtd.log" But, from https://www.berrange.com/posts/2011/10/03/troubleshooting-libvirt-with-the-… I notice, we could also use these variations of filters QEMU/QMP filters: # QEMU JSON/QMP monitor commands - log_filters="1:qemu_monitor_json" # QEMU text monitor commands - log_filters="1:qemu_monitor_text" Is there any place where these are comprehensively documented, has anything changed from what's mentioned in the above blog & the logging wiki page ? Furthermore, from /etc/libvirt/libvirtd.conf, I see: =========================================== [...] # Logging filters: # A filter allows to select a different logging level for a given category # of logs # The format for a filter is one of: # x:name # x:+name # where name is a string which is matched against source file name, # e.g., "remote", "qemu", or "util/json", the optional "+" prefix # tells libvirt to log stack trace for each message matching name, # and x is the minimal level where matching messages should be logged: # 1: DEBUG # 2: INFO # 3: WARNING # 4: ERROR # # Multiple filter can be defined in a single @filters, they just need to be # separated by spaces. # # e.g. to only get warning or errors from the remote layer and only errors # from the event layer: #log_filters="3:remote 4:event" [...] =========================================== Is the above list of strings describe all possible "name" values for filters ? If I'm missing some obvious resource on the inter-webs, please point me to it. Thanks. -- /kashyap

2 2

[libvirt] [PATCH] virsh: Allow attach-disk to specify disk wwn
by Osier Yang 04 Jun '13

04 Jun '13

Commit 6e73850b01ee support to set wwn for disks, but it was not exposed to attach-disk. --- tools/virsh-domain.c | 14 +++++++++++++- tools/virsh.pod | 8 ++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 9ea5ffc..767e288 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -307,6 +307,10 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_STRING, .help = N_("serial of disk device") }, + {.name = "wwn", + .type = VSH_OT_STRING, + .help = N_("wwn of disk device") + }, {.name = "shareable", .type = VSH_OT_BOOL, .help = N_("shareable between domains") @@ -499,7 +503,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom = NULL; const char *source = NULL, *target = NULL, *driver = NULL, *subdriver = NULL, *type = NULL, *mode = NULL, - *cache = NULL, *serial = NULL, *straddr = NULL; + *cache = NULL, *serial = NULL, *straddr = NULL, + *wwn = NULL; struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; @@ -538,6 +543,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "mode", &mode) < 0 || vshCommandOptStringReq(ctl, cmd, "cache", &cache) < 0 || vshCommandOptStringReq(ctl, cmd, "serial", &serial) < 0 || + vshCommandOptStringReq(ctl, cmd, "wwn", &wwn) < 0 || vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || vshCommandOptStringReq(ctl, cmd, "sourcetype", &stype) < 0) goto cleanup; @@ -564,6 +570,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) } } + if (wwn && !virValidateWWN(wwn)) + goto cleanup; + /* Make XML of disk */ virBufferAsprintf(&buf, "<disk type='%s'", (isFile) ? "file" : "block"); @@ -597,6 +606,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (serial) virBufferAsprintf(&buf, " <serial>%s</serial>\n", serial); + if (wwn) + virBufferAsprintf(&buf, " <wwn>%s</wwn>\n", wwn); + if (vshCommandOptBool(cmd, "shareable")) virBufferAddLit(&buf, " <shareable/>\n"); diff --git a/tools/virsh.pod b/tools/virsh.pod index 047c241..69c290f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1849,8 +1849,8 @@ expected. [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--config>] [I<--sourcetype soucetype>] -[I<--serial serial>] [I<--shareable>] [I<--rawio>] [I<--address address>] -[I<--multifunction>] [I<--print-xml>] +[I<--serial serial>] [I<--wwn wwn>] [I<--shareable>] [I<--rawio>] +[I<--address address>] [I<--multifunction>] [I<--print-xml>] Attach a new disk device to the domain. I<source> is path for the files and devices. I<target> controls the bus or @@ -1870,8 +1870,8 @@ I<mode> can specify the two specific mode I<readonly> or I<shareable>. I<sourcetype> can indicate the type of source (block|file) I<cache> can be one of "default", "none", "writethrough", "writeback", "directsync" or "unsafe". -I<serial> is the serial of disk device. I<shareable> indicates the disk device -is shareable between domains. +I<serial> is the serial of disk device. I<wwn> is the wwn of disk device. +I<shareable> indicates the disk device is shareable between domains. I<rawio> indicates the disk needs rawio capability. I<address> is the address of disk device in the form of pci:domain.bus.slot.function, scsi:controller.bus.unit or ide:controller.bus.unit. -- 1.8.1.4

2 2

[libvirt] [PATCH] tests: fix typo in securityselinuxtest
by Ján Tomko 04 Jun '13

04 Jun '13

--- Pushed as trivial. tests/securityselinuxtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index f276e6d..bdf248b 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -231,7 +231,7 @@ testSELinuxGenLabel(const void *opaque) if (virSecurityManagerGenLabel(data->mgr, def) < 0) { virErrorPtr err = virGetLastError(); - fprintf(stderr, "Cannot generated label %s\n", err->message); + fprintf(stderr, "Cannot generate label: %s\n", err->message); goto cleanup; } -- 1.8.1.5

1 0

[libvirt] [PATCH] selinux: fix segfault in virSecuritySELinuxMCSGetProcessRange
by Ján Tomko 04 Jun '13

04 Jun '13

From: James Gilliland <neclimdul(a)gmail.com> https://bugzilla.redhat.com/show_bug.cgi?id=969878 --- src/security/security_selinux.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index b862fbf..3d8195c 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -189,6 +189,7 @@ virSecuritySELinuxMCSGetProcessRange(char **sens, context_t ourContext = NULL; char *cat = NULL; char *tmp; + char *contextRange; int ret = -1; if (getcon_raw(&ourSecContext) < 0) { @@ -202,8 +203,14 @@ virSecuritySELinuxMCSGetProcessRange(char **sens, ourSecContext); goto cleanup; } + if (!(contextRange = context_range_get(ourContext))) { + virReportSystemError(errno, + _("Unable to parse current SELinux context range '%s'"), + ourSecContext); + goto cleanup; + } - if (VIR_STRDUP(*sens, context_range_get(ourContext)) < 0) + if (VIR_STRDUP(*sens, contextRange) < 0) goto cleanup; /* Find and blank out the category part (if any) */ -- 1.8.1.5

2 1

[libvirt] [PATCH] virsh: Obey pool-or-uuid spec when creating volumes
by Jiri Denemark 04 Jun '13

04 Jun '13

Our documentation says a pool may be referenced by its name or UUID anywhere if it makes sense (pool-name and pool-uuid are the only exceptions). However, vol-create and vol-create-as commands did not obey this. --- tools/virsh-volume.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index e16a385..35fb762 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -177,8 +177,7 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; - if (!(pool = vshCommandOptPoolBy(ctl, cmd, "pool", NULL, - VSH_BYNAME))) + if (!(pool = vshCommandOptPool(ctl, cmd, "pool", NULL))) return false; if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) @@ -345,8 +344,7 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; - if (!(pool = vshCommandOptPoolBy(ctl, cmd, "pool", NULL, - VSH_BYNAME))) + if (!(pool = vshCommandOptPool(ctl, cmd, "pool", NULL))) return false; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) -- 1.8.2.1

2 2

[libvirt] nwfilter: grab driver lock earlier during init (bz96649)
by Stefan Berger 03 Jun '13

03 Jun '13

This patch is in relation to Bug 966449: https://bugzilla.redhat.com/show_bug.cgi?id=966449 Below is a possible patch addressing the coredump. Thread 1 must be calling nwfilterDriverRemoveDBusMatches(). It does so with nwfilterDriverLock held. In the patch below I am now moving the nwfilterDriverLock(driverState) further up so that the initialization, which seems to either take a long time or is entirely stuck, occurs with the lock held and the shutdown cannot occur at the same time. To avoid having to make the nwfilterDriverLock lockable multiple times / recursive I changed the virNWFilterDriverIsWatchingFirewallD to take as an argument whether it has to grab that lock. There's only a single caller at the moment that calls this function during initialization. We could remove this lock entirely and maybe append to the name of the function NoLock (?). --- src/nwfilter/nwfilter_driver.c | 18 +++++++++++++----- src/nwfilter/nwfilter_driver.h | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 7 ++++++- 3 files changed, 20 insertions(+), 7 deletions(-) Index: libvirt/src/nwfilter/nwfilter_driver.c =================================================================== --- libvirt.orig/src/nwfilter/nwfilter_driver.c +++ libvirt/src/nwfilter/nwfilter_driver.c @@ -191,6 +191,8 @@ nwfilterStateInitialize(bool privileged, if (!privileged) return 0; + nwfilterDriverLock(driverState); + if (virNWFilterIPAddrMapInit() < 0) goto err_free_driverstate; if (virNWFilterLearnInit() < 0) @@ -203,8 +205,6 @@ nwfilterStateInitialize(bool privileged, if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0) goto err_techdrivers_shutdown; - nwfilterDriverLock(driverState); - /* * startup the DBus late so we don't get a reload signal while * initializing @@ -309,21 +309,29 @@ nwfilterStateReload(void) { /** * virNWFilterIsWatchingFirewallD: * + * @needDriverLock: Provide 'true' if this function needs to grab + * the nwfilter driver lock, 'false' otherwise, + * which may be the case during initialization + * * Checks if the nwfilter has the DBus watches for FirewallD installed. * * Returns true if it is watching firewalld, false otherwise */ bool -virNWFilterDriverIsWatchingFirewallD(void) +virNWFilterDriverIsWatchingFirewallD(bool needDriverLock) { bool ret; if (!driverState) return false; - nwfilterDriverLock(driverState); + if (needDriverLock) + nwfilterDriverLock(driverState); + ret = driverState->watchingFirewallD; - nwfilterDriverUnlock(driverState); + + if (needDriverLock) + nwfilterDriverUnlock(driverState); return ret; } Index: libvirt/src/nwfilter/nwfilter_driver.h =================================================================== --- libvirt.orig/src/nwfilter/nwfilter_driver.h +++ libvirt/src/nwfilter/nwfilter_driver.h @@ -33,6 +33,6 @@ int nwfilterRegister(void); -bool virNWFilterDriverIsWatchingFirewallD(void); +bool virNWFilterDriverIsWatchingFirewallD(bool needDriverLock); #endif /* __VIR_NWFILTER_DRIVER_H__ */ Index: libvirt/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt/src/nwfilter/nwfilter_ebiptables_driver.c @@ -4191,7 +4191,12 @@ ebiptablesDriverInitWithFirewallD(void) int status; int ret = -1; - if (!virNWFilterDriverIsWatchingFirewallD()) + /* + * check whether we are watching firewalld + * Since we call this function during initialization we won't need + * to have it get the lock, so we pass 'false'. + */ + if (!virNWFilterDriverIsWatchingFirewallD(false)) return -1; firewall_cmd_path = virFindFileInPath("firewall-cmd");

2 2

[libvirt] need custom /dev entries in LXC
by Michael R. Hines 03 Jun '13

03 Jun '13

Hi, We run nvidia devices inside libvirt-managed LXC containers. It used to be that simply doing: $ echo 'c 195:* rwm' > /sys/fs/cgroup/devices/libvirt/lxc Then, after booting the container, we would do: $ mknod -m 666 /dev/nvidia0 c 195 0 .... would be good enough to run our CUDA applications. But, according to: $ cat src/lxc/lxc_container.c The CAP_MKNOD capability is being dropped and only a specific set of devices is being created before booting the container. Is there any reason why this is not per-device configurable? Thanks, - Michael R. Hines

2 2

[libvirt] [PATCH 0/3] Fix error reporting of virsh qemu-agent-command and underlying API's.
by Peter Krempa 03 Jun '13

03 Jun '13

The code was horribly broken in multiple ways. This series fixes dispatching of errors from the API, null dereference in virsh and shadowed error messages. Peter Krempa (3): virsh-domain: Report errors and don't deref NULL in qemu-agent-command qemu: Properly report guest agent errors on command passthrough libvirt-qemu: Dispatch errors from virDomainQemuAgentCommand() src/libvirt-qemu.c | 9 +++++++-- src/qemu/qemu_agent.c | 31 +++++++++++++++++++------------ src/qemu/qemu_driver.c | 10 +++------- tools/virsh-domain.c | 3 +++ 4 files changed, 32 insertions(+), 21 deletions(-) -- 1.8.2.1

2 7

[libvirt] [PATCHv2] RPC: Support up to 16384 cpus on the host and 4096 in the guest
by Peter Krempa 03 Jun '13

03 Jun '13

The RPC limits for cpu maps didn't allow to use libvirt on ultra big boxes. This patch increases size of the limits to support a maximum of 16384 cpus on the host with a maximum of 4096 cpus per guest. The full cpu map of such a system takes 8 megabytes and the map for vcpu pinning is 2 kilobytes long. --- src/remote/remote_protocol.x | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 1ebbce7..9723377 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -82,13 +82,13 @@ const REMOTE_DOMAIN_ID_LIST_MAX = 16384; const REMOTE_DOMAIN_NAME_LIST_MAX = 16384; /* Upper limit on cpumap (bytes) passed to virDomainPinVcpu. */ -const REMOTE_CPUMAP_MAX = 256; +const REMOTE_CPUMAP_MAX = 2048; /* Upper limit on number of info fields returned by virDomainGetVcpus. */ -const REMOTE_VCPUINFO_MAX = 2048; +const REMOTE_VCPUINFO_MAX = 16384; /* Upper limit on cpumaps (bytes) passed to virDomainGetVcpus. */ -const REMOTE_CPUMAPS_MAX = 16384; +const REMOTE_CPUMAPS_MAX = 8388608; /* Upper limit on migrate cookie. */ const REMOTE_MIGRATE_COOKIE_MAX = 16384; -- 1.8.2.1

2 2

[libvirt] [PATCH v3] conf: Generate address for scsi host device automatically
by Osier Yang 03 Jun '13

03 Jun '13

With unknown good reasons, the attribute "bus" of scsi device address is always set to 0, same for attribute "target". (See virDomainDiskDefAssignAddress). Though we might need to change the algorithm to honor "bus" and "target" too, that's a different issue. The address generator for scsi host device in this patch just follows the unknown good reasons, only considering the "controller" and "unit". It walks through all scsi controllers and their units, to see if the address $controller:0:0:$unit can be used (if not used by any disk or scsi host device yet), if found one, it sits on it, otherwise, it creates a new controller (actually the controller is implicitly created by someone else), and sits on $new_controller:0:0:0 instead. --- v2 - v3: * Improve the for loop a bit with John's suggestion v1 - v2: * A new helper virDomainSCSIDriveAddressIsUsed * Move virDomainDefMaybeAddHostdevSCSIcontroller * More comments * Add testing. * problems fixed with the testing: 1) s/nscsi_controllers + 1/nscsi_controllers/, 2) Add the controller implicitly after a scsi hostdev def parsing, as it can use a new scsi controller index (nscsi_controllers), which should be added implicitly. --- src/conf/domain_conf.c | 202 ++++++++++++++++++--- .../qemuxml2argv-hostdev-scsi-autogen-address.xml | 95 ++++++++++ ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 106 +++++++++++ tests/qemuxml2xmltest.c | 2 + 4 files changed, 375 insertions(+), 30 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-autogen-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2b4e160..46d49a2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3782,6 +3782,141 @@ cleanup: return ret; } +/* Check if a drive type address $controller:0:0:$unit is already + * taken by a disk or not. + */ +static bool +virDomainDriveAddressIsUsedByDisk(virDomainDefPtr def, + enum virDomainDiskBus type, + unsigned int controller, + unsigned int unit) +{ + virDomainDiskDefPtr disk; + int i; + + for (i = 0; i < def->ndisks; i++) { + disk = def->disks[i]; + + if (disk->bus != type || + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) + continue; + + if (disk->info.addr.drive.controller == controller && + disk->info.addr.drive.unit == unit && + disk->info.addr.drive.bus == 0 && + disk->info.addr.drive.target == 0) + return true; + } + + return false; +} + +/* Check if a drive type address $controller:0:0:$unit is already + * taken by a host device or not. + */ +static bool +virDomainDriveAddressIsUsedByHostdev(virDomainDefPtr def, + enum virDomainHostdevSubsysType type, + unsigned int controller, + unsigned int unit) +{ + virDomainHostdevDefPtr hostdev; + int i; + + for (i = 0; i < def->nhostdevs; i++) { + hostdev = def->hostdevs[i]; + + if (hostdev->source.subsys.type != type) + continue; + + if (hostdev->info->addr.drive.controller == controller && + hostdev->info->addr.drive.unit == unit && + hostdev->info->addr.drive.bus == 0 && + hostdev->info->addr.drive.target == 0) + return true; + } + + return false; +} + +static bool +virDomainSCSIDriveAddressIsUsed(virDomainDefPtr def, + unsigned int controller, + unsigned int unit) +{ + /* In current implementation, the maximum unit number of a controller + * is either 16 or 7 (narrow SCSI bus), and if the maximum unit number + * is 16, the controller itself is on unit 7 */ + if (unit == 7) + return true; + + if (virDomainDriveAddressIsUsedByDisk(def, VIR_DOMAIN_DISK_BUS_SCSI, + controller, unit) || + virDomainDriveAddressIsUsedByHostdev(def, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI, + controller, unit)) + return true; + + return false; +} + +/* Find out the next usable "unit" of a specific controller */ +static int +virDomainControllerSCSINextUnit(virDomainDefPtr def, + unsigned int max_unit, + unsigned int controller) +{ + int i; + + for (i = 0; i < max_unit; i++) { + if (!virDomainSCSIDriveAddressIsUsed(def, controller, i)) + return i; + } + + return -1; +} + +#define SCSI_WIDE_BUS_MAX_CONT_UNIT 16 +#define SCSI_NARROW_BUS_MAX_CONT_UNIT 7 + +static int +virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt, + virDomainDefPtr def, + virDomainHostdevDefPtr hostdev) +{ + int next_unit; + unsigned nscsi_controllers = 0; + bool found = false; + int i; + + if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) + return -1; + + for (i = 0; i < def->ncontrollers && !found; i++) { + if (def->controllers[i]->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + continue; + + nscsi_controllers++; + next_unit = virDomainControllerSCSINextUnit(def, + xmlopt->config.hasWideScsiBus ? + SCSI_WIDE_BUS_MAX_CONT_UNIT : + SCSI_NARROW_BUS_MAX_CONT_UNIT, + def->controllers[i]->idx); + if (next_unit >= 0) + found = true; + } + + hostdev->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; + + hostdev->info->addr.drive.controller = found ? + def->controllers[i - 1]->idx : + nscsi_controllers; + hostdev->info->addr.drive.bus = 0; + hostdev->info->addr.drive.target = 0; + hostdev->info->addr.drive.unit = found ? next_unit : 0; + + return 0; +} + static int virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, xmlXPathContextPtr ctxt, @@ -8802,7 +8937,9 @@ error: } static virDomainHostdevDefPtr -virDomainHostdevDefParseXML(const xmlNodePtr node, +virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt, + virDomainDefPtr vmdef, + const xmlNodePtr node, xmlXPathContextPtr ctxt, virHashTablePtr bootHash, unsigned int flags) @@ -8862,7 +8999,9 @@ virDomainHostdevDefParseXML(const xmlNodePtr node, } break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: - if (def->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + if (def->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + virDomainHostdevAssignAddress(xmlopt, vmdef, def) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", _("SCSI host devices must have address specified")); goto error; @@ -9271,8 +9410,8 @@ virDomainDeviceDefParse(const char *xmlStr, goto error; } else if (xmlStrEqual(node->name, BAD_CAST "hostdev")) { dev->type = VIR_DOMAIN_DEVICE_HOSTDEV; - if (!(dev->data.hostdev = virDomainHostdevDefParseXML(node, ctxt, NULL, - flags))) + if (!(dev->data.hostdev = virDomainHostdevDefParseXML(xmlopt, def, node, + ctxt, NULL, flags))) goto error; } else if (xmlStrEqual(node->name, BAD_CAST "controller")) { dev->type = VIR_DOMAIN_DEVICE_CONTROLLER; @@ -10255,6 +10394,30 @@ error: return NULL; } +static int +virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDefPtr def) +{ + /* Look for any hostdev scsi dev */ + int i; + int maxController = -1; + virDomainHostdevDefPtr hostdev; + + for (i = 0; i < def->nhostdevs; i++) { + hostdev = def->hostdevs[i]; + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && + (int)hostdev->info->addr.drive.controller > maxController) { + maxController = hostdev->info->addr.drive.controller; + } + } + + for (i = 0; i <= maxController; i++) { + if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, i, -1) < 0) + return -1; + } + + return 0; +} static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, @@ -11618,7 +11781,8 @@ virDomainDefParseXML(xmlDocPtr xml, for (i = 0; i < n; i++) { virDomainHostdevDefPtr hostdev; - hostdev = virDomainHostdevDefParseXML(nodes[i], ctxt, bootHash, flags); + hostdev = virDomainHostdevDefParseXML(xmlopt, def, nodes[i], + ctxt, bootHash, flags); if (!hostdev) goto error; @@ -11631,6 +11795,9 @@ virDomainDefParseXML(xmlDocPtr xml, } def->hostdevs[def->nhostdevs++] = hostdev; + + if (virDomainDefMaybeAddHostdevSCSIcontroller(def) < 0) + goto error; } VIR_FREE(nodes); @@ -13232,31 +13399,6 @@ virDomainDefMaybeAddSmartcardController(virDomainDefPtr def) return 0; } -static int -virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDefPtr def) -{ - /* Look for any hostdev scsi dev */ - int i; - int maxController = -1; - virDomainHostdevDefPtr hostdev; - - for (i = 0; i < def->nhostdevs; i++) { - hostdev = def->hostdevs[i]; - if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && - (int)hostdev->info->addr.drive.controller > maxController) { - maxController = hostdev->info->addr.drive.controller; - } - } - - for (i = 0; i <= maxController; i++) { - if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, i, -1) < 0) - return -1; - } - - return 0; -} - /* * Based on the declared <address/> info for any devices, * add necessary drive controllers which are not already present diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-autogen-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-autogen-address.xml new file mode 100644 index 0000000..21f112b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-autogen-address.xml @@ -0,0 +1,95 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host0'/> + <address bus='0' target='0' unit='0'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host1'/> + <address bus='0' target='0' unit='1'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host2'/> + <address bus='0' target='0' unit='2'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host3'/> + <address bus='0' target='0' unit='3'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host4'/> + <address bus='0' target='0' unit='4'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host5'/> + <address bus='0' target='0' unit='5'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host6'/> + <address bus='0' target='0' unit='6'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host7'/> + <address bus='0' target='0' unit='7'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host8'/> + <address bus='0' target='0' unit='8'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host9'/> + <address bus='0' target='0' unit='9'/> + </source> + <address type='drive' controller='1' bus='0' target='0' unit='5'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host10'/> + <address bus='0' target='0' unit='10'/> + </source> + </hostdev> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml new file mode 100644 index 0000000..e416654 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml @@ -0,0 +1,106 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='scsi' index='1'/> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host0'/> + <address bus='0' target='0' unit='0'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host1'/> + <address bus='0' target='0' unit='1'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host2'/> + <address bus='0' target='0' unit='2'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host3'/> + <address bus='0' target='0' unit='3'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='3'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host4'/> + <address bus='0' target='0' unit='4'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='4'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host5'/> + <address bus='0' target='0' unit='5'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='5'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host6'/> + <address bus='0' target='0' unit='6'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='6'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host7'/> + <address bus='0' target='0' unit='7'/> + </source> + <address type='drive' controller='1' bus='0' target='0' unit='0'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host8'/> + <address bus='0' target='0' unit='8'/> + </source> + <address type='drive' controller='1' bus='0' target='0' unit='1'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host9'/> + <address bus='0' target='0' unit='9'/> + </source> + <address type='drive' controller='1' bus='0' target='0' unit='5'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host10'/> + <address bus='0' target='0' unit='10'/> + </source> + <address type='drive' controller='1' bus='0' target='0' unit='2'/> + </hostdev> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 64a271c..06e4206 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -298,6 +298,8 @@ mymain(void) DO_TEST("hostdev-scsi-shareable"); DO_TEST("hostdev-scsi-sgio"); + DO_TEST_DIFFERENT("hostdev-scsi-autogen-address"); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 1.8.1.4

4 8

[libvirt] [PATCH] spec: Explicitly require gcrypt-devel
by Jiri Denemark 03 Jun '13

03 Jun '13

Our configure.ac says: Not all versions of gnutls include -lgcrypt, and so we add it explicitly for the calls to gcry_control/check_version Thus we cannot rely on gnutls-devel to bring grcypt-devel as a dependency. --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 37d656d..6aea8f4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -418,6 +418,7 @@ BuildRequires: readline-devel BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: libtasn1-devel +BuildRequires: gcrypt-devel BuildRequires: gnutls-devel BuildRequires: libattr-devel %if %{with_libvirtd} -- 1.8.2.1

2 3

[libvirt] [PATCH] virsh iface-bridge: Ignore delay if stp is turned off
by Jiri Denemark 03 Jun '13

03 Jun '13

Delay only makes sense with STP enabled. --- tools/virsh-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 1c2e40b..2bdb215 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -894,7 +894,7 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if ((delay || stp) && + if (stp && ((virAsprintf(&delay_str, "%d", delay) < 0) || !xmlSetProp(br_node, BAD_CAST "delay", BAD_CAST delay_str))) { vshError(ctl, _("Failed to set bridge delay %d in xml document"), delay); -- 1.8.2.1

2 2

[libvirt] [PATCH] Fix warning about using an uninitialized next_unit value
by Jiri Denemark 03 Jun '13

03 Jun '13

Using an uninitialized value and a bool saying if the value is valid may confuse compilators. --- src/conf/domain_conf.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 46d49a2..6dc8cf3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3883,26 +3883,28 @@ virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt, virDomainDefPtr def, virDomainHostdevDefPtr hostdev) { - int next_unit; + int next_unit = 0; unsigned nscsi_controllers = 0; - bool found = false; int i; + int ret; if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) return -1; - for (i = 0; i < def->ncontrollers && !found; i++) { + for (i = 0; i < def->ncontrollers; i++) { if (def->controllers[i]->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) continue; nscsi_controllers++; - next_unit = virDomainControllerSCSINextUnit(def, - xmlopt->config.hasWideScsiBus ? - SCSI_WIDE_BUS_MAX_CONT_UNIT : - SCSI_NARROW_BUS_MAX_CONT_UNIT, - def->controllers[i]->idx); - if (next_unit >= 0) - found = true; + ret = virDomainControllerSCSINextUnit(def, + xmlopt->config.hasWideScsiBus ? + SCSI_WIDE_BUS_MAX_CONT_UNIT : + SCSI_NARROW_BUS_MAX_CONT_UNIT, + def->controllers[i]->idx); + if (ret >= 0) { + next_unit = ret; + break; + } } hostdev->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; @@ -3912,7 +3914,7 @@ virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt, nscsi_controllers; hostdev->info->addr.drive.bus = 0; hostdev->info->addr.drive.target = 0; - hostdev->info->addr.drive.unit = found ? next_unit : 0; + hostdev->info->addr.drive.unit = next_unit; return 0; } -- 1.8.2.1

3 5

[libvirt] [PATCH] use virBitmapFree instead of VIR_FREE for cpumask
by Ján Tomko 03 Jun '13

03 Jun '13

Found by 'git grep FREE.*cpumask' after looking at 31f1f6b. --- src/conf/domain_conf.c | 2 +- src/libxl/libxl_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 46d49a2..b335b58 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13542,7 +13542,7 @@ virDomainVcpuPinDel(virDomainDefPtr def, int vcpu) for (n = 0; n < def->cputune.nvcpupin; n++) { if (vcpupin_list[n]->vcpuid == vcpu) { - VIR_FREE(vcpupin_list[n]->cpumask); + virBitmapFree(vcpupin_list[n]->cpumask); VIR_FREE(vcpupin_list[n]); memmove(&vcpupin_list[n], &vcpupin_list[n+1], diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7245f97..bed583b 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -651,7 +651,7 @@ libxlVmCleanup(libxlDriverPrivatePtr driver, /* Remove any cputune settings */ if (vm->def->cputune.nvcpupin) { for (i = 0; i < vm->def->cputune.nvcpupin; ++i) { - VIR_FREE(vm->def->cputune.vcpupin[i]->cpumask); + virBitmapFree(vm->def->cputune.vcpupin[i]->cpumask); VIR_FREE(vm->def->cputune.vcpupin[i]); } VIR_FREE(vm->def->cputune.vcpupin); -- 1.8.1.5

3 3

[libvirt] [PATCH 0/3] virsh: Add --live, --config, --current to attach-* commands too
by Peter Krempa 03 Jun '13

03 Jun '13

In commit 69ce3ffa8d431e9810607c6e00b7cfcc481b491d a pattern was established to upgrade hotplug commands in virsh. The series containing the patch forgot to upgrade the attach-* commands too. Peter Krempa (3): virsh-domain: Add --live, --config, --current logic to cmdAttachDevice virsh-domain: Add --live, --config, --current logic to cmdAttachDisk virsh-domain: Add --live, --config, --current logic to cmdAttachInterface tools/virsh-domain.c | 153 ++++++++++++++++++++++++++++++++++++--------------- tools/virsh.pod | 63 ++++++++++++++------- 2 files changed, 153 insertions(+), 63 deletions(-) -- 1.8.2.1

2 8

[libvirt] [PATCH 00/11] vCPU hotplug mega-series
by Peter Krempa 03 Jun '13

03 Jun '13

This patch series consists of multiple parts: -patch 1,2: Two trivial cleanups -patch 3: Improve and refactor vCPU data parsing -patch 4: Add agent monitor helpers for cpu-hotplug stuff -patch 5,6,7: Implement universal guest vCPU mapping function -patch 8: Implement new qemu monitor command for cpu hotplug -patch 9,10,11: Implement agent based cpu state manipulation API/command Tip: The new "virsh vcpumap guest --active" command may be used that the agent actually offlined the vCPU in the guest. Peter Krempa (11): virsh-domain-monitor: Remove ATTRIBUTE_UNUSED from a argument qemu: Use bool instead of int in qemuMonitorSetCPU APIs qemu: Extract more information about vCPUs and threads qemu_agent: Introduce helpers for agent based CPU hot(un)plug lib: Add API to map virtual cpus of a guest virsh-domain-monitor: Implement command to map guest vCPUs qemu: Implement virDomainGetVCPUMap for the qemu driver qemu: Implement new QMP command for cpu hotplug lib: Add API to modify vCPU state from the guest using the guest agent virsh-domain: Implement command for virDomainSetGuestVcpu qemu: Implement virDomainSetGuetVcpu in qemu driver daemon/remote.c | 54 ++++++++ include/libvirt/libvirt.h.in | 25 ++++ python/generator.py | 1 + python/libvirt-override-api.xml | 7 + python/libvirt-override.c | 66 ++++++++++ src/driver.h | 14 ++ src/libvirt.c | 129 +++++++++++++++++++ src/libvirt_public.syms | 7 + src/qemu/qemu_agent.c | 148 +++++++++++++++++++++ src/qemu/qemu_agent.h | 12 ++ src/qemu/qemu_driver.c | 279 +++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.c | 11 +- src/qemu/qemu_monitor.h | 13 +- src/qemu/qemu_monitor_json.c | 86 ++++++++++--- src/qemu/qemu_monitor_json.h | 4 +- src/qemu/qemu_monitor_text.c | 94 ++++++++------ src/qemu/qemu_monitor_text.h | 4 +- src/qemu/qemu_process.c | 63 ++++++--- src/remote/remote_driver.c | 48 +++++++ src/remote/remote_protocol.x | 31 ++++- src/remote_protocol-structs | 20 +++ tools/virsh-domain-monitor.c | 112 +++++++++++++++- tools/virsh-domain.c | 77 +++++++++++ tools/virsh.pod | 29 +++++ 24 files changed, 1224 insertions(+), 110 deletions(-) -- 1.8.2.1

1 12

[libvirt] [PATCH] usb: don't spoil decadic addresses
by Martin Kletzander 03 Jun '13

03 Jun '13

For USB devices, dev->name gets formated as %.3o:%.3o even though the numbers are decadic. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=967712 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: It can be seen few lines down the file src/util/virusb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virusb.c b/src/util/virusb.c index 27ba9c7..d34e44f 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -342,10 +342,10 @@ virUSBDeviceNew(unsigned int bus, dev->bus = bus; dev->dev = devno; - if (snprintf(dev->name, sizeof(dev->name), "%.3o:%.3o", + if (snprintf(dev->name, sizeof(dev->name), "%.3d:%.3d", dev->bus, dev->dev) >= sizeof(dev->name)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("dev->name buffer overflow: %.3o:%.3o"), + _("dev->name buffer overflow: %.3d:%.3d"), dev->bus, dev->dev); virUSBDeviceFree(dev); return NULL; -- 1.8.2.1

2 2

[libvirt] [PATCH] RPC: Support up to 4096 cpus on the host and 256 in the guest
by Peter Krempa 03 Jun '13

03 Jun '13

The RPC limits for cpu maps didn't allow to use libvirt on ultra big boxes. This patch increases size of the limits to support a maximum of 4096 cpus on the host with the built-in maximum of 256 cpus per guest. The full cpu map of such a system takes 128 kilobytes and the map for vcpu pinning is 512 bytes long. --- src/remote/remote_protocol.x | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 1ebbce7..a94e0db 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -82,13 +82,13 @@ const REMOTE_DOMAIN_ID_LIST_MAX = 16384; const REMOTE_DOMAIN_NAME_LIST_MAX = 16384; /* Upper limit on cpumap (bytes) passed to virDomainPinVcpu. */ -const REMOTE_CPUMAP_MAX = 256; +const REMOTE_CPUMAP_MAX = 512; /* Upper limit on number of info fields returned by virDomainGetVcpus. */ -const REMOTE_VCPUINFO_MAX = 2048; +const REMOTE_VCPUINFO_MAX = 4096; /* Upper limit on cpumaps (bytes) passed to virDomainGetVcpus. */ -const REMOTE_CPUMAPS_MAX = 16384; +const REMOTE_CPUMAPS_MAX = 131072; /* Upper limit on migrate cookie. */ const REMOTE_MIGRATE_COOKIE_MAX = 16384; -- 1.8.2.1

3 4

[libvirt] Ongoing work on lock contention in qemu driver?
by Peter Feiner 03 Jun '13

03 Jun '13

Hello Daniel, I've been working on improving scalability in OpenStack on libvirt+kvm for the last couple of months. I'm particularly interested in reducing the time it takes to create VMs when many VMs are requested in parallel. One apparent bottleneck during virtual machine creation is libvirt. As more VMs are created in parallel, some libvirt calls (i.e., virConnectGetLibVersion and virDomainCreateWithFlags) take longer without a commensurate increase in hardware utilization. Thanks to your patches in libvirt-1.0.3, the situation has improved. Some libvirt calls OpenStack makes during VM creation (i.e., virConnectDefineXML) have no measurable slowdown when many VMs are created in parallel. In turn, parallel VM creation in OpenStack is significantly faster with libvirt-1.0.3. On my standard benchmark (create 20 VMs in parallel, wait until the VM is ACTIVE, which is essentially after virDomainCreateWithFlags returns), libvirt-1.0.3 reduces the median creation time from 90s to 60s when compared to libvirt-0.9.8. I'd like to know if your concurrency work in the qemu driver is ongoing. If it isn't, I'd like to pick the work up myself and work on further improvements. Any advice or insight would be appreciated. Thanks! Peter Feiner

2 8

[libvirt] [PATCH 1/2] Make virNetDevSetupControl() public.
by Roman Bogorodskiy 03 Jun '13

03 Jun '13

This method is useful not only in virnetdev.c. --- src/libvirt_private.syms | 1 + src/util/virnetdev.c | 15 +++++++++++++-- src/util/virnetdev.h | 12 ++++++++++++ src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevvportprofile.c | 2 +- 5 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cc734da..d65ecc1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1526,6 +1526,7 @@ virNetDevSetMTUFromDevice; virNetDevSetName; virNetDevSetNamespace; virNetDevSetOnline; +virNetDevSetupControl; virNetDevValidateConfig; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index cee4001..f658c6d 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -88,11 +88,22 @@ static int virNetDevSetupControlFull(const char *ifname, } -static int virNetDevSetupControl(const char *ifname, - struct ifreq *ifr) +int +virNetDevSetupControl(const char *ifname, + struct ifreq *ifr) { return virNetDevSetupControlFull(ifname, ifr, VIR_NETDEV_FAMILY, SOCK_DGRAM); } +#else +int +virNetDevSetupControl(const char *ifname ATTRIBUTE_UNUSED, + void *ifr ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("%s is not supported on this platform"), + __func__); + return -1; +} #endif diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index bc0777c..73c267f 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -23,11 +23,23 @@ #ifndef __VIR_NETDEV_H__ # define __VIR_NETDEV_H__ +# include <config.h> +# include <net/if.h> + # include "virsocketaddr.h" # include "virnetlink.h" # include "virmacaddr.h" # include "virpci.h" +#ifdef HAVE_STRUCT_IFREQ +int virNetDevSetupControl(const char *ifname, + struct ifreq *ifr) + ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +#else +int virNetDevSetupControl(const char *ifname, + void *ifr); +#endif + int virNetDevExists(const char *brname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 5316520..d5d36e4 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -48,7 +48,7 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST, # include <sys/socket.h> # include <sys/ioctl.h> -# include <linux/if.h> +# include <net/if.h> # include <linux/if_tun.h> /* Older kernels lacked this enum value. */ diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 883aa46..71aae24 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -49,7 +49,7 @@ VIR_ENUM_IMPL(virNetDevVPortProfileOp, VIR_NETDEV_VPORT_PROFILE_OP_LAST, # include <sys/socket.h> # include <sys/ioctl.h> -# include <linux/if.h> +# include <net/if.h> # include <linux/if_tun.h> # include "virnetlink.h" -- 1.7.11.5

3 3

[libvirt] Release of libvirt-1.0.6
by Daniel Veillard 03 Jun '13

03 Jun '13

According to plans, the release is available, I tagged it in git and the tarball and rpms should be available shortly on the FTP: ftp://libvirt.org/libvirt/ This is a fairly large release considering the number of commits which went in, this is due in part to a lot of refactoring of the code base. This still seem an homogenous release with a large set of bug fixes, a few new user visible features, and a very large amount of incremental improvements. There have been significant updates at the localization and documentation level too ! Features: - Move VirtualBox driver into libvirtd (Daniel P. Berrange) - Support for static routes on a virtual bridge (Gene Czarcinski) - Various improvement for hostdev SCSI support (Osier Yang and Han Cheng) - Switch to VIR_STRDUP and VIR_STRNDUP (Michal Privoznik) - Various cleanups and improvement in Xen and LXC drivers (Daniel P. Berrange) Documentation: - Document that runtime changes may be lost after S4 suspend (Jiri Denemark) - domain: /dev/urandom isn't a valid rng patch (Cole Robinson) - formatdomain: fix links in the table of contents (Ján Tomko) - add another user (Eric Blake) - datatypes: fix virGetStoragePool's comment (Ján Tomko) - Expand documentation for LXC driver (Daniel P. Berrange) - Fix/update syntax in Sysinfo/SMBIOS description (John Ferlan) - Update formatdomain for lifecycle events (John Ferlan) - Fix the wrong links in secret documentation (Osier Yang) - Add the missed usage type 'iscsi' (Osier Yang) - Add docs about cgroups layout and usage (Daniel P. Berrange) - Point users to Virt-Viewer MSI installers for Windows builds (Daniel P. Berrange) - Fix namespace bugs in API docs, todo page & hv support page (Daniel P. Berrange) - Fix a few more docs XSL bugs related to the TOC (Daniel P. Berrange) - Fix docs generator regression in previous commit (Daniel P. Berrange) - Fix multiple formatting problems in HTML docs (Daniel P. Berrange) - fix 'since' for socket path generation (Ján Tomko) Portability: - vbox: define DYNLIB_NAME for kFreeBSD (Guido Günther) - build: skip qemu in tests when !WITH_QEMU (Eric Blake) - build: use correct rpc.h for virtlockd (Eric Blake) - build: work around cygwin header bug (Eric Blake) - build: cast [ug]id_t when printing (Eric Blake) - build: port qemu to cygwin (Eric Blake) - build: use correct rpc.h for lockd (Eric Blake) - build: work around broken sasl header (Eric Blake) - build: fix build without libvirtd (Eric Blake) - build: fix build with newer gnutls (Eric Blake) - build: fix build with older gcc (Eric Blake) - qemu: Fix build without gnutls (Jiri Denemark) - spec: Build vbox packages only for x86 architectures (Viktor Mihajlovski) - Add missing c-ctype.h to virfile.c (Daniel P. Berrange) - test: fix VPATH fchosttest failure (Viktor Mihajlovski) - libxl: fix build with Xen4.3 (Jim Fehlig) - build: Fix check-driverimpls in VPATH (Jiri Denemark) - util: Fix build without devmapper (Jiri Denemark) - FreeBSD: disable buggy -fstack-protector-all (Roman Bogorodskiy) - build: avoid gcrypt deprecation warnings (Roman Bogorodskiy) - build: avoid shadowed variable in fdstreamtest (Eric Blake) - fix virNetDevSetMAC and virNetDevExists on BSD (Roman Bogorodskiy) - Disable some URI tests on older libxml2 (Daniel P. Berrange) - Fix build of python bindings on Python 2.4 (Daniel P. Berrange) - build: fix build with old polkit0 (Jim Fehlig) - Fixup rpcgen code on kFreeBSD too (Guido Günther) - build: avoid non-portable cast of pthread_t (Eric Blake) - build: Fix build when WITH_HAL is defined (Jim Fehlig) - build: fix mingw build of vbox (Eric Blake) - build: fix mingw build of virprocess.c (Eric Blake) - build: fix FreeBSD build (Eric Blake) Bug Fixes: - conf: Generate address for scsi host device automatically (Osier Yang) - qemu: prevent termination of guests w/hostdev on driver reconnect (Laine Stump) - qemu: escape literal IPv6 address in NBD migration (Ján Tomko) - Check for existence of interface prior to setting terminate flag (John Ferlan) - Resolve memory leak found by valgrind (John Ferlan) - qemu: snapshot: Don't kill access to disk if snapshot creation fails (Peter Krempa) - virsh: migrate: Don't disallow --p2p and --migrateuri (Cole Robinson) - qemu: Don't report error on successful media eject (Cole Robinson) - qemu: save domain state to XML after reboot (Sergey Fionov) - esx: Fix dynamic VI object type detection (Matthias Bolte) - storage_conf: Don't leak "uuid" in virStoragePoolDefParseAuthCephx (Osier Yang) - storage_conf: Fix the wrong error message (Osier Yang) - Fix blkdeviotune for shutoff domain (Martin Kletzander) - virsh: Fix regression of vol-resize (Osier Yang) - xen: Resolve Coverity FORWARD_NULL issue (John Ferlan) - qemu: fix NBD migration to hosts with IPv6 enabled (Ján Tomko) - conf: fix use after free in virChrdevOpen (Ján Tomko) - virNetMessageSaveError: Fix copy and paste error (Michal Privoznik) - virNWFilterHashTablePut: Free the correct variable (Michal Privoznik) - umlConnectTapDevice: initialize tapfd variable (Michal Privoznik) - remote: fix dom->id after virDomainCreateWithFlags (Marek Marczykowski) - virsh: Fix virDomainFree for NULL domain in blkdeviotune (Martin Kletzander) - virNetDevTapCreate: Fail on systems not supporting IFF_MULTI_QUEUE (Michal Privoznik) - cgroup: be robust against cgroup movement races (Eric Blake) - shunloadtest: Resolve Coverity CHECKED_RETURN error (John Ferlan) - xencapstest: Resolve Coverity CHECKED_RETURN error (John Ferlan) - qemu: fix a typo in qemuAddSharedDevice (Guannan Ren) - qemuDomainChangeEjectableMedia: Unlock domain while waiting for event (Michal Privoznik) - LXC: fix memory leak in virLXCControllerSetupDevPTS (Gao feng) - LXC: remove unnecessary check on root filesystem (Gao feng) - esx: Fix error reporting in esxVI_LookupManagedObjectHelper (Matthias Bolte) - Fix failure to detect missing cgroup partitions (Daniel P. Berrange) - libxl: fix leaking libxl events (Jim Fehlig) - qemu: Fix cgroup handling when setting VCPU BW (Martin Kletzander) - Don't mount selinux fs in LXC if selinux is disabled (Daniel P. Berrange) - Fix LXC startup when /var/run is an absolute symlink (Daniel P. Berrange) - conf: Fix the bug of disk->copy_on_read formating (Osier Yang) - daemon: fix leak after listing all volumes (Ján Tomko) - qemu: Fix crash in migration of graphics-less guests. (Viktor Mihajlovski) - Adjust improperly formatted <sysinfo> uuid (John Ferlan) - storage: Ensure 'qemu-img resize' size arg is a 512 multiple (Christophe Fergeau) - spec: fix outdated comment (Eric Blake) - Forbid use of ':' in RBD pool names (Daniel P. Berrange) - qemu: fix bad free (Eric Blake) - Fix starting domains when kernel has no cgroups support (Jim Fehlig) - Fix error handling of readdir() in virFileLoopDeviceOpen (Daniel P. Berrange) - util: Fix regression introduced by commit 4360a098441 (Osier Yang) - util: Fix regression of wwn reading (Osier Yang) - build: fix use of mmap (Eric Blake) - conf: don't crash on a tpm device with no backends (Ján Tomko) - don't mention disk controllers in generic controller errors (Ján Tomko) - iscsi: don't leak portal string when starting a pool (Ján Tomko) - virsh: Resolve Coverity 'MISSING_BREAK' (John Ferlan) - lxc: Coverity false positive USE_AFTER_FREE (John Ferlan) - Don't allow renaming of domains by the backdoor (Daniel P. Berrange) - qemu: fix stupid typos in VFIO cgroup setup/teardown (Laine Stump) - Ignore 'uri' parameter in lockd driver (Daniel P. Berrange) - network: fix network driver startup for qemu:///session (Laine Stump) - Fix warning about unsupported cookie flags in QEMU driver (Daniel P. Berrange) - Fix release of resources with lockd plugin (Daniel P. Berrange) - Fix F_DUPFD_CLOEXEC operation args (Daniel P. Berrange) - build: fix make rpm failure (Laine Stump) - Fix potential use of undefined variable in remote dispatch code (Daniel P. Berrange) - virInitctlRequest: unbreak make syntax check (Guido Günther) - virInitctlRequest: unbreak make syntax check (Guido Günther) Improvements: - nodedev_hal: Modernize the function's style (Osier Yang) - Introduce virFilePrintf() as a portable fprintf() (Daniel P. Berrange) - qemu: migration: error if tunnelled + storage specified (Cole Robinson) - qemu: migration: Improve p2p error if we can't open conn (Cole Robinson) - storage_conf: Use uid_t/gid_t instead of int to cast the value (Osier Yang) - storage_conf: Improve error messages (Osier Yang) - storage_conf: Use NULLSTR instead (Osier Yang) - storage_conf: Improve the memory deallocation of virStorageVolDefParseXML (Osier Yang) - storage_conf: Improve the memory deallocation of pool def parsing (Osier Yang) - syntax: fix broken error message in previous patch (Eric Blake) - util: fix the VIR_STRDUP when src is NULL (yangdongsheng) - Adapt to new VIR_STRNDUP behavior (Michal Privoznik) - virStrndup: Accept negative values as string length (Michal Privoznik) - storage_conf: Fix the error type (Osier Yang) - storage_conf: Put "%s" at the same line with error type (Osier Yang) - storage_conf: Use xmlStrEqual instead of STREQ (Osier Yang) - storage_conf: Remove the useless casting (Osier Yang) - syntax-check: ignore all quoted strings in bracket-spacing (Ján Tomko) - nwfilter: Remove error report in virNWFilterDHCPSnoopEnd (Stefan Berger) - cgroups: Do not enforce nonexistent controllers (Viktor Mihajlovski) - Introduce syntax-check rule to prefer VIR_STRDUP over strdup (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in tools/virsh.c (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/util/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/util/vircgroup.c (Michal Privoznik) - virCgroupAddTaskStrController: s/-1/-ENOMEM/ (Michal Privoznik) - conf: add missing OOM errors (Ján Tomko) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/xenxs/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/xenapi/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/xen/* (Michal Privoznik) - Fix the build failure (Osier Yang) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/security/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/rpc/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/remote/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/qemu/* (Michal Privoznik) - virsh: omit OPTION section in 'virsh help' if no option exists (Zhang Xiaohe) - Change virConnectDomainEventGraphicsCallback signature (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/openvz/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/conf/* (Michal Privoznik) - qemu: Enable multiqueue network (Michal Privoznik) - qemu: Adapt qemuBuildInterfaceCommandLine to to multiqueue net (Michal Privoznik) - qemu: Move interface cmd line construction into a separate function (Michal Privoznik) - Introduce /domain/devices/interface/driver/@queues attribute (Michal Privoznik) - qemu: add ', share=<policy>' to qemu commandline (Guannan Ren) - conf: add 'sharePolicy' attribute to graphics element for vnc (Guannan Ren) - qemu: new vnc display sharing policy caps flag (Guannan Ren) - vbox: fix VIR_STRDUP value check (Ján Tomko) - syntax-check: Add the rule to forbid whitespace before ";" (Osier Yang) - Fix the syntax-check failure (Osier Yang) - interface: list all interfaces with flags == 0 (Guannan Ren) - Convert Xen domain core dump driver methods to use virDomainDefPtr (Daniel P. Berrange) - Convert Xen domain stats/peek driver methods to use virDomainDefPtr (Daniel P. Berrange) - Convert Xen domain scheduler driver methods to use virDomainDefPtr (Daniel P. Berrange) - Convert Xen domain autostart driver methods to use virDomainDefPtr (Daniel P. Berrange) - Convert Xen domain device hotplug driver methods to use virDomainDefPtr (Daniel P. Berrange) - Convert Xen domain VCPU driver methods to use virDomainDefPtr (Daniel P. Berrange) - Convert Xen domain create/define/getxml/migration APIs to use virDomainDefPtr (Daniel P. Berrange) - Convert Xen domain managed save driver methods to use virDomainDefPtr (Daniel P. Berrange) - Convert Xen domain property driver methods to use virDomainDefPtr (Daniel P. Berrange) - Convert Xen domain lifecycle driver methods to use virDomainDefPtr (Daniel P. Berrange) - Convert Xen domain lookup driver methods to use virDomainDefPtr (Daniel P. Berrange) - qemu: Don't remove the "return 0" (Osier Yang) - esx: Replace almost all esxVI_String_DeepCopyValue vith VIR_STRDUP (Matthias Bolte) - vmware: Restore OOM error reporting in vmwareCopyVMXFileName (Matthias Bolte) - maint: enforce correct copyright usage (Eric Blake) - maint: refer to correct license file (Eric Blake) - maint: follow recommended practice for using LGPL (Eric Blake) - maint: use LGPL correctly (Eric Blake) - openvzDomainSetNetwork: use virCommand (Michal Privoznik) - qemu: Add callback struct for qemuBuildCommandLine (Osier Yang) - storage_conf: Improve the coding style in storage_conf.h (Osier Yang) - storage_conf: Fix indentions in storage_conf.c (Osier Yang) - storage_conf: Fix the coding stype in storage_conf.c (Osier Yang) - qemu: Abstract code for cpuset controller setting into a helper (Osier Yang) - qemu: Abstract code for devices controller setting into a helper (Osier Yang) - qemu: Abstract code for memory controller setting into a helper (Osier Yang) - qemu: Abstract the code for blkio controller setting into a helper (Osier Yang) - Add libvirt-daemon-vbox & libvirt-daemon-driver-vbox RPMs (Daniel P. Berrange) - Include GNULIB mkdtemp module (Daniel P. Berrange) - Set PKG_CONFIG_LIBDIR in autobuild.sh (Daniel P. Berrange) - qemu: report useful error failling to destroy domain gracefully (Guannan Ren) - qemu: Check conflicts for shared scsi host device (Osier Yang) - Re-add selinux/selinux.h to lxc_container.c (Daniel P. Berrange) - schema: make source optional in volume XML (Ján Tomko) - schema: require target path in storage pool xml (Ján Tomko) - qemu: Change values of disk discard (Osier Yang) - qemu: Implement support for locking domain's memory pages (Jiri Denemark) - Add support for locking domain's memory pages (Jiri Denemark) - Fix build with VirtualBox (Jiri Denemark) - qemu: Set unpriv_sgio for scsi host device (Osier Yang) - qemu: Refactor qemuSetUnprivSGIO to support scsi host device (Osier Yang) - qemu: Move qemuSetUnprivSGIO into qemu_conf.c (Osier Yang) - conf: Introduce sgio for hostdev (Osier Yang) - Rename virDomainDiskSGIO to virDomainDeviceSGIO (Osier Yang) - qemu: Manage shared device entry for scsi host device (Osier Yang) - qemu: Refactor the helpers to track shared scsi host device (Osier Yang) - utils: Add a helper to get the device name that sg device mapped to (Osier Yang) - qemu: Rename qemu_driver->sharedDisks to qemu_driver->sharedDevices (Osier Yang) - conf: Introduce <shareable> for hostdev (Osier Yang) - string: test VIR_STRDUP (Eric Blake) - virsh: lookup interface by name or mac other than one by one (Guannan Ren) - nwfilter: check for inverted ctdir (Stefan Berger) - Validate the bios_date format for <sysinfo> (John Ferlan) - Remove obsolete skipRoot flag in LXC driver (Daniel P. Berrange) - Stop passing around old root directory prefix (Daniel P. Berrange) - Remove obsolete pivotRoot flag in LXC driver (Daniel P. Berrange) - qemu: Support discard for disk (Osier Yang) - Handle the domain event 'on_reboot' and 'on_poweroff' settings (John Ferlan) - Adjust comments to describe on_poweroff and on_reboot action (John Ferlan) - Adjust usage of qemu -no-reboot and -no-shutdown options (John Ferlan) - qemu: Add VNC WebSocket support (Martin Kletzander) - Add VNC WebSocket support (Martin Kletzander) - qemu: New XML to disable memory merge at guest startup (Osier Yang) - qemu: detect -machine mem-merge capability (Eric Blake) - Rename rbd-invalid.xml to rbd-no-colon.xml (Daniel P. Berrange) - tests: Add fchostdata in EXTRA_DIST (Osier Yang) - virsh: Pretty the output of qemu-agent-command (Osier Yang) - virsh: Use vshPrint instead of printf (Osier Yang) - Fix invalid argument reference in virnetdev.h (Martin Kletzander) - Don't duplicate compiler warning flags when linking (Daniel P. Berrange) - Only pass -export-dynamic to linker, not compiler (Daniel P. Berrange) - Correctly detect warning flags with clang (Daniel P. Berrange) - Ignore cast alignment warnings in inotify code for Xen. (Daniel P. Berrange) - Workaround issue with clang and inline functions with static vars (Daniel P. Berrange) - Ensure consistent enablement of gcc 'diagnostic' pragma (Daniel P. Berrange) - qemu: query command line options in QMP (Eric Blake) - qemu: simplify string cleanup (Eric Blake) - qemu: use bool in monitor struct (Eric Blake) - json: support removing a value from an object (Eric Blake) - Don't overwrite useful message when creating macvlan fails (Daniel P. Berrange) - Remove & ban use of select() for waiting for I/O (Daniel P. Berrange) - qemu: Add hotplug support for scsi host device (Han Cheng) - .gitignore: add fchosttest (Ján Tomko) - qemu: Refactor helpers for USB device attachment (Osier Yang) - Escaping leading '.' in cgroup names (Daniel P. Berrange) - qemu: Introduce activeScsiHostdevs list for scsi host devices (Han Cheng) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/vbox/* (Michal Privoznik) - Support NBD backed disks/filesystems in LXC driver (Daniel P. Berrange) - Add 'nbd' as a valid filesystem driver type (Daniel P. Berrange) - Add a helper API for setting up a NBD device with qemu-nbd (Daniel P. Berrange) - Re-arrange code setting up ifs/disk loop devices for LXC (Daniel P. Berrange) - Add support for storage format in FS <driver> (Daniel P. Berrange) - security_apparmor.c: Include virscsi.h (Michal Privoznik) - security: Manage the security label for scsi host device (Osier Yang) - qemu: Allow the scsi-generic device in cgroup (Han Cheng) - qemu: Support bootindex for scsi host device (Osier Yang) - Introduce <readonly> for hostdev (Osier Yang) - rng: Interleave hostdev elements (Osier Yang) - qemu: Build qemu command line for scsi host device (Han Cheng) - utils: util functions for scsi hostdev (Han Cheng) - qemu: New cap flags for scsi-generic (Han Cheng) - node_device: Clean up unused macros (Osier Yang) - conf: Generic XMLs for scsi hostdev (Han Cheng) - tests: Add tests for fc_host (Osier Yang) - util: Honor the passed sysfs_prefix (Osier Yang) - util: Update the comment for virGetFCHostNameByWWN (Osier Yang) - util: Change virIsCapable* to return bool (Osier Yang) - util: Don't miss the slash in constructed path (Osier Yang) - build: update to latest gnulib, for syntax-check (Eric Blake) - Update hellolibvirt to demo virGetLastErrorMessage() (Daniel P. Berrange) - Add a test case for the fdstream file read/write code (Daniel P. Berrange) - Allow the iohelper path to be customized by test programs (Daniel P. Berrange) - Add a virGetLastErrorMessage() function (Daniel P. Berrange) - Fix iohelper usage with streams opened for read (Daniel P. Berrange) - Cope with missing swap cgroup controls (Daniel P. Berrange) - util: move virFile* functions from virutil.c to virfile.c (Laine Stump) - util: fix virFileOpenAs return value and resulting error logs (Laine Stump) - Build breaker - requires VIR_FROM_THIS (John Ferlan) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/test/* (Michal Privoznik) - virGetStorageVol: Don't ignore NULL pool name (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in tests/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/storage/* (Michal Privoznik) - dom event example: Add error check to impl call (Jesse J. Cook) - dom event example: init before register event impl (Jesse J. Cook) - conf: Fix typo in error message in ABI stability check (Peter Krempa) - tests: use portable shell code (Eric Blake) - Replace 'goto clean' with 'goto cleanup' in apparmor code (Daniel P. Berrange) - Replace list of driver source files with variables (Daniel P. Berrange) - Fix naming of methods in ESX storage backends to follow public APIs (Daniel P. Berrange) - Skip virNWFilterTechDriver when validating API naming (Daniel P. Berrange) - Replace 'goto cleanup' with 'goto error' in udev interface driver (Daniel P. Berrange) - Replace 'goto err' with 'goto cleanup' in udev interface driver (Daniel P. Berrange) - tests: files named '.*-invalid.xml' should fail validation (Ján Tomko) - Simplify the Xen domain stats/peek / node memory driver methods (Daniel P. Berrange) - Simplify the Xen domain autostart driver method (Daniel P. Berrange) - Simplify the Xen domain scheduler parameter driver methods (Daniel P. Berrange) - Simplify the Xen domain attach/dettach driver methods (Daniel P. Berrange) - Simplify the Xen domain define/undefine driver methods (Daniel P. Berrange) - Simplify the Xen domain start driver method (Daniel P. Berrange) - Simplify the Xen driver define domain driver methods (Daniel P. Berrange) - Simplify the Xen domain migration driver methods (Daniel P. Berrange) - Simplify the Xen domain get XML driver method (Daniel P. Berrange) - Simplify the Xen domain VCPU driver methods (Daniel P. Berrange) - Simplify the Xen domain save/restore driver methods (Daniel P. Berrange) - Simplify the Xen domain get info/state driver methods (Daniel P. Berrange) - Simplify the Xen domain get/set (max) memory driver methods (Daniel P. Berrange) - Remove Xen get hostname driver method (Daniel P. Berrange) - Simplify the Xen domain get OS type driver method (Daniel P. Berrange) - Simplify the Xen domain destroy driver method (Daniel P. Berrange) - Simplify the Xen domain shutdown/reboot driver methods (Daniel P. Berrange) - Simplify the Xen domain suspend/resume driver methods (Daniel P. Berrange) - Simplify the Xen domain is persistent driver method (Daniel P. Berrange) - Simplify the Xen domain lookup driver methods (Daniel P. Berrange) - Simplify the Xen domain create driver method (Daniel P. Berrange) - Simplify the Xen count/list domains driver methods (Daniel P. Berrange) - Simplify the Xen get max vcpus / node get info driver methods (Daniel P. Berrange) - Simplify the Xen get version driver method (Daniel P. Berrange) - Simplify the Xen get type driver method (Daniel P. Berrange) - Simplify opening of Xen drivers (Daniel P. Berrange) - Remove pointless GET_PRIVATE macro from Xen driver (Daniel P. Berrange) - Remove VIR_CONNECT_RO checks from xen drivers (Daniel P. Berrange) - Remove xen driver checks for priv->handle < 0 (Daniel P. Berrange) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/vmx/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/vmware/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/uml/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/secret/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/phyp/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/parallels/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/nwfilter/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/interface/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/node_device/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/network/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/lxc/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/locking/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/libxl/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/hyperv/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/esx/* (Michal Privoznik) - Adapt to VIR_STRDUP and VIR_STRNDUP in src/cpu/* (Michal Privoznik) - Delete udevFreeIfaceDef function in udev interface driver (Daniel P. Berrange) - maint: update to latest gnulib (Eric Blake) - Unmerge attach/update/modify device APIs in drivers (Daniel P. Berrange) - Pull parsing of migration xml up into QEMU driver APIs (Daniel P. Berrange) - Fix naming of some node device APIs (Daniel P. Berrange) - Separate internal node suspend APIs from public API (Daniel P. Berrange) - Separate internal node device APIs from public API (Daniel P. Berrange) - Separate virGetHostname() API contract from driver APIs (Daniel P. Berrange) - Include process start time when doing polkit checks (Daniel P. Berrange) - Rename "security context" to "selinux context" (Daniel P. Berrange) - Fix possible undefined value in check-symsorting.pl (Daniel P. Berrange) - storage: Skip inactive lv volumes (Osier Yang) - string: make VIR_STRDUP easier to use (Eric Blake) - alloc: make VIR_APPEND_ELEMENT safer (Eric Blake) - syntax-check: forbid virBufferAsprintf with string literals (Ján Tomko) - get rid of virBufferAsprintf where possible (Ján Tomko) - qemu: allocate network connections sooner during domain startup (Laine Stump) - Ensure stub todo.html.in file is HTML5 (Daniel P. Berrange) - qemu: Enable the capability bit for -no-kvm-pit-reinjection on x86 only (Boris Fiuczynski) - rpc: message related sizes enlarged (Daniel Hansel) - qemu: Do fake auto-allocation of ports when generating native command (Peter Krempa) - spec: proper soft static allocation of qemu uid (Eric Blake) - build: always include libvirt_lxc.syms in tarball (Eric Blake) - Adapt to VIR_STRDUP and VIR_STRNDUP in daemon/* (Michal Privoznik) - virstring: Introduce VIR_STRDUP and VIR_STRNDUP (Michal Privoznik) - Make detect_scsi_host_caps a function on all architectures (Guido Günther) - More paranoid initialization of 'nparams' variable in dispatch code (Daniel P. Berrange) - Fix format string handling in network driver (Daniel P. Berrange) - esx: Reduce code duplication in generator (Matthias Bolte) - build: avoid useless virAsprintf (Eric Blake) - build: always include sanitytest in tarball (Eric Blake) - util: fix compile errors caused by moving string functions (Laine Stump) - virutil: Move string related functions to virstring.c (Michal Privoznik) - qemu: Generate agent socket path if missing (Michal Privoznik) Cleanups: - Storage: Fix the indention of rbd test file (Osier Yang) - qemu: Fix damaged whitespace (Peter Krempa) - Properly indent function's opening bracket (Martin Kletzander) - build: fix typo in earlier commit (Eric Blake) - build: drop unused variable (Eric Blake) - syntax-check: mandate space after mid-line semicolon (Eric Blake) - syntax: prefer space after semicolon in for loop (Eric Blake) - security_dac: Fix the coding style (Osier Yang) - nwfilter: Change the comment style (Osier Yang) - src/*.[ch]: Remove the whitespace before ";" (Osier Yang) - src/locking: Remove the whitespace before ";" (Osier Yang) - python: Remove the whitespace before ";" (Osier Yang) - examples: Remove the whitespace before ';' (Osier Yang) - src/lxc: Remove the whitespace before ";" (Osier Yang) - src/remote: Remove the whitespace before ";" (Osier Yang) - src/rpc: Remove the whitespace before ";" (Osier Yang) - src/utils: Remove the whitespace before ";" (Osier Yang) - tests/: Remove the whitespace before ";" (Osier Yang) - daemon: Remove the whitespace before ";" (Osier Yang) - tools: Remove the whitespace before ";" (Osier Yang) - src/storage: Remove the whitespace before ';' (Osier Yang) - src/security: Remove the whitespace before ';' (Osier Yang) - src/xen: Remove the whitespace before ';' (Osier Yang) - src/vmware: Remove the whitespace before ';' (Osier Yang) - src/qemu: Remove the whitespace before ';' (Osier Yang) - src/interface: Remove the whitespace before ';' (Osier Yang) - src/parallels: Remove the whitespace before ';' (Osier Yang) - src/uml: Remove the whitespace before ';' (Osier Yang) - src/openvz: Remove the whitespace before ';' (Osier Yang) - src/node_device: Remove the whitespace before ';' (Osier Yang) - src/phyp: Remove the whitespace before ';' (Osier Yang) - src/nwfilter: Remove the whitespace before ';' (Osier Yang) - src/xenxs: Remove the whitespace before ';' (Osier Yang) - src/vbox: Remove the whitespace before ';' (Osier Yang) - src/test: Remove the whitespace before ';' (Osier Yang) - src/conf: Remove the whitespace before ';' (Osier Yang) - src/libxl: Remove the whitespace before ';' (Osier Yang) - src/network: Remove the whitespace before ';' (Osier Yang) - LXC: move the comments to the proper place (Gao feng) - conf: Improve the coding style (Osier Yang) - tests: Sort the EXTRA_DIST list (Osier Yang) - libvirt.c: Fix the indention (Osier Yang) - conf: Remove the unrelated comment (Osier Yang) - build: clean up stray files found by 'make distcheck' (Eric Blake) - Remove redundant () in expression (Daniel P. Berrange) So thanks everybody for your contributions to this release, be it ideas, bugs reports, documentation, patches, features or improved localization ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] nodedev_hal: Modernize the function's style
by Osier Yang 03 Jun '13

03 Jun '13

Use style like: void foo (const char *name) { printf("Hello, %s\n", name); } Later patches will clean up node_device_hal.c more. --- Pushed under trivial rule. --- src/node_device/node_device_hal.c | 148 +++++++++++++++++++++++--------------- 1 file changed, 89 insertions(+), 59 deletions(-) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index eecbffa..99b5044 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -57,17 +57,19 @@ static virNodeDeviceDriverStatePtr driverState; #define NODE_DEV_UDI(obj) ((const char *)((obj)->privateData) -static const char *hal_name(const char *udi) +static const char * +hal_name(const char *udi) { const char *name = strrchr(udi, '/'); if (name) - return name+1; + return name + 1; return udi; } -static int get_str_prop(LibHalContext *ctxt, const char *udi, - const char *prop, char **val_p) +static int +get_str_prop(LibHalContext *ctxt, const char *udi, + const char *prop, char **val_p) { char *val = libhal_device_get_property_string(ctxt, udi, prop, NULL); @@ -84,8 +86,9 @@ static int get_str_prop(LibHalContext *ctxt, const char *udi, return -1; } -static int get_int_prop(LibHalContext *ctxt, const char *udi, - const char *prop, int *val_p) +static int +get_int_prop(LibHalContext *ctxt, const char *udi, + const char *prop, int *val_p) { DBusError err; int val; @@ -101,8 +104,9 @@ static int get_int_prop(LibHalContext *ctxt, const char *udi, return rv; } -static int get_bool_prop(LibHalContext *ctxt, const char *udi, - const char *prop, int *val_p) +static int +get_bool_prop(LibHalContext *ctxt, const char *udi, + const char *prop, int *val_p) { DBusError err; int val; @@ -118,8 +122,9 @@ static int get_bool_prop(LibHalContext *ctxt, const char *udi, return rv; } -static int get_uint64_prop(LibHalContext *ctxt, const char *udi, - const char *prop, unsigned long long *val_p) +static int +get_uint64_prop(LibHalContext *ctxt, const char *udi, + const char *prop, unsigned long long *val_p) { DBusError err; unsigned long long val; @@ -135,8 +140,9 @@ static int get_uint64_prop(LibHalContext *ctxt, const char *udi, return rv; } -static int gather_pci_cap(LibHalContext *ctx, const char *udi, - union _virNodeDevCapData *d) +static int +gather_pci_cap(LibHalContext *ctx, const char *udi, + union _virNodeDevCapData *d) { char *sysfs_path; @@ -177,8 +183,9 @@ static int gather_pci_cap(LibHalContext *ctx, const char *udi, } -static int gather_usb_cap(LibHalContext *ctx, const char *udi, - union _virNodeDevCapData *d) +static int +gather_usb_cap(LibHalContext *ctx, const char *udi, + union _virNodeDevCapData *d) { (void)get_int_prop(ctx, udi, "usb.interface.number", (int *)&d->usb_if.number); @@ -194,8 +201,9 @@ static int gather_usb_cap(LibHalContext *ctx, const char *udi, } -static int gather_usb_device_cap(LibHalContext *ctx, const char *udi, - union _virNodeDevCapData *d) +static int +gather_usb_device_cap(LibHalContext *ctx, const char *udi, + union _virNodeDevCapData *d) { (void)get_int_prop(ctx, udi, "usb_device.bus_number", (int *)&d->usb_dev.bus); @@ -215,8 +223,9 @@ static int gather_usb_device_cap(LibHalContext *ctx, const char *udi, } -static int gather_net_cap(LibHalContext *ctx, const char *udi, - union _virNodeDevCapData *d) +static int +gather_net_cap(LibHalContext *ctx, const char *udi, + union _virNodeDevCapData *d) { unsigned long long dummy; (void)get_str_prop(ctx, udi, "net.interface", &d->net.ifname); @@ -234,8 +243,9 @@ static int gather_net_cap(LibHalContext *ctx, const char *udi, } -static int gather_scsi_host_cap(LibHalContext *ctx, const char *udi, - union _virNodeDevCapData *d) +static int +gather_scsi_host_cap(LibHalContext *ctx, const char *udi, + union _virNodeDevCapData *d) { int retval = 0; @@ -252,8 +262,9 @@ out: } -static int gather_scsi_cap(LibHalContext *ctx, const char *udi, - union _virNodeDevCapData *d) +static int +gather_scsi_cap(LibHalContext *ctx, const char *udi, + union _virNodeDevCapData *d) { (void)get_int_prop(ctx, udi, "scsi.host", (int *)&d->scsi.host); (void)get_int_prop(ctx, udi, "scsi.bus", (int *)&d->scsi.bus); @@ -264,8 +275,9 @@ static int gather_scsi_cap(LibHalContext *ctx, const char *udi, } -static int gather_storage_cap(LibHalContext *ctx, const char *udi, - union _virNodeDevCapData *d) +static int +gather_storage_cap(LibHalContext *ctx, const char *udi, + union _virNodeDevCapData *d) { int val; (void)get_str_prop(ctx, udi, "block.device", &d->storage.block); @@ -292,8 +304,9 @@ static int gather_storage_cap(LibHalContext *ctx, const char *udi, } -static int gather_system_cap(LibHalContext *ctx, const char *udi, - union _virNodeDevCapData *d) +static int +gather_system_cap(LibHalContext *ctx, const char *udi, + union _virNodeDevCapData *d) { char *uuidstr; @@ -341,16 +354,18 @@ static caps_tbl_entry caps_tbl[] = { /* qsort/bsearch string comparator */ -static int cmpstringp(const void *p1, const void *p2) +static int +cmpstringp(const void *p1, const void *p2) { /* from man 3 qsort */ return strcmp(* (char * const *) p1, * (char * const *) p2); } -static int gather_capability(LibHalContext *ctx, const char *udi, - const char *cap_name, - virNodeDevCapsDefPtr *caps_p) +static int +gather_capability(LibHalContext *ctx, const char *udi, + const char *cap_name, + virNodeDevCapsDefPtr *caps_p) { caps_tbl_entry *entry; @@ -377,8 +392,9 @@ static int gather_capability(LibHalContext *ctx, const char *udi, } -static int gather_capabilities(LibHalContext *ctx, const char *udi, - virNodeDevCapsDefPtr *caps_p) +static int +gather_capabilities(LibHalContext *ctx, const char *udi, + virNodeDevCapsDefPtr *caps_p) { char *bus_name = NULL; virNodeDevCapsDefPtr caps = NULL; @@ -433,12 +449,14 @@ static int gather_capabilities(LibHalContext *ctx, const char *udi, return rv; } -static void free_udi(void *udi) +static void +free_udi(void *udi) { VIR_FREE(udi); } -static void dev_create(const char *udi) +static void +dev_create(const char *udi) { LibHalContext *ctx; char *parent_key = NULL; @@ -503,7 +521,8 @@ cleanup: nodeDeviceUnlock(driverState); } -static void dev_refresh(const char *udi) +static void +dev_refresh(const char *udi) { const char *name = hal_name(udi); virNodeDeviceObjPtr dev; @@ -524,16 +543,18 @@ static void dev_refresh(const char *udi) } } -static void device_added(LibHalContext *ctx ATTRIBUTE_UNUSED, - const char *udi) +static void +device_added(LibHalContext *ctx ATTRIBUTE_UNUSED, + const char *udi) { VIR_DEBUG("%s", hal_name(udi)); dev_create(udi); } -static void device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED, - const char *udi) +static void +device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED, + const char *udi) { const char *name = hal_name(udi); virNodeDeviceObjPtr dev; @@ -549,8 +570,9 @@ static void device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED, } -static void device_cap_added(LibHalContext *ctx, - const char *udi, const char *cap) +static void +device_cap_added(LibHalContext *ctx, + const char *udi, const char *cap) { const char *name = hal_name(udi); virNodeDeviceObjPtr dev; @@ -568,9 +590,10 @@ static void device_cap_added(LibHalContext *ctx, } -static void device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED, - const char *udi, - const char *cap) +static void +device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED, + const char *udi, + const char *cap) { const char *name = hal_name(udi); VIR_DEBUG("%s %s", cap, name); @@ -579,11 +602,12 @@ static void device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED, } -static void device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, - const char *udi, - const char *key, - dbus_bool_t is_removed ATTRIBUTE_UNUSED, - dbus_bool_t is_added ATTRIBUTE_UNUSED) +static void +device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, + const char *udi, + const char *key, + dbus_bool_t is_removed ATTRIBUTE_UNUSED, + dbus_bool_t is_added ATTRIBUTE_UNUSED) { const char *name = hal_name(udi); VIR_DEBUG("%s %s", name, key); @@ -592,9 +616,10 @@ static void device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, } -static int nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +static int +nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) { LibHalContext *hal_ctx = NULL; char **udi = NULL; @@ -693,7 +718,8 @@ static int nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, } -static int nodeStateCleanup(void) +static int +nodeStateCleanup(void) { if (driverState) { nodeDeviceLock(driverState); @@ -710,7 +736,8 @@ static int nodeStateCleanup(void) } -static int nodeStateReload(void) +static int +nodeStateReload(void) { DBusError err; char **udi = NULL; @@ -742,9 +769,10 @@ static int nodeStateReload(void) } -static virDrvOpenStatus nodeDeviceOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - unsigned int flags) +static virDrvOpenStatus +nodeDeviceOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -756,7 +784,8 @@ static virDrvOpenStatus nodeDeviceOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } -static int nodeDeviceClose(virConnectPtr conn ATTRIBUTE_UNUSED) +static int +nodeDeviceClose(virConnectPtr conn ATTRIBUTE_UNUSED) { conn->nodeDevicePrivateData = NULL; return 0; @@ -788,7 +817,8 @@ static virStateDriver halStateDriver = { .stateReload = nodeStateReload, /* 0.5.0 */ }; -int halNodeRegister(void) +int +halNodeRegister(void) { if (virRegisterNodeDeviceDriver(&halNodeDeviceDriver) < 0) return -1; -- 1.8.1.4

1 0

[libvirt] kFreeBSD pdwtags make check failure
by Guido Günther 31 May '13

31 May '13

Hi, make check on kFreeBSD currently fails with: make[3]: Entering directory `/data/home/jenkins/jobs/libvirt-build-debian-jessie-kfreebsd64/workspace/libvirt/src' GEN remote_protocol-struct --- remote_protocol-structs 2013-05-03 17:48:29.000000000 +0200 +++ remote_protocol-struct-t3 2013-05-30 22:25:36.716696829 +0200 @@ -67,7 +67,7 @@ struct remote_vcpu_info { u_int number; int state; - uint64_t cpu_time; + long unsigned int cpu_time; int cpu; }; ... and way more. Full log at: http://honk.sigxcpu.org:8001/job/libvirt-check-debian-jessie-kfreebsd64/2/c… I do wonder what would be the right aproach to fix this up though. The used types seem compatible at least. Cheers, -- Guido

2 2

[libvirt] [PATCH] qemu: prevent termination of guests w/hostdev on driver reconnect
by Laine Stump 31 May '13

31 May '13

This should resolve: https://bugzilla.redhat.com/show_bug.cgi?id=959191 The problem was that qemuUpdateActivePciHostdevs was returning 0 (success) when no hostdevs were present, but would otherwise return -1 (failure) even when it completed successfully. It is only called from qemuProcessReconnect(), and when qemuProcessReconnect got back an error, it would not only stop reconnecting, but would terminate the guest qemu process "to remove danger of it ending up running twice if user tries to start it again later". (This bug was introduced in commit 011cf7ad, which was pushed between v1.0.2 and v1.0.3, so all maintenance branches from v1.0.3 up to 1.0.5 will need this one line patch applied.) --- src/qemu/qemu_hostdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 48750c3..5b89bb6 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -176,6 +176,7 @@ int qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver, } } + ret = 0; cleanup: virObjectUnlock(driver->activePciHostdevs); virObjectUnlock(driver->inactivePciHostdevs); -- 1.7.11.7

2 2

[libvirt] [PATCH] vbox: define DYNLIB_NAME for kFreeBSD
by Guido Günther 31 May '13

31 May '13

Similar to what Eric did for Cygwin it helps at least to compile without --without-vbox --- src/vbox/vbox_XPCOMCGlue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 9719014..7809719 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -50,7 +50,7 @@ /******************************************************************************* * Defined Constants And Macros * *******************************************************************************/ -#if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if defined(__linux__) || defined(__linux_gnu__) || defined(__sun__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) # define DYNLIB_NAME "VBoxXPCOMC.so" #elif defined(__APPLE__) # define DYNLIB_NAME "VBoxXPCOMC.dylib" -- 1.7.10.4

2 2

[libvirt] [PATCH] build: skip qemu in tests when !WITH_QEMU
by Eric Blake 31 May '13

31 May '13

A mingw build (where the qemu driver is not built, so WITH_QEMU is undefined) failed with: In file included from ../../src/qemu/qemu_command.h:30:0, from ../../tests/testutilsqemu.h:4, from ../../tests/networkxml2xmltest.c:14: ../../src/qemu/qemu_conf.h:53:4: error: #error "Port me" But since testutilsqemu.c is already conditional, the header should be likewise. * tests/testutilsqemu.h: Make content conditional. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. I'm getting closer to a clean ./autobuild.sh run. tests/testutilsqemu.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 2ca42ab..fc2f5bd 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -1,8 +1,11 @@ +#include <config.h> +#ifdef WITH_QEMU -#include "capabilities.h" -#include "domain_conf.h" -#include "qemu/qemu_command.h" +# include "capabilities.h" +# include "domain_conf.h" +# include "qemu/qemu_command.h" virCapsPtr testQemuCapsInit(void); virDomainXMLOptionPtr testQemuXMLConfInit(void); extern qemuBuildCommandLineCallbacks testCallbacks; +#endif -- 1.8.1.4

1 1

[libvirt] [PATCH] Introduce virFilePrintf() as a portable fprintf()
by Daniel P. Berrange 31 May '13

31 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> We can't use GNULIB's fprintf-posix due to licensing incompatibilities. We do already have a portable formatting via virAsprintf() which we got from GNULIB though. We can use to create a virFilePrintf() function. But really gnulib could just provide a 'fprintf' module, that depended on just its 'asprintf' module. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt_private.syms | 1 + src/util/virfile.c | 35 +++++++++++++++++++++++++++++++++++ src/util/virfile.h | 3 +++ tests/fdstreamtest.c | 38 +++++++++++++++++++------------------- tests/virstringtest.c | 34 +++++++++++++++++----------------- 5 files changed, 75 insertions(+), 36 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 392357f..5365827 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1302,6 +1302,7 @@ virFileMatchesNameSuffix; virFileNBDDeviceAssociate; virFileOpenAs; virFileOpenTty; +virFilePrintf; virFileReadAll; virFileReadLimFD; virFileResolveAllLinks; diff --git a/src/util/virfile.c b/src/util/virfile.c index 4637919..42607c7 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2322,3 +2322,38 @@ virFileSanitizePath(const char *path) return cleanpath; } + + +/** + * virFilePrintf: + * + * A replacement for fprintf() which uses virVasprintf to + * ensure that portable string format placeholders can be + * used, since gnulib's fprintf() replacement is not + * LGPLV2+ compatible + */ +int virFilePrintf(FILE *fp, const char *msg, ...) +{ + va_list vargs; + char *str; + int ret; + + va_start(vargs, msg); + + if ((ret = virVasprintf(&str, msg, vargs)) < 0) + goto cleanup; + + if (fwrite(str, 1, ret, fp) != ret) { + virReportSystemError(errno, "%s", + _("Could not write to stream")); + ret = -1; + } + + VIR_FREE(str); + +cleanup: + va_end(vargs); + + return ret; +} + diff --git a/src/util/virfile.h b/src/util/virfile.h index beaad86..72d35ce 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -229,4 +229,7 @@ void virFileWaitForDevices(void); virBuildPathInternal(path, __VA_ARGS__, NULL) int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL; +int virFilePrintf(FILE *fp, const char *msg, ...) + ATTRIBUTE_FMT_PRINTF(2, 3); + #endif /* __VIR_FILE_H */ diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 9f780c9..edfda6a 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -105,16 +105,16 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking) usleep(20 * 1000); goto reread; } - fprintf(stderr, "Failed to read stream: %s\n", - virGetLastErrorMessage()); + virFilePrintf(stderr, "Failed to read stream: %s\n", + virGetLastErrorMessage()); goto cleanup; } if (got == 0) { /* Expect EOF 1/2 through last pattern */ if (i == 9 && want == (PATTERN_LEN / 2)) break; - fprintf(stderr, "Unexpected EOF block %zu want %zu\n", - i, want); + virFilePrintf(stderr, "Unexpected EOF block %zu want %zu\n", + i, want); goto cleanup; } offset += got; @@ -122,25 +122,25 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking) } if (i == 0) { if (memcmp(buf, pattern + (PATTERN_LEN / 2), PATTERN_LEN / 2) != 0) { - fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); + virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } else if (i == 9) { if (memcmp(buf, pattern, PATTERN_LEN / 2) != 0) { - fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); + virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } else { if (memcmp(buf, pattern, PATTERN_LEN) != 0) { - fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); + virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } } if (st->driver->streamFinish(st) != 0) { - fprintf(stderr, "Failed to finish stream: %s\n", - virGetLastErrorMessage()); + virFilePrintf(stderr, "Failed to finish stream: %s\n", + virGetLastErrorMessage()); goto cleanup; } @@ -229,8 +229,8 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) if (i == 9 && want == (PATTERN_LEN / 2)) break; - fprintf(stderr, "Failed to write stream: %s\n", - virGetLastErrorMessage()); + virFilePrintf(stderr, "Failed to write stream: %s\n", + virGetLastErrorMessage()); goto cleanup; } offset += got; @@ -239,8 +239,8 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) } if (st->driver->streamFinish(st) != 0) { - fprintf(stderr, "Failed to finish stream: %s\n", - virGetLastErrorMessage()); + virFilePrintf(stderr, "Failed to finish stream: %s\n", + virGetLastErrorMessage()); goto cleanup; } @@ -255,7 +255,7 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) want = PATTERN_LEN; if (saferead(fd, buf, want) != want) { - fprintf(stderr, "Short read from data\n"); + virFilePrintf(stderr, "Short read from data\n"); goto cleanup; } @@ -263,22 +263,22 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) size_t j; for (j = 0 ; j < (PATTERN_LEN / 2) ; j++) { if (buf[j] != 0) { - fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); + virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } if (memcmp(buf + (PATTERN_LEN / 2), pattern, PATTERN_LEN / 2) != 0) { - fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); + virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } else if (i == 9) { if (memcmp(buf, pattern, PATTERN_LEN / 2) != 0) { - fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); + virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } else { if (memcmp(buf, pattern, PATTERN_LEN) != 0) { - fprintf(stderr, "Mismatched pattern data iteration %zu\n", i); + virFilePrintf(stderr, "Mismatched pattern data iteration %zu\n", i); goto cleanup; } } @@ -324,7 +324,7 @@ mymain(void) virFDStreamSetIOHelper(iohelper); if (!mkdtemp(scratchdir)) { - fprintf(stderr, "Cannot create fakesysfsdir"); + virFilePrintf(stderr, "Cannot create fakesysfsdir"); abort(); } diff --git a/tests/virstringtest.c b/tests/virstringtest.c index da06c0f..98f0a56 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -25,8 +25,8 @@ #include "testutils.h" #include "virerror.h" #include "viralloc.h" +#include "virfile.h" #include "virlog.h" - #include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -62,18 +62,18 @@ static int testSplit(const void *args) tmp2 = data->tokens; while (*tmp1 && *tmp2) { if (STRNEQ(*tmp1, *tmp2)) { - fprintf(stderr, "Mismatch '%s' vs '%s'\n", *tmp1, *tmp2); + virFilePrintf(stderr, "Mismatch '%s' vs '%s'\n", *tmp1, *tmp2); goto cleanup; } tmp1++; tmp2++; } if (*tmp1) { - fprintf(stderr, "Too many pieces returned\n"); + virFilePrintf(stderr, "Too many pieces returned\n"); goto cleanup; } if (*tmp2) { - fprintf(stderr, "Too few pieces returned\n"); + virFilePrintf(stderr, "Too few pieces returned\n"); goto cleanup; } @@ -96,7 +96,7 @@ static int testJoin(const void *args) return -1; } if (STRNEQ(got, data->string)) { - fprintf(stderr, "Mismatch '%s' vs '%s'\n", got, data->string); + virFilePrintf(stderr, "Mismatch '%s' vs '%s'\n", got, data->string); goto cleanup; } @@ -143,49 +143,49 @@ testStrdup(const void *data ATTRIBUTE_UNUSED) value = VIR_STRDUP(array[i++], testStrdupLookup1(j++)); if (value != 1) { - fprintf(stderr, "unexpected strdup result %d, expected 1\n", value); + virFilePrintf(stderr, "unexpected strdup result %d, expected 1\n", value); goto cleanup; } if (i != 1) { - fprintf(stderr, "unexpected side effects i=%zu, expected 1\n", i); + virFilePrintf(stderr, "unexpected side effects i=%zu, expected 1\n", i); goto cleanup; } if (j != 1) { - fprintf(stderr, "unexpected side effects j=%zu, expected 1\n", j); + virFilePrintf(stderr, "unexpected side effects j=%zu, expected 1\n", j); goto cleanup; } if (STRNEQ_NULLABLE(array[0], "hello") || array[1]) { - fprintf(stderr, "incorrect array contents '%s' '%s'\n", - NULLSTR(array[0]), NULLSTR(array[1])); + virFilePrintf(stderr, "incorrect array contents '%s' '%s'\n", + NULLSTR(array[0]), NULLSTR(array[1])); goto cleanup; } value = VIR_STRNDUP(array[i++], testStrdupLookup1(j++), testStrdupLookup2(k++)); if (value != 0) { - fprintf(stderr, "unexpected strdup result %d, expected 0\n", value); + virFilePrintf(stderr, "unexpected strdup result %d, expected 0\n", value); goto cleanup; } if (i != 2) { - fprintf(stderr, "unexpected side effects i=%zu, expected 2\n", i); + virFilePrintf(stderr, "unexpected side effects i=%zu, expected 2\n", i); goto cleanup; } if (j != 2) { - fprintf(stderr, "unexpected side effects j=%zu, expected 2\n", j); + virFilePrintf(stderr, "unexpected side effects j=%zu, expected 2\n", j); goto cleanup; } if (k != 1) { - fprintf(stderr, "unexpected side effects k=%zu, expected 1\n", k); + virFilePrintf(stderr, "unexpected side effects k=%zu, expected 1\n", k); goto cleanup; } if (STRNEQ_NULLABLE(array[0], "hello") || array[1]) { - fprintf(stderr, "incorrect array contents '%s' '%s'\n", - NULLSTR(array[0]), NULLSTR(array[1])); + virFilePrintf(stderr, "incorrect array contents '%s' '%s'\n", + NULLSTR(array[0]), NULLSTR(array[1])); goto cleanup; } if (fail) { - fprintf(stderr, "side effects failed\n"); + virFilePrintf(stderr, "side effects failed\n"); goto cleanup; } -- 1.8.1.4

2 2

[libvirt] [PATCH] Document that runtime changes may be lost after S4 suspend
by Jiri Denemark 31 May '13

31 May '13

--- src/libvirt.c | 7 +++++++ tools/virsh.pod | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/libvirt.c b/src/libvirt.c index b129611..6967613 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2472,6 +2472,13 @@ error: * Dependent on hypervisor used, this may require a * guest agent to be available, e.g. QEMU. * + * Beware that at least for QEMU, the domain's process will be terminated + * when VIR_NODE_SUSPEND_TARGET_DISK is used and a new process will be + * launched when libvirt is asked to wake up the domain. As a result of + * this, any runtime changes, such as device hotplug or memory settings, + * are lost unless such changes were made with VIR_DOMAIN_AFFECT_CONFIG + * flag. + * * Returns: 0 on success, * -1 on failure. */ diff --git a/tools/virsh.pod b/tools/virsh.pod index 11984bc..7c8ce18 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1680,6 +1680,13 @@ hypervisor driver and 0 should be used.). Note that this command requires a guest agent configured and running in the domain's guest OS. +Beware that at least for QEMU, the domain's process will be terminated when +target disk is used and a new process will be launched when libvirt is asked +to wake up the domain. As a result of this, any runtime changes, such as +device hotplug or memory settings, are lost unless such changes were made +with I<--config> flag. + + =item B<dompmwakeup> I<domain> Wakeup a domain from pmsuspended state (either suspended by dompmsuspend or -- 1.8.2.1

2 2

[libvirt] [PATCH] libxl: allow an <emulator> to be selected in the domain config XML
by David Scott 31 May '13

31 May '13

The emulator path supplied can be any valid path on the system. Note that when setting a device_model, libxl needs us to set the device_model_version too. The device_model_version can be either ...QEMU_XEN: meaning "upstream qemu", the default in xen-4.3 onwards ...QEMU_XEN_TRADITIONAL: the old xen-specific fork We detect the device_model_version by examining the qemu filename: if it is "qemu-dm" then it's the old xen-specific fork. If anything else then we assume "upstream qemu" (whose filename may change in future). Note that if you are using a wrapper script to (eg) adjust the arguments of the old qemu during development, you will have to ensure the wrapper script also has the name "qemu-dm", by placing it in a separate directory. Signed-off-by: David Scott <dave.scott(a)eu.citrix.com> --- src/libxl/libxl_conf.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 7e0753a..2aa5a62 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -788,6 +788,46 @@ libxlMakeCapabilities(libxl_ctx *ctx) } int +libxlMakeEmulator(virDomainDefPtr def, libxl_domain_config *d_config) +{ + /* No explicit override means use the default */ + if (!def->emulator) { + return 0; + } + + if (!virFileExists(def->emulator)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("emulator '%s' not found"), + def->emulator); + return -1; + } + + VIR_FREE(d_config->b_info.device_model); + if ((d_config->b_info.device_model = strdup(def->emulator)) == NULL) { + virReportOOMError(); + return -1; + } + + /* N.B. from xen/tools/libxl/libxl_types.idl: + * "If setting device_model you must set device_model_version too." + * + * The xen-4.3 and later default is "upstream qemu" (QEMU_XEN) + * so we make that the default and special-case the old-style + * "traditional qemu" (QEMU_XEN_TRADITIONAL) + */ + + d_config->b_info.device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + + if (STREQ(basename(def->emulator), "qemu-dm")) + d_config->b_info.device_model_version = + LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; + + return 0; +} + + +int libxlBuildDomainConfig(libxlDriverPrivatePtr driver, virDomainDefPtr def, libxl_domain_config *d_config) { @@ -811,6 +851,10 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, goto error; } + if (libxlMakeEmulator(def, d_config) < 0) { + goto error; + } + d_config->on_reboot = def->onReboot; d_config->on_poweroff = def->onPoweroff; d_config->on_crash = def->onCrash; -- 1.7.1

5 19

[libvirt] [PATCH] qemu: escape literal IPv6 address in NBD migration
by Ján Tomko 31 May '13

31 May '13

A literal IPv6 must be escaped, otherwise migration fails with: unable to execute QEMU command 'drive-mirror': address resolution failed for f0::0d:5901: Servname not supported for ai_socktype since QEMU treats everything after the first ':' as the port. --- src/qemu/qemu_migration.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ffc86a4..7aa0476 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1193,6 +1193,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, size_t i, lastGood = 0; char *diskAlias = NULL; char *nbd_dest = NULL; + char *hoststr = NULL; unsigned int mirror_flags = VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT; virErrorPtr err = NULL; @@ -1212,6 +1213,16 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, port = mig->nbd->port; mig->nbd->port = 0; + /* escape literal IPv6 address */ + if (strchr(host, ':')) { + if (virAsprintf(&hoststr, "[%s]", host) < 0) { + virReportOOMError(); + goto error; + } + } else if (VIR_STRDUP(hoststr, host) < 0) { + goto error; + } + if (*migrate_flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC) mirror_flags |= VIR_DOMAIN_BLOCK_REBASE_SHALLOW; @@ -1228,7 +1239,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, if ((virAsprintf(&diskAlias, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias) < 0) || (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", - host, port, diskAlias) < 0)) { + hoststr, port, diskAlias) < 0)) { virReportOOMError(); goto error; } @@ -1297,6 +1308,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, cleanup: VIR_FREE(diskAlias); VIR_FREE(nbd_dest); + VIR_FREE(hoststr); return ret; error: -- 1.8.1.5

2 2

[libvirt] [PATCH] Check for existence of interface prior to setting terminate flag
by John Ferlan 31 May '13

31 May '13

https://bugzilla.redhat.com/show_bug.cgi?id=903480 During domain destruction it's possible that the learnIPAddressThread has already removed the interface prior to the teardown filter path being run. The teardown code would only be telling the thread to terminate. --- src/nwfilter/nwfilter_learnipaddr.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 2b49333..c56d119 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -251,6 +251,14 @@ virNWFilterTerminateLearnReq(const char *ifname) { int ifindex; virNWFilterIPAddrLearnReqPtr req; + /* It's possible that it's already be removed as a result of + * virNWFilterDeregisterLearnReq during learnIPAddressThread() exit + */ + if (virNetDevExists(ifname) != 1) { + virResetLastError(); + return 0; + } + if (virNetDevGetIndex(ifname, &ifindex) < 0) { virResetLastError(); return rc; -- 1.8.1.4

2 2

[libvirt] Information needed about "virsh # cpu-stats test_vm"
by Anusha Rayani 31 May '13

31 May '13

Hi, We are implementing feature called CPU separation in the platform. So, guest VMs will have dedicated cores allocated using cgroups (cgroups hierachy related VMs managed by libvirt). virsh cpu-stats command is not working in our platform : virsh # cpu-stats test_vm error: Failed to virDomainGetCPUStats() error: Requested operation is not valid: cgroup CPUACCT controller is not mounted It should show info like this. $ virsh cpu-stats test_vm CPU0: cpu_time 0.025812184 seconds vcpu_time 0.025812184 seconds CPU1: cpu_time 4.893484927 seconds vcpu_time 4.893484927 seconds Total: cpu_time 4.924620941 seconds user_time 1.060000000 seconds system_time 3.050000000 seconds We are suspecting some issue in virsh when it is trying to find to where that cgroups is mounted in a system (default in ubuntu is /sys/fs/cgroup/cpuset/libvirt/, but in our platform uses /dev/cgroup_xxx). Find /proc/cgroups and /proc/mounts log below: ================================== # cat /proc/cgroups #subsys_name hierarchy num_cgroups enabled cpuset 0 1 1 ns 0 1 1 cpu 1 3 1 cpuacct 0 1 1 memory 2 1 1 freezer 0 1 1 net_cls 0 1 1 blkio 0 1 1 # cat /proc/mounts cpu /dev/cgroup_cpu cgroup rw,relatime,cpu 0 0 memory /dev/cgroup_mem cgroup rw,relatime,memory 0 0 Can you please help us in this regard to enable this command in our platform, Thanks in advance !!! Regards, Anusha

2 4

[libvirt] [PATCH] Resolve memory leak found by valgrind
by John Ferlan 31 May '13

31 May '13

Commit '6afdfc8e' adjusted the exit and error paths to go through the error and cleanup labels, but neglected to remove the return ret prior to cleanup. Also noted the 'type' xml string fetch was never checked for NULL which could lead to some interesting results. --- src/conf/storage_conf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f0ea41d..94eb69a 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -834,6 +834,12 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) } type = virXPathString("string(./@type)", ctxt); + if (type == NULL) { + virReportError(VIR_ERR_XML_ERROR, + _("storage pool missing type attribute")); + goto error; + } + if ((ret->type = virStoragePoolTypeFromString(type)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown storage pool type %s"), type); @@ -956,8 +962,6 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) goto error; } - return ret; - cleanup: VIR_FREE(uuid); VIR_FREE(type); -- 1.8.1.4

2 3

[libvirt] [PATCH] qemu: snapshot: Don't kill access to disk if snapshot creation fails
by Peter Krempa 31 May '13

31 May '13

If snapshot creation failed for example due to invalid use of the "REUSE_EXTERNAL" flag, libvirt killed access to the original image file instead of the new image file. On machines with selinux this kills the whole VM as the selinux context is enforced immediately. * qemu_driver.c:qemuDomainSnapshotUndoSingleDiskActive(): - Kill access to the new image file instead of the old one. Partially resolves: https://bugzilla.redhat.com/show_bug.cgi?id=906639 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e638e7c..5ca0fd4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11309,7 +11309,7 @@ qemuDomainSnapshotUndoSingleDiskActive(virQEMUDriverPtr driver, (persistDisk && VIR_STRDUP(persistSource, source) < 0)) goto cleanup; - qemuDomainPrepareDiskChainElement(driver, vm, disk, origdisk->src, + qemuDomainPrepareDiskChainElement(driver, vm, disk, disk->src, VIR_DISK_CHAIN_NO_ACCESS); if (need_unlink && stat(disk->src, &st) == 0 && S_ISREG(st.st_mode) && unlink(disk->src) < 0) -- 1.8.2.1

2 2

[libvirt] [PATCH] qemu: Fix damaged whitespace
by Peter Krempa 31 May '13

31 May '13

After deleting "WithDriver" from the async job function the code was unaligned. --- Notes: Pushed as trivial. src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d0dee14..e638e7c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11460,8 +11460,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ bool pmsuspended = false; - if (qemuDomainObjBeginAsyncJob(driver, vm, - QEMU_ASYNC_JOB_SNAPSHOT) < 0) + if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_SNAPSHOT) < 0) goto cleanup; /* If quiesce was requested, then issue a freeze command, and a -- 1.8.2.1

1 0