- Devel - libvirt List Archives

[libvirt] [PATCH] domsuspend: Fix warning on mingw build
by Andrea Bolognani 12 Feb '16

12 Feb '16

Commit d82170d introduced a workaround for domtop: in that example program, we define a symbol called ERROR for our own use, but since a symbol with the same name is already defined in one of mingw's header files, we get a warning when using that compiler. domsuspend defines the same problematic symbol, so the workaround has been copied over. --- examples/domsuspend/suspend.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/examples/domsuspend/suspend.c b/examples/domsuspend/suspend.c index 11f7302..3e3f70e 100644 --- a/examples/domsuspend/suspend.c +++ b/examples/domsuspend/suspend.c @@ -34,6 +34,21 @@ static int debug; +/* On mingw, there's a header file that poisons the well: + * + * + * CC domtop.o + *domtop.c:40:0: warning: "ERROR" redefined [enabled by default] + * #define ERROR(...) \ + * ^ + *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0, + * from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23, + * from ../../gnulib/lib/unistd.h:48, + * from domtop.c:35: + * /usr/i686-w64-mingw32/sys-root/mingw/include/wingdi.h:75:0: note: this is the location of the previous definition + * #define ERROR 0 + */ +#undef ERROR #define ERROR(...) \ do { \ fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \ -- 2.5.0

2 2

[libvirt] [PATCH v2 0/3] Add capability for text based polkit authentication for virsh
by John Ferlan 12 Feb '16

12 Feb '16

v1: http://www.redhat.com/archives/libvir-list/2016-February/msg00545.html Differences to v1: - Patch 1, adjust error message slightly - Patch 2, remove the unnecessary virPolkitAgentCheck and the sleep - Patch 3, remove the --pkauth parameter adjust the logic to attempt the authentications in a loop with the first being one for the graphical agent. If that fails because there was no agent to be found, then start up the text based agent. Also add logic to wait for the text based authentication agent to start (just in case). John Ferlan (3): polkit: Adjust message when action-id isn't found util: Introduce API's for Polkit text authentication virsh: Add support for text based polkit authentication src/libvirt_private.syms | 2 ++ src/util/virpolkit.c | 64 +++++++++++++++++++++++++++++++++++++++++++++--- src/util/virpolkit.h | 5 ++++ tests/virpolkittest.c | 3 ++- tools/virsh.c | 49 ++++++++++++++++++++++++++++++++---- tools/virsh.h | 2 ++ 6 files changed, 115 insertions(+), 10 deletions(-) -- 2.5.0

2 12

[libvirt] [PATCH] virportallocatortest: Run on linux only
by Michal Privoznik 12 Feb '16

12 Feb '16

After the rework of mocking of our tests there's the virportallocator test failing to link on mingw. Well, it's the mocking library actually: ../gnulib/lib/.libs/libgnu.a(bind.o): In function `rpl_bind': /home/jenkins/libvirt-mingw/build32/gnulib/lib/../../../gnulib/lib/bind.c:33: multiple definition of `rpl_bind' .libs/virportallocatormock_la-virportallocatormock.o:/home/jenkins/libvirt-mingw/build32/tests/../../tests/virportallocatormock.c:79: first defined here I've no idea why this matters to mingw and does not to others. Nevertheless, if we make the test linux only the problem goes away. Apparently, our test for RTLD_NEXT is not sufficient because mingw32 defines it. Lets put aside for a while fact that it has the same value as RTLD_DEFAULT which by description has different meaning, shall we? Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/virportallocatormock.c | 6 ++++-- tests/virportallocatortest.c | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/virportallocatormock.c b/tests/virportallocatormock.c index e44191e..fa6e75b 100644 --- a/tests/virportallocatormock.c +++ b/tests/virportallocatormock.c @@ -25,7 +25,7 @@ # include <dlfcn.h> #endif -#if defined(RTLD_NEXT) +#if defined(__linux__) && defined(RTLD_NEXT) # include "internal.h" # include <sys/socket.h> # include <errno.h> @@ -105,4 +105,6 @@ int bind(int sockfd ATTRIBUTE_UNUSED, return 0; } -#endif /* ! defined(RTLD_NEXT) */ +#else /* defined(__linux__) && defined(RTLD_NEXT) */ +/* Nothing to override on other platforms. */ +#endif diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 1a5d759..4574215 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -27,7 +27,8 @@ # include <dlfcn.h> #endif -#if defined(RTLD_NEXT) +#if defined(__linux__) && defined(RTLD_NEXT) + # include "virutil.h" # include "virerror.h" # include "viralloc.h" @@ -174,7 +175,7 @@ mymain(void) } VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virportallocatormock.so") -#else /* ! defined(RTLD_NEXT) */ +#else /* defined(__linux__) && defined(RTLD_NEXT) */ int main(void) { -- 2.4.10

2 1

[libvirt] [PATCH] migration: add option to set target ndb server port
by Nikolay Shirokovskiy 12 Feb '16

12 Feb '16

Current libvirt + qemu pair lacks secure migrations in case of VMs with non-shared disks. The only option to migrate securely natively is to use tunneled mode and some kind of secure destination URI. But tunelled mode does not support non-shared disks. The other way to make migration secure is to organize a tunnel by external means. This is possible in case of shared disks migration thru use of proper combination of destination URI, migration URI and VIR_MIGRATE_PARAM_LISTEN_ADDRESS migration param. But again this is not possible in case of non shared disks migration as we have no option to control target nbd server port. But fixing this much more simplier that supporting non-shared disks in tunneled mode. So this patch adds option to set target ndb port. Finally all qemu migration connections will be secured AFAIK but even in this case this patch could be convinient if one wants all migration traffic be put in a single connection. --- include/libvirt/libvirt-domain.h | 10 +++ src/qemu/qemu_driver.c | 25 ++++--- src/qemu/qemu_migration.c | 138 +++++++++++++++++++++++++++------------ src/qemu/qemu_migration.h | 3 + tools/virsh-domain.c | 12 ++++ tools/virsh.pod | 5 +- 6 files changed, 141 insertions(+), 52 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index d26faa5..e577f26 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -757,6 +757,16 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_MIGRATE_DISKS "migrate_disks" +/** + * VIR_MIGRATE_PARAM_NBD_PORT: + * + * virDomainMigrate* params field: port that destination nbd server should use + * for incoming disks migration. Type is VIR_TYPED_PARAM_INT. If set to 0 or + * omitted, libvirt will choose a suitable default. At the moment this is only + * supported by the QEMU driver. + */ +# define VIR_MIGRATE_PARAM_NBD_PORT "nbd_port" + /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8ccf68b..4d00ba4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12082,7 +12082,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, ret = qemuMigrationPrepareDirect(driver, dconn, NULL, 0, NULL, NULL, /* No cookies */ uri_in, uri_out, - &def, origname, NULL, 0, NULL, flags); + &def, origname, NULL, 0, NULL, 0, flags); cleanup: VIR_FREE(origname); @@ -12135,7 +12135,7 @@ qemuDomainMigratePerform(virDomainPtr dom, * Consume any cookie we were able to decode though */ ret = qemuMigrationPerform(driver, dom->conn, vm, - NULL, dconnuri, uri, NULL, NULL, 0, NULL, + NULL, dconnuri, uri, NULL, NULL, 0, NULL, 0, cookie, cookielen, NULL, NULL, /* No output cookies in v2 */ flags, dname, resource, false); @@ -12308,7 +12308,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, - &def, origname, NULL, 0, NULL, flags); + &def, origname, NULL, 0, NULL, 0, flags); cleanup: VIR_FREE(origname); @@ -12334,6 +12334,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, const char *dname = NULL; const char *uri_in = NULL; const char *listenAddress = cfg->migrationAddress; + int nbdPort = 0; int nmigrate_disks; const char **migrate_disks = NULL; char *origname = NULL; @@ -12354,7 +12355,10 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, &uri_in) < 0 || virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_LISTEN_ADDRESS, - &listenAddress) < 0) + &listenAddress) < 0 || + virTypedParamsGetInt(params, nparams, + VIR_MIGRATE_PARAM_NBD_PORT, + &nbdPort) < 0) goto cleanup; nmigrate_disks = virTypedParamsGetStringList(params, nparams, @@ -12385,7 +12389,8 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, cookieout, cookieoutlen, uri_in, uri_out, &def, origname, listenAddress, - nmigrate_disks, migrate_disks, flags); + nmigrate_disks, migrate_disks, + nbdPort, flags); cleanup: VIR_FREE(migrate_disks); @@ -12519,7 +12524,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, } return qemuMigrationPerform(driver, dom->conn, vm, xmlin, - dconnuri, uri, NULL, NULL, 0, NULL, + dconnuri, uri, NULL, NULL, 0, NULL, 0, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, resource, true); @@ -12546,6 +12551,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, int nmigrate_disks; const char **migrate_disks = NULL; unsigned long long bandwidth = 0; + int nbdPort; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -12569,7 +12575,10 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, &graphicsuri) < 0 || virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_LISTEN_ADDRESS, - &listenAddress) < 0) + &listenAddress) < 0 || + virTypedParamsGetInt(params, nparams, + VIR_MIGRATE_PARAM_NBD_PORT, + &nbdPort) < 0) goto cleanup; nmigrate_disks = virTypedParamsGetStringList(params, nparams, @@ -12589,7 +12598,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, ret = qemuMigrationPerform(driver, dom->conn, vm, dom_xml, dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, bandwidth, true); cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 51e7125..362da0f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1709,7 +1709,8 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *listenAddr, size_t nmigrate_disks, - const char **migrate_disks) + const char **migrate_disks, + int nbdPort) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -1717,6 +1718,12 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, char *diskAlias = NULL; size_t i; + if (nbdPort < 0 || nbdPort > USHRT_MAX) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("nbd port must be in range 0-65535")); + return -1; + } + for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; @@ -1733,10 +1740,15 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_MIGRATION_IN) < 0) goto cleanup; - if (!port && - ((virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) || - (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0))) { - goto exit_monitor; + if (port == 0) { + if (nbdPort) + port = nbdPort; + else + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto exit_monitor; + + if (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0) + goto exit_monitor; } if (qemuMonitorNBDServerAdd(priv->mon, diskAlias, true) < 0) @@ -1750,7 +1762,8 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, cleanup: VIR_FREE(diskAlias); - if (ret < 0) + // second clause means port is autoselected + if (ret < 0 && nbdPort == 0) virPortAllocatorRelease(driver->migrationPorts, port); return ret; @@ -2062,6 +2075,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuMigrationCookiePtr mig, const char *host, + int nbdPort, unsigned long speed, unsigned int *migrate_flags, size_t nmigrate_disks, @@ -2081,6 +2095,12 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, VIR_DEBUG("Starting drive mirrors for domain %s", vm->def->name); + if (nbdPort != mig->nbd->port) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("target qemu does not support setting nbd port")); + return -1; + } + /* steal NBD port and thus prevent its propagation back to destination */ port = mig->nbd->port; mig->nbd->port = 0; @@ -3402,6 +3422,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags) { virDomainObjPtr vm = NULL; @@ -3601,7 +3622,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER)) { if (qemuMigrationStartNBDServer(driver, vm, incoming->address, - nmigrate_disks, migrate_disks) < 0) { + nmigrate_disks, migrate_disks, + nbdPort) < 0) { goto stopjob; } cookieFlags |= QEMU_MIGRATION_COOKIE_NBD; @@ -3653,6 +3675,10 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (autoPort) priv->migrationPort = port; + // in this case port is autoselected and we don't need to manage it anymore + // after cookie is baked + if (nbdPort != 0) + priv->nbdPort = 0; ret = 0; cleanup: @@ -3664,7 +3690,10 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, /* priv is set right after vm is added to the list of domains * and there is no 'goto cleanup;' in the middle of those */ VIR_FREE(priv->origname); - virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); + // release if port is auto selected which is not the case if + // it is given in parameters + if (nbdPort == 0) + virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); priv->nbdPort = 0; qemuDomainRemoveInactive(driver, vm); } @@ -3721,7 +3750,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, def, origname, - st, NULL, 0, false, NULL, 0, NULL, flags); + st, NULL, 0, false, NULL, 0, NULL, 0, flags); return ret; } @@ -3763,6 +3792,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags) { unsigned short port = 0; @@ -3776,11 +3806,11 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " "def=%p, origname=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, flags=%lx", + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, flags=%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, *def, origname, NULLSTR(listenAddress), - nmigrate_disks, migrate_disks, flags); + nmigrate_disks, migrate_disks, nbdPort, flags); *uri_out = NULL; @@ -3885,7 +3915,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, cookieout, cookieoutlen, def, origname, NULL, uri ? uri->scheme : "tcp", port, autoPort, listenAddress, - nmigrate_disks, migrate_disks, flags); + nmigrate_disks, migrate_disks, nbdPort, flags); cleanup: virURIFree(uri); VIR_FREE(hostname); @@ -4365,7 +4395,8 @@ qemuMigrationRun(virQEMUDriverPtr driver, virConnectPtr dconn, const char *graphicsuri, size_t nmigrate_disks, - const char **migrate_disks) + const char **migrate_disks, + int nbdPort) { int ret = -1; unsigned int migrate_flags = QEMU_MONITOR_MIGRATE_BACKGROUND; @@ -4383,11 +4414,11 @@ qemuMigrationRun(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " "spec=%p (dest=%d, fwd=%d), dconn=%p, graphicsuri=%s, " - "nmigrate_disks=%zu, migrate_disks=%p", + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d", driver, vm, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, spec, spec->destType, spec->fwdType, dconn, - NULLSTR(graphicsuri), nmigrate_disks, migrate_disks); + NULLSTR(graphicsuri), nmigrate_disks, migrate_disks, nbdPort); if (flags & VIR_MIGRATE_NON_SHARED_DISK) { migrate_flags |= QEMU_MONITOR_MIGRATE_NON_SHARED_DISK; @@ -4425,6 +4456,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, /* This will update migrate_flags on success */ if (qemuMigrationDriveMirror(driver, vm, mig, spec->dest.host.name, + nbdPort, migrate_speed, &migrate_flags, nmigrate_disks, @@ -4661,7 +4693,8 @@ static int doNativeMigrate(virQEMUDriverPtr driver, virConnectPtr dconn, const char *graphicsuri, size_t nmigrate_disks, - const char **migrate_disks) + const char **migrate_disks, + int nbdPort) { qemuDomainObjPrivatePtr priv = vm->privateData; virURIPtr uribits = NULL; @@ -4670,10 +4703,11 @@ static int doNativeMigrate(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, vm=%p, uri=%s, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " - "graphicsuri=%s, nmigrate_disks=%zu migrate_disks=%p", + "graphicsuri=%s, nmigrate_disks=%zu, migrate_disks=%p, " + "nbdPort=%d", driver, vm, uri, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, - NULLSTR(graphicsuri), nmigrate_disks, migrate_disks); + NULLSTR(graphicsuri), nmigrate_disks, migrate_disks, nbdPort); if (!(uribits = qemuMigrationParseURI(uri, NULL))) return -1; @@ -4711,7 +4745,8 @@ static int doNativeMigrate(virQEMUDriverPtr driver, ret = qemuMigrationRun(driver, vm, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource, &spec, dconn, - graphicsuri, nmigrate_disks, migrate_disks); + graphicsuri, nmigrate_disks, migrate_disks, + nbdPort); if (spec.destType == MIGRATION_DEST_FD) VIR_FORCE_CLOSE(spec.dest.fd.qemu); @@ -4735,7 +4770,8 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, virConnectPtr dconn, const char *graphicsuri, size_t nmigrate_disks, - const char **migrate_disks) + const char **migrate_disks, + int nbdPort) { virNetSocketPtr sock = NULL; int ret = -1; @@ -4745,10 +4781,12 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, vm=%p, st=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, resource=%lu, " - "graphicsuri=%s, nmigrate_disks=%zu, migrate_disks=%p", + "graphicsuri=%s, nmigrate_disks=%zu, migrate_disks=%p, " + "nbdPort=%d", driver, vm, st, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, - NULLSTR(graphicsuri), nmigrate_disks, migrate_disks); + NULLSTR(graphicsuri), nmigrate_disks, migrate_disks, + nbdPort); spec.fwdType = MIGRATION_FWD_STREAM; spec.fwd.stream = st; @@ -4772,7 +4810,8 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, ret = qemuMigrationRun(driver, vm, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource, &spec, dconn, - graphicsuri, nmigrate_disks, migrate_disks); + graphicsuri, nmigrate_disks, migrate_disks, + nbdPort); cleanup: if (spec.destType == MIGRATION_DEST_FD) { @@ -4883,12 +4922,12 @@ static int doPeer2PeerMigrate2(virQEMUDriverPtr driver, ret = doTunnelMigrate(driver, vm, st, NULL, 0, NULL, NULL, flags, resource, dconn, - NULL, 0, NULL); + NULL, 0, NULL, 0); else ret = doNativeMigrate(driver, vm, uri_out, cookie, cookielen, NULL, NULL, /* No out cookie with v2 migration */ - flags, resource, dconn, NULL, 0, NULL); + flags, resource, dconn, NULL, 0, NULL, 0); /* Perform failed. Make sure Finish doesn't overwrite the error */ if (ret < 0) @@ -4952,6 +4991,7 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long long bandwidth, bool useParams, unsigned long flags) @@ -4975,11 +5015,11 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, sconn=%p, dconn=%p, dconnuri=%s, vm=%p, xmlin=%s, " "dname=%s, uri=%s, graphicsuri=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, bandwidth=%llu, " - "useParams=%d, flags=%lx", + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, " + "bandwidth=%llu, useParams=%d, flags=%lx", driver, sconn, dconn, NULLSTR(dconnuri), vm, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), NULLSTR(graphicsuri), - NULLSTR(listenAddress), nmigrate_disks, migrate_disks, + NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPort, bandwidth, useParams, flags); /* Unlike the virDomainMigrateVersion3 counterpart, we don't need @@ -5029,6 +5069,11 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, VIR_MIGRATE_PARAM_MIGRATE_DISKS, migrate_disks[i]) < 0) goto cleanup; + if (nbdPort && + virTypedParamsAddInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_NBD_PORT, + nbdPort) < 0) + goto cleanup; } if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) @@ -5114,13 +5159,13 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, cookiein, cookieinlen, &cookieout, &cookieoutlen, flags, bandwidth, dconn, graphicsuri, - nmigrate_disks, migrate_disks); + nmigrate_disks, migrate_disks, nbdPort); } else { ret = doNativeMigrate(driver, vm, uri, cookiein, cookieinlen, &cookieout, &cookieoutlen, flags, bandwidth, dconn, graphicsuri, - nmigrate_disks, migrate_disks); + nmigrate_disks, migrate_disks, nbdPort); } /* Perform failed. Make sure Finish doesn't overwrite the error */ @@ -5295,6 +5340,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags, const char *dname, unsigned long resource, @@ -5310,10 +5356,12 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, uri=%s, " "graphicsuri=%s, listenAddress=%s, nmigrate_disks=%zu, " - "migrate_disks=%p, flags=%lx, dname=%s, resource=%lu", + "migrate_disks=%p, nbdPort=%d, flags=%lx, dname=%s, " + "resource=%lu", driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), - nmigrate_disks, migrate_disks, flags, NULLSTR(dname), resource); + nmigrate_disks, migrate_disks, nbdPort, flags, NULLSTR(dname), + resource); if (flags & VIR_MIGRATE_TUNNELLED && uri) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", @@ -5408,8 +5456,8 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, if (*v3proto) { ret = doPeer2PeerMigrate3(driver, sconn, dconn, dconnuri, vm, xmlin, dname, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, resource, - useParams, flags); + nmigrate_disks, migrate_disks, nbdPort, + resource, useParams, flags); } else { ret = doPeer2PeerMigrate2(driver, sconn, dconn, vm, dconnuri, flags, dname, resource); @@ -5446,6 +5494,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, @@ -5481,13 +5530,13 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { ret = doPeer2PeerMigrate(driver, conn, vm, xmlin, dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, flags, dname, resource, &v3proto); } else { qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM2); ret = doNativeMigrate(driver, vm, uri, cookiein, cookieinlen, cookieout, cookieoutlen, - flags, resource, NULL, NULL, 0, NULL); + flags, resource, NULL, NULL, 0, NULL, 0); } if (ret < 0) goto endjob; @@ -5547,6 +5596,7 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver, const char *graphicsuri, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, @@ -5572,7 +5622,7 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver, ret = doNativeMigrate(driver, vm, uri, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource, NULL, graphicsuri, - nmigrate_disks, migrate_disks); + nmigrate_disks, migrate_disks, nbdPort); if (ret < 0) { if (qemuMigrationRestoreDomainState(conn, vm)) { @@ -5614,6 +5664,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, @@ -5625,13 +5676,14 @@ qemuMigrationPerform(virQEMUDriverPtr driver, { VIR_DEBUG("driver=%p, conn=%p, vm=%p, xmlin=%s, dconnuri=%s, " "uri=%s, graphicsuri=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, " + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, " "cookiein=%s, cookieinlen=%d, cookieout=%p, cookieoutlen=%p, " "flags=%lx, dname=%s, resource=%lu, v3proto=%d", driver, conn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), - nmigrate_disks, migrate_disks, NULLSTR(cookiein), cookieinlen, - cookieout, cookieoutlen, flags, NULLSTR(dname), resource, v3proto); + nmigrate_disks, migrate_disks, nbdPort, + NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, + flags, NULLSTR(dname), resource, v3proto); if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (cookieinlen) { @@ -5642,7 +5694,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, return qemuMigrationPerformJob(driver, conn, vm, xmlin, dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, resource, v3proto); @@ -5656,14 +5708,14 @@ qemuMigrationPerform(virQEMUDriverPtr driver, if (v3proto) { return qemuMigrationPerformPhase(driver, conn, vm, uri, graphicsuri, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, resource); } else { return qemuMigrationPerformJob(driver, conn, vm, xmlin, NULL, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, resource, v3proto); diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 2445e13..2796361 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -51,6 +51,7 @@ VIR_MIGRATE_PARAM_BANDWIDTH, VIR_TYPED_PARAM_ULLONG, \ VIR_MIGRATE_PARAM_GRAPHICS_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_LISTEN_ADDRESS, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_NBD_PORT, VIR_TYPED_PARAM_INT, \ VIR_MIGRATE_PARAM_MIGRATE_DISKS, VIR_TYPED_PARAM_STRING | \ VIR_TYPED_PARAM_MULTIPLE, \ NULL @@ -134,6 +135,7 @@ int qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags); int qemuMigrationPerform(virQEMUDriverPtr driver, @@ -146,6 +148,7 @@ int qemuMigrationPerform(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d239ba8..54c9fd0 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9651,6 +9651,10 @@ static const vshCmdOptDef opts_migrate[] = { .type = VSH_OT_STRING, .help = N_("comma separated list of disks to be migrated") }, + {.name = "nbd-port", + .type = VSH_OT_INT, + .help = N_("port to use by target nbd server") + }, {.name = NULL} }; @@ -9661,6 +9665,7 @@ doMigrate(void *opaque) virDomainPtr dom = NULL; const char *desturi = NULL; const char *opt = NULL; + int optInt = 0; unsigned int flags = 0; virshCtrlData *data = opaque; vshControl *ctl = data->ctl; @@ -9703,6 +9708,13 @@ doMigrate(void *opaque) VIR_MIGRATE_PARAM_LISTEN_ADDRESS, opt) < 0) goto save_error; + if (vshCommandOptInt(ctl, cmd, "nbd-port", &optInt) < 0) + goto out; + if (optInt && + virTypedParamsAddInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_NBD_PORT, optInt) < 0) + goto save_error; + if (vshCommandOptStringReq(ctl, cmd, "dname", &opt) < 0) goto out; if (opt && diff --git a/tools/virsh.pod b/tools/virsh.pod index e830c59..c0c4e81 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1532,7 +1532,7 @@ to the I<uri> namespace is displayed instead of being modified. [I<--compressed>] [I<--abort-on-error>] [I<--auto-converge>] I<domain> I<desturi> [I<migrateuri>] [I<graphicsuri>] [I<listen-address>] [I<dname>] [I<--timeout> B<seconds>] [I<--xml> B<file>] -[I<--migrate-disks> B<disk-list>] +[I<--migrate-disks> B<disk-list>] [I<--nbd-port> B<port>] Migrate domain to another host. Add I<--live> for live migration; <--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> @@ -1659,6 +1659,9 @@ addresses are accepted as well as hostnames (the resolving is done on destination). Some hypervisors do not support this feature and will return an error if this parameter is used. +Optional I<nbd-port> sets the port that hypervisor on destination side should +bind to for incoming nbd traffic. Currently it is supported only by qemu. + =item B<migrate-setmaxdowntime> I<domain> I<downtime> Set maximum tolerable downtime for a domain which is being live-migrated to -- 1.8.3.1

2 4

[libvirt] [PATCH 0/4] vz: rework domain creation
by Mikhail Feoktistov 12 Feb '16

12 Feb '16

Patches 1 and 2 make preparation for patch 4 Patch 3 fixes notification subscription To get domain info we should receive and handle notification from hypervisor Patch 4 fixes race condition when adding domain to domains list Race condition: User calls defineXML to create new instance. The main thread from vzDomainDefineXMLFlags() creates new instance by prlsdkCreateVm. Then this thread calls prlsdkAddDomain to add new domain to domains list. The second thread receives notification from hypervisor that new VM was created. It calls prlsdkHandleVmAddedEvent() and also tries to add new domain to domains list. These two threads call virDomainObjListFindByUUID() from prlsdkAddDomain() and don't find new domain. So they add two domains with the same uuid to domains list. Mikhail Feoktistov (4): vz: make output arguments in prlsdkGetDomainIds as optional vz: remove unused struct field vz: fix notification subscription vz: fix race condition when adding domain to domains list src/vz/vz_driver.c | 13 ++- src/vz/vz_sdk.c | 261 ++++++++++++++++++++++------------------------------- src/vz/vz_sdk.h | 7 +- src/vz/vz_utils.c | 44 +++++++++ src/vz/vz_utils.h | 5 +- 5 files changed, 174 insertions(+), 156 deletions(-) -- 1.8.3.1

3 6

[libvirt] [PATCH 0/3] Add capability for text based polkit authentication for virsh
by John Ferlan 11 Feb '16

11 Feb '16

https://bugzilla.redhat.com/show_bug.cgi?id=872166 As an alternative to commit id 'e94979e90' which allows polkit authentication by adding users to the 'libvirt' group, add the ability to start and utilize a text based authentication agent for virsh. At the very least patch 1 will suffice part of the issue listed in the bz - the opaque error message related to "some agent". For patch 2, it was far easier to utilize what polkit provides in pkttyagent and pkcheck utilities, than adding some code which requires POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE being #defined for compilation. I chose 'pkauth' to mean polkit authentication - figured it was a workable shorthand, but if there's better suggestions those can be considered. John Ferlan (3): polkit: Adjust message when action-id isn't found util: Introduce API's for Polkit text authentication virsh: Add support for text based polkit authentication src/libvirt_private.syms | 3 ++ src/util/virpolkit.c | 104 +++++++++++++++++++++++++++++++++++++++++++++-- src/util/virpolkit.h | 7 ++++ tests/virpolkittest.c | 3 +- tools/virsh.c | 22 ++++++++-- tools/virsh.h | 2 + tools/virsh.pod | 10 +++++ tools/vsh.h | 1 + 8 files changed, 144 insertions(+), 8 deletions(-) -- 2.5.0

2 11

[libvirt] [PATCH 0/2] tests: Fix mock libraries linking
by Andrea Bolognani 11 Feb '16

11 Feb '16

This patches make sure mock libraries do not link against either too many or too few libraries. Cheers. Andrea Bolognani (2): tests: Use plain close() in mock code tests: Link mock libraries against gnulib and gnulib only tests/Makefile.am | 21 +++++++++++++++------ tests/virportallocatortest.c | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) -- 2.5.0

2 5

[libvirt] [PATCH 0/4] tests: Fix syntax-check failure, plus extras
by Andrea Bolognani 11 Feb '16

11 Feb '16

Commit a03cbfe0fb introduced a syntax-check failure: patch 1/4 prepares for 2/4, where the failure is actually fixed. Patches 3/4 and 4/4 improve the naming consistency for mock libraries by shuffling files around a bit. Cheers. Andrea Bolognani (4): tests: Split off the mock part of the port allocator test tests: Allow use of close() in mock libraries tests: Don't use "lib" prefix for mock libraries tests: Rename virmockdbus -> virdbusmock for consistency cfg.mk | 2 +- tests/Makefile.am | 26 ++++---- tests/{virmockdbus.c => virdbusmock.c} | 2 +- tests/virfirewalltest.c | 2 +- tests/virpolkittest.c | 2 +- tests/virportallocatormock.c | 108 +++++++++++++++++++++++++++++++ tests/virportallocatortest.c | 112 +++------------------------------ tests/virsystemdtest.c | 2 +- 8 files changed, 134 insertions(+), 122 deletions(-) rename tests/{virmockdbus.c => virdbusmock.c} (97%) create mode 100644 tests/virportallocatormock.c -- 2.5.0

2 7

[libvirt] Found mem leak in livirt, need help to debug
by Piotr Rybicki 11 Feb '16

11 Feb '16

Hi. There is a mem leak in libvirt, when doing external snapshot (for backup purposes). My KVM domain uses raw storage images via libgfapi. I'm using latest 1.2.21 libvirt (although previous versions act the same). My bash script for snapshot backup uses series of shell commands (virsh connect to a remote libvirt host): * virsh domblklist KVM * qemu-img create -f qcow2 -o backing_file=gluster(...) - precreate backing file * virsh snapshot-create KVM SNAP.xml (...) - create snapshot from precreated XML snapshot file * cp main img file * virsh blockcommit KVM disk (...) Backup script works fine, however libvirtd process gets bigger and bigger each time I run this script. Some proof of memleak: 32017 - libvirtd pid When libvirt started: # ps p 32017 o vsz,rss VSZ RSS 585736 15220 When I start KVM via virsh start KVM # ps p 32017 o vsz,rss VSZ RSS 1327968 125956 When i start backup script, after snapshot is created (lots of mem allocated) # ps p 32017 o vsz,rss VSZ RSS 3264544 537632 After backup script finished # ps p 32017 o vsz,rss VSZ RSS 3715920 644940 When i start backup script for a second time, after snapshot is created # ps p 32017 o vsz,rss VSZ RSS 5521424 1056352 And so on, until libvirt spills 'Out of memory' when connecting, ane being really huge process. Now, I would like to diagnose it further, to provide detailed information about memleak. I tried to use valgrind, but unfortunatelly I'm on Opteron 6380 platform, and valgrind doesn't support XOP quitting witch SIGILL. If someone could provide me with detailed information on how to get some usefull debug info about this memleak, i'll be more than happy to do it, and share results here. Thanks in advance and best regards Piotr Rybicki

3 13

[libvirt] [PATCH 0/4] conf: snapshot: refactor and fix autogenerated duplicate snapshot targets
by Peter Krempa 11 Feb '16

11 Feb '16

Peter Krempa (4): conf: snapshot: Rename disksorter to virDomainSnapshotCompareDiskIndex snapshot: conf: Extract code to generate default external file names conf: snapshot: Refactor virDomainSnapshotDefAssignExternalNames conf: snapshot: Avoid autogenerating duplicate snapshot names src/conf/snapshot_conf.c | 142 ++++++++++++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 56 deletions(-) -- 2.6.2

2 9

[libvirt] [RFC] vhost-user + shared memory + NUMA
by Pavel Fedin 11 Feb '16

11 Feb '16

Hello! vhost-user has a small limitation: guest memory must be shared. However, this simple requirement is satisfied by Libvirt only in very complicated case: 1. We have to specify NUMA configuration, because we can have "shared" attribute only for node descriptors inside "NUMA" section. 2. We have to specify huge page size, because memory-backend-file is used only in this case. Isn't it a problem? In order to do a simple thing (use vhost-user) we have to add two more quote unobvious things, making the whole stuff significantly more complicated. This creates even more problems on the level above, for example in order to get OpenStack working with userspace networking, we have to edit all flavors and rebuild all instances. And no single documentation mentions it. Shouldn't Libvirt simply detect usage of vhost-user, and build some minimal configuration with shared memory? For example, it could be memory-backend-file on /dev/mem. If the community agrees that it's a good idea, improving the usability, i can propose patches. Kind regards, Pavel Fedin Senior Engineer Samsung Electronics Research center Russia

2 4

[libvirt] [PATCH] syntax-check: Allow plain close in virportallocatortest
by Michal Privoznik 11 Feb '16

11 Feb '16

After a03cbfe0fb9 we switched to a plain close() instead of VIR_FORCE_CLOSE(). This makes sense because it's a mocking library and thus should not require anything from libvirt. However, we forgot add an exemption to our 'forbid close' rule. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- cfg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index 3f78842..dbd22a7 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1158,7 +1158,7 @@ exclude_file_name_regexp--sc_prohibit_strdup = \ ^(docs/|examples/|src/util/virstring\.c|tests/vir(netserverclient|cgroup)mock.c$$) exclude_file_name_regexp--sc_prohibit_close = \ - (\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/virfile\.c|src/libvirt-stream\.c|tests/vir(cgroup|pci)mock\.c)$$) + (\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/virfile\.c|src/libvirt-stream\.c|tests/vir((cgroup|pci)mock|portallocatortest)\.c)$$) exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ (^tests/(qemuhelp|nodeinfo|virpcitest)data/|\.diff$$) -- 2.4.10

2 1

[libvirt] [PATCH] dbus: Don't unref NULL messages
by Michal Privoznik 11 Feb '16

11 Feb '16

Apparently we are not the only ones with dumb free functions because dbus_message_unref() does not accept NULL either. But if I were to vote, this one is even more evil. Instead of returning an error just like we do it immediately dereference any pointer passed and thus crash you app. Well done DBus! Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0x7f878ebda700 (LWP 31264)] 0x00007f87be4016e5 in ?? () from /usr/lib64/libdbus-1.so.3 (gdb) bt #0 0x00007f87be4016e5 in ?? () from /usr/lib64/libdbus-1.so.3 #1 0x00007f87be3f004e in dbus_message_unref () from /usr/lib64/libdbus-1.so.3 #2 0x00007f87bf6ecf95 in virSystemdGetMachineNameByPID (pid=9849) at util/virsystemd.c:228 #3 0x00007f879761bd4d in qemuConnectCgroup (driver=0x7f87600a32a0, vm=0x7f87600c7550) at qemu/qemu_cgroup.c:909 #4 0x00007f87976386b7 in qemuProcessReconnect (opaque=0x7f87600db840) at qemu/qemu_process.c:3386 #5 0x00007f87bf6edfff in virThreadHelper (data=0x7f87600d5580) at util/virthread.c:206 #6 0x00007f87bb602334 in start_thread (arg=0x7f878ebda700) at pthread_create.c:333 #7 0x00007f87bb3481bd in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:109 (gdb) frame 2 #2 0x00007f87bf6ecf95 in virSystemdGetMachineNameByPID (pid=9849) at util/virsystemd.c:228 228 dbus_message_unref(reply); (gdb) p reply $1 = (DBusMessage *) 0x0 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt_private.syms | 1 + src/rpc/virnetdaemon.c | 4 ++-- src/util/virdbus.c | 14 +++++++------- src/util/virdbus.h | 1 - src/util/virfirewall.c | 3 +-- src/util/virsystemd.c | 2 +- tests/virdbustest.c | 20 ++++++++++---------- tests/virfirewalltest.c | 3 +-- tests/virpolkittest.c | 2 +- tests/virsystemdtest.c | 3 ++- 10 files changed, 26 insertions(+), 27 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5ae3618..4cfaed5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1370,6 +1370,7 @@ virDBusHasSystemBus; virDBusMessageDecode; virDBusMessageEncode; virDBusMessageRead; +virDBusMessageUnref; virDBusSetSharedBus; diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index 910f266..18c962c 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -374,7 +374,7 @@ virNetDaemonGotInhibitReply(DBusPendingCall *pending, VIR_FORCE_CLOSE(fd); } } - dbus_message_unref(reply); + virDBusMessageUnref(reply); cleanup: virObjectUnlock(dmn); @@ -426,7 +426,7 @@ virNetDaemonCallInhibit(virNetDaemonPtr dmn, dmn, NULL); dmn->autoShutdownCallingInhibit = true; } - dbus_message_unref(message); + virDBusMessageUnref(message); } #endif diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 78fb795..3f4dbe3 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1398,7 +1398,7 @@ int virDBusCreateMethodV(DBusMessage **call, } if (virDBusMessageEncodeArgs(*call, types, args) < 0) { - dbus_message_unref(*call); + virDBusMessageUnref(*call); *call = NULL; goto cleanup; } @@ -1467,7 +1467,7 @@ int virDBusCreateReplyV(DBusMessage **reply, } if (virDBusMessageEncodeArgs(*reply, types, args) < 0) { - dbus_message_unref(*reply); + virDBusMessageUnref(*reply); *reply = NULL; goto cleanup; } @@ -1586,7 +1586,7 @@ virDBusCall(DBusConnection *conn, if (ret == 0 && replyout) *replyout = reply; else - dbus_message_unref(reply); + virDBusMessageUnref(reply); } return ret; } @@ -1650,8 +1650,7 @@ int virDBusCallMethod(DBusConnection *conn, ret = virDBusCall(conn, call, replyout, error); cleanup: - if (call) - dbus_message_unref(call); + virDBusMessageUnref(call); return ret; } @@ -1727,7 +1726,7 @@ static int virDBusIsServiceInList(const char *listMethod, const char *name) } cleanup: - dbus_message_unref(reply); + virDBusMessageUnref(reply); return ret; } @@ -1763,7 +1762,8 @@ int virDBusIsServiceRegistered(const char *name) void virDBusMessageUnref(DBusMessage *msg) { - dbus_message_unref(msg); + if (msg) + dbus_message_unref(msg); } #else /* ! WITH_DBUS */ diff --git a/src/util/virdbus.h b/src/util/virdbus.h index 9e86538..86b4223 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -28,7 +28,6 @@ # else # define DBusConnection void # define DBusMessage void -# define dbus_message_unref(m) do {} while (0) # endif # include "internal.h" diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index a972c05..f26fd86 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -822,8 +822,7 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, cleanup: virResetError(&error); - if (reply) - dbus_message_unref(reply); + virDBusMessageUnref(reply); return ret; } diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 6677798..4883f94 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -225,7 +225,7 @@ virSystemdGetMachineNameByPID(pid_t pid) cleanup: VIR_FREE(object); - dbus_message_unref(reply); + virDBusMessageUnref(reply); return name; } diff --git a/tests/virdbustest.c b/tests/virdbustest.c index 4ec3c0d..1622b03 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -121,7 +121,7 @@ static int testMessageSimple(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_string); VIR_FREE(out_signature); VIR_FREE(out_objectpath); - dbus_message_unref(msg); + virDBusMessageUnref(msg); return ret; } @@ -171,7 +171,7 @@ static int testMessageVariant(const void *args ATTRIBUTE_UNUSED) cleanup: VIR_FREE(out_str1); VIR_FREE(out_str2); - dbus_message_unref(msg); + virDBusMessageUnref(msg); return ret; } @@ -230,7 +230,7 @@ static int testMessageArray(const void *args ATTRIBUTE_UNUSED) cleanup: VIR_FREE(out_str1); VIR_FREE(out_str2); - dbus_message_unref(msg); + virDBusMessageUnref(msg); return ret; } @@ -274,7 +274,7 @@ static int testMessageEmptyArrayRef(const void *args ATTRIBUTE_UNUSED) ret = 0; cleanup: - dbus_message_unref(msg); + virDBusMessageUnref(msg); return ret; } @@ -323,7 +323,7 @@ static int testMessageSingleArrayRef(const void *args ATTRIBUTE_UNUSED) cleanup: if (out_strv1) VIR_FREE(out_strv1[0]); - dbus_message_unref(msg); + virDBusMessageUnref(msg); return ret; } @@ -436,7 +436,7 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) for (i = 0; i < out_nstrv2; i++) VIR_FREE(out_strv2[i]); VIR_FREE(out_strv2); - dbus_message_unref(msg); + virDBusMessageUnref(msg); return ret; } @@ -511,7 +511,7 @@ static int testMessageStruct(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_string); VIR_FREE(out_signature); VIR_FREE(out_objectpath); - dbus_message_unref(msg); + virDBusMessageUnref(msg); return ret; } @@ -581,7 +581,7 @@ static int testMessageDict(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_key1); VIR_FREE(out_key2); VIR_FREE(out_key3); - dbus_message_unref(msg); + virDBusMessageUnref(msg); return ret; } @@ -652,7 +652,7 @@ static int testMessageDictRef(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_strv1[5]); } VIR_FREE(out_strv1); - dbus_message_unref(msg); + virDBusMessageUnref(msg); return ret; } @@ -695,7 +695,7 @@ static int testMessageEmptyDictRef(const void *args ATTRIBUTE_UNUSED) ret = 0; cleanup: - dbus_message_unref(msg); + virDBusMessageUnref(msg); return ret; } diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 1f8d8f1..8f6fc9e 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -179,8 +179,7 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, return reply; error: - if (reply) - dbus_message_unref(reply); + virDBusMessageUnref(reply); reply = NULL; if (error && !dbus_error_is_set(error)) dbus_set_error_const(error, diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c index cdf78f5..b39beed 100644 --- a/tests/virpolkittest.c +++ b/tests/virpolkittest.c @@ -140,7 +140,7 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, return reply; error: - dbus_message_unref(reply); + virDBusMessageUnref(reply); return NULL; } diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 46452dd..101f5e0 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -28,6 +28,7 @@ # include <dbus/dbus.h> # include "virsystemd.h" +# include "virdbus.h" # include "virlog.h" # include "virmock.h" # define VIR_FROM_THIS VIR_FROM_NONE @@ -151,7 +152,7 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, return reply; error: - dbus_message_unref(reply); + virDBusMessageUnref(reply); return NULL; } -- 2.4.10

2 1

[libvirt] [PATCH] Revert "tests: Don't link mock libraries against libvirt and gnulib"
by Andrea Bolognani 11 Feb '16

11 Feb '16

This reverts commit 6aa90452aa63cb1e1ffa84ff5f93f5873bf810a0. Turns out that not linking against libvirt and gnulib is okay for regular Linux (and FreeBSD) builds, but makes mingw very unhappy. .../virnetserverclientmock_la-virnetserverclientmock.o: In function `virNetSocketGetSELinuxContext': .../virnetserverclientmock.c:61: undefined reference to `rpl_strdup' .../libvirportallocatormock_la-virportallocatortest.o: In function `init_syms': .../virportallocatortest.c:61: undefined reference to `virFileClose' --- Pushed as build breaker. Bunny ears of shame will be deployed in the morning. tests/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index fb862cd..c5986f0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -946,6 +946,7 @@ virnetserverclientmock_la_SOURCES = \ virnetserverclientmock.c virnetserverclientmock_la_CFLAGS = $(AM_CFLAGS) virnetserverclientmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +virnetserverclientmock_la_LIBADD = $(GNULIB_LIBS) if WITH_GNUTLS virnettlscontexttest_SOURCES = \ @@ -1024,6 +1025,7 @@ libvirportallocatormock_la_SOURCES = \ virportallocatortest.c libvirportallocatormock_la_CFLAGS = $(AM_CFLAGS) -DMOCK_HELPER=1 libvirportallocatormock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +libvirportallocatormock_la_LIBADD = ../src/libvirt.la vircgrouptest_SOURCES = \ vircgrouptest.c testutils.h testutils.c @@ -1049,6 +1051,8 @@ virpcitest_LDADD = $(LDADDS) virpcimock_la_SOURCES = \ virpcimock.c virpcimock_la_CFLAGS = $(AM_CFLAGS) +virpcimock_la_LIBADD = $(GNULIB_LIBS) \ + ../src/libvirt.la virpcimock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) nodeinfomock_la_SOURCES = \ @@ -1064,6 +1068,8 @@ virnetdevtest_LDADD = $(LDADDS) virnetdevmock_la_SOURCES = \ virnetdevmock.c virnetdevmock_la_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS) +virnetdevmock_la_LIBADD = $(GNULIB_LIBS) \ + ../src/libvirt.la virnetdevmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virrotatingfiletest_SOURCES = \ -- 2.5.0

2 4

[libvirt] [PATCH] Prohibit verbose strcat
by Ján Tomko 11 Feb '16

11 Feb '16

Using strcat directly is more readable than passing strlen of the copied string to strncat. --- cfg.mk | 5 +++++ src/storage/storage_backend_logical.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index 71b0866..be9e475 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1031,6 +1031,11 @@ sc_prohibit_not_strneq: halt='Use STREQ instead of !STRNEQ' \ $(_sc_search_regexp) +sc_prohibit_verbose_strcat: + @prohibit='strncat$[^,]*,\s+([^,]*),\s+strlen\(\1$\)' \ + halt='Use strcat(a, b) instead of strncat(a, b, strlen())' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ba26223..f0d6f80 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -123,11 +123,11 @@ virStorageBackendLogicalParseVolExtents(virStorageVolDefPtr vol, /* Allocate space for 'nextents' regex_unit strings plus a comma for each */ if (VIR_ALLOC_N(regex, nextents * (strlen(regex_unit) + 1) + 1) < 0) goto cleanup; - strncat(regex, regex_unit, strlen(regex_unit)); + strcat(regex, regex_unit); for (i = 1; i < nextents; i++) { /* "," is the separator of "devices" field */ strcat(regex, ","); - strncat(regex, regex_unit, strlen(regex_unit)); + strcat(regex, regex_unit); } if (VIR_ALLOC(reg) < 0) -- 2.4.10

2 3

[libvirt] [PATCH] virhook: do not save the return value of virBuildPath
by Ján Tomko 11 Feb '16

11 Feb '16

This function returns -1 on allocation error, there's no need to check the path for NULL again. --- src/util/virhook.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/util/virhook.c b/src/util/virhook.c index ee19382..ba50598 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -119,8 +119,7 @@ virHookCheck(int no, const char *driver) return -1; } - ret = virBuildPath(&path, LIBVIRT_HOOK_DIR, driver); - if ((ret < 0) || (path == NULL)) { + if (virBuildPath(&path, LIBVIRT_HOOK_DIR, driver) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to build path for %s hook"), driver); @@ -276,8 +275,7 @@ virHookCall(int driver, if (extra == NULL) extra = "-"; - ret = virBuildPath(&path, LIBVIRT_HOOK_DIR, drvstr); - if ((ret < 0) || (path == NULL)) { + if (virBuildPath(&path, LIBVIRT_HOOK_DIR, drvstr) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to build path for %s hook"), drvstr); -- 2.4.10

2 2

[libvirt] [PATCH] Clean up usage of 'ret' variable
by Ján Tomko 10 Feb '16

10 Feb '16

Do not store the return value of called functions in the same variable as the (future) return value of the current function. This makes tracking the origin of the value easier and reduces the chance of introducing a new point of exit without resetting the return value back to -1. --- src/storage/storage_backend.c | 13 +++++-------- src/uml/uml_driver.c | 5 ++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index c07b642..231eccf 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1963,26 +1963,23 @@ virStorageBackendVolZeroSparseFileLocal(virStorageVolDefPtr vol, off_t size, int fd) { - int ret = -1; - - ret = ftruncate(fd, 0); - if (ret == -1) { + if (ftruncate(fd, 0) < 0) { virReportSystemError(errno, _("Failed to truncate volume with " "path '%s' to 0 bytes"), vol->target.path); - return ret; + return -1; } - ret = ftruncate(fd, size); - if (ret == -1) { + if (ftruncate(fd, size) < 0) { virReportSystemError(errno, _("Failed to truncate volume with " "path '%s' to %ju bytes"), vol->target.path, (uintmax_t)size); + return -1; } - return ret; + return 0; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 3cfa36f..b0dba5c 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1131,12 +1131,11 @@ static int umlStartVMDaemon(virConnectPtr conn, virCommandSetErrorFD(cmd, &logfd); virCommandDaemonize(cmd); - ret = virCommandRun(cmd, NULL); - if (ret < 0) + if (virCommandRun(cmd, NULL) < 0) goto cleanup; if (autoDestroy && - (ret = umlProcessAutoDestroyAdd(driver, vm, conn)) < 0) + umlProcessAutoDestroyAdd(driver, vm, conn) < 0) goto cleanup; ret = virDomainObjSetDefTransient(driver->caps, driver->xmlopt, vm, false); -- 2.4.10

2 1

[libvirt] [PATCH] rbd: Use RBD fast-diff for querying actual volume allocation
by Wido den Hollander 10 Feb '16

10 Feb '16

Since Ceph version Infernalis (9.2.0) the new fast-diff mechanism of RBD allows for querying actual volume usage. Prior to this version there was no easy and fast way to query how much allocation a RBD volume had inside a Ceph cluster. To use the fast-diff feature it needs to be enabled per RBD image and is only supported by Ceph cluster running version Infernalis (9.2.0) or newer. Without the fast-diff feature enabled libvirt will report an allocation identical to the image capacity. This is how libvirt behaves currently. 'virsh vol-info rbd/image2' might output for example: Name: image2 Type: network Capacity: 1,00 GiB Allocation: 124,00 MiB Newly created volumes will have the fast-diff feature enabled if the backing Ceph cluster supports it. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/storage/storage_backend_rbd.c | 48 +++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 5d73370..cdcfa48 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -279,6 +279,20 @@ virStorageBackendRBDCloseRADOSConn(virStorageBackendRBDStatePtr ptr) return ret; } +#if LIBRBD_VERSION_CODE > 265 +static int +virStorageBackendRBDRefreshVolInfoCb(uint64_t offset ATTRIBUTE_UNUSED, + size_t len, + int exists, + void *arg) { + uint64_t *used_size = (uint64_t *)(arg); + if (exists) + (*used_size) += len; + + return 0; +} +#endif + static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, virStoragePoolObjPtr pool, @@ -288,6 +302,8 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, int r = 0; rbd_image_t image = NULL; rbd_image_info_t info; + uint64_t features ATTRIBUTE_UNUSED; + uint64_t used_size ATTRIBUTE_UNUSED = 0; if ((r = rbd_open_read_only(ptr->ioctx, vol->name, &image, NULL)) < 0) { ret = -r; @@ -303,15 +319,39 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, goto cleanup; } - VIR_DEBUG("Refreshed RBD image %s/%s (size: %zu obj_size: %zu num_objs: %zu)", - pool->def->source.name, vol->name, info.size, info.obj_size, - info.num_objs); - vol->target.capacity = info.size; vol->target.allocation = info.obj_size * info.num_objs; vol->type = VIR_STORAGE_VOL_NETWORK; vol->target.format = VIR_STORAGE_FILE_RAW; +#if LIBRBD_VERSION_CODE > 265 + if ((r = rbd_get_features(image, &features)) < 0) { + virReportSystemError(-r, _("failed to get flags of RBD image '%s'"), + vol->name); + goto cleanup; + } + + if (features & RBD_FEATURE_FAST_DIFF) { + VIR_DEBUG("RBD image %s/%s has fast-diff enabled. Querying allocation", + pool->def->source.name, vol->name); + + if ((r = rbd_diff_iterate2(image, NULL, 0, info.size, 0, 1, + &virStorageBackendRBDRefreshVolInfoCb, + &used_size)) < 0) { + virReportSystemError(-r, _("failed to iterate RBD image '%s'"), + vol->name); + goto cleanup; + } + + vol->target.allocation = used_size; + } +#endif + + VIR_DEBUG("Refreshed RBD image %s/%s (capacity: %llu allocation: %llu " + "obj_size: %zu num_objs: %zu)", + pool->def->source.name, vol->name, vol->target.capacity, + vol->target.allocation, info.obj_size, info.num_objs); + VIR_FREE(vol->target.path); if (virAsprintf(&vol->target.path, "%s/%s", pool->def->source.name, -- 1.9.1

2 1

[libvirt] [PATCH 0/5] vbox: remove extra spaces
by Ján Tomko 10 Feb '16

10 Feb '16

Ján Tomko (5): vbox: remove extra spaces from macro definitions vbox: remove extra spaces from variable initializations vbox: remove extra spaces from assignments vbox: remove extra spaces from function headers vbox: remove more extra spaces src/vbox/vbox_V2_2.c | 4 +- src/vbox/vbox_V3_0.c | 4 +- src/vbox/vbox_V3_1.c | 4 +- src/vbox/vbox_V3_2.c | 4 +- src/vbox/vbox_V4_0.c | 4 +- src/vbox/vbox_V4_1.c | 4 +- src/vbox/vbox_V4_2.c | 4 +- src/vbox/vbox_V4_2_20.c | 4 +- src/vbox/vbox_V4_3.c | 4 +- src/vbox/vbox_V4_3_4.c | 4 +- src/vbox/vbox_XPCOMCGlue.c | 6 +- src/vbox/vbox_common.c | 317 +++++++++++++++++++++--------------------- src/vbox/vbox_common.h | 4 +- src/vbox/vbox_snapshot_conf.c | 4 +- src/vbox/vbox_storage.c | 2 +- src/vbox/vbox_tmpl.c | 187 ++++++++++++------------- src/vbox/vbox_uniformed_api.h | 2 +- 17 files changed, 282 insertions(+), 280 deletions(-) -- 2.4.10

2 6

[libvirt] [PATCH v5] qemu: Connect to guest agent iff needed
by Michal Privoznik 10 Feb '16

10 Feb '16

https://bugzilla.redhat.com/show_bug.cgi?id=1293351 Since we already have virtio channel events, we know when guest agent within guest has (dis-)connected. Instead of us blindly connecting to a socket that no one is listening to, we can just follow what qemu-ga does. This has a nice benefit that we don't need to 'guest-ping' the agent just to timeout and find out nobody is listening. The way that this commit is implemented: - don't connect in qemuProcessLaunch directly, defer that to event callback (which already follows the agent) - processSerialChangedEvent - after migration is settled, before we resume vCPUs, ask qemu whether somebody is listening on the socket and if so, connect to it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v4: - drop asking qemu in qemuConnectAgent; in most cases we were asking twice. Rather put explicit virtio channel querying into places that were missing it anyway. - Move qemuConnectAgent in qemuProcessReconnect() *after* we have refreshed channel states. src/qemu/qemu_migration.c | 15 +++++++++++++++ src/qemu/qemu_process.c | 39 ++++++++++++++++++++++++--------------- src/qemu/qemu_process.h | 2 ++ 3 files changed, 41 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 51e7125..3493d0b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5795,6 +5795,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, unsigned short port; unsigned long long timeReceived = 0; virObjectEventPtr event; + int rc; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", @@ -5863,6 +5864,20 @@ qemuMigrationFinish(virQEMUDriverPtr driver, if (qemuMigrationStopNBDServer(driver, vm, mig) < 0) goto endjob; + if (qemuRefreshVirtioChannelState(driver, vm) < 0) + goto endjob; + + if ((rc = qemuConnectAgent(driver, vm)) < 0) { + if (rc == -2) + goto endjob; + + VIR_WARN("Cannot connect to QEMU guest agent for %s", + vm->def->name); + virResetLastError(); + priv->agentError = true; + } + + if (flags & VIR_MIGRATE_PERSIST_DEST) { if (qemuMigrationPersist(driver, vm, mig, !v3proto) < 0) { /* Hmpf. Migration was successful, but making it persistent diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ee94d3f..b063035 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -208,6 +208,15 @@ qemuConnectAgent(virQEMUDriverPtr driver, virDomainObjPtr vm) if (!config) return 0; + if (priv->agent) + return 0; + + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VSERPORT_CHANGE) && + config->state != VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED) { + VIR_DEBUG("Deferring connecting to guest agent"); + return 0; + } + if (virSecurityManagerSetDaemonSocketLabel(driver->securityManager, vm->def) < 0) { VIR_ERROR(_("Failed to set security context for agent for %s"), @@ -1887,9 +1896,9 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, } -static int -qemuProcessReconnectRefreshChannelVirtioState(virQEMUDriverPtr driver, - virDomainObjPtr vm) +int +qemuRefreshVirtioChannelState(virQEMUDriverPtr driver, + virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; virHashTablePtr info = NULL; @@ -3567,17 +3576,6 @@ qemuProcessReconnect(void *opaque) if (qemuConnectMonitor(driver, obj, QEMU_ASYNC_JOB_NONE, NULL) < 0) goto error; - /* Failure to connect to agent shouldn't be fatal */ - if ((ret = qemuConnectAgent(driver, obj)) < 0) { - if (ret == -2) - goto error; - - VIR_WARN("Cannot connect to QEMU guest agent for %s", - obj->def->name); - virResetLastError(); - priv->agentError = true; - } - if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) goto error; @@ -3664,7 +3662,7 @@ qemuProcessReconnect(void *opaque) if (qemuDomainCheckEjectableMedia(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) goto error; - if (qemuProcessReconnectRefreshChannelVirtioState(driver, obj) < 0) + if (qemuRefreshVirtioChannelState(driver, obj) < 0) goto error; if (qemuProcessRefreshBalloonState(driver, obj, QEMU_ASYNC_JOB_NONE) < 0) @@ -3676,6 +3674,17 @@ qemuProcessReconnect(void *opaque) if (qemuProcessUpdateDevices(driver, obj) < 0) goto error; + /* Failure to connect to agent shouldn't be fatal */ + if ((ret = qemuConnectAgent(driver, obj)) < 0) { + if (ret == -2) + goto error; + + VIR_WARN("Cannot connect to QEMU guest agent for %s", + obj->def->name); + virResetLastError(); + priv->agentError = true; + } + /* update domain state XML with possibly updated state in virDomainObj */ if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, obj) < 0) goto error; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index cb5cee1..48e5632 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -153,4 +153,6 @@ virDomainDiskDefPtr qemuProcessFindDomainDiskByAlias(virDomainObjPtr vm, int qemuConnectAgent(virQEMUDriverPtr driver, virDomainObjPtr vm); +int qemuRefreshVirtioChannelState(virQEMUDriverPtr driver, + virDomainObjPtr vm); #endif /* __QEMU_PROCESS_H__ */ -- 2.4.10

2 1

[libvirt] [PATCH v2 0/3] Check return status for virDomainGraphicsListenSetAddress
by John Ferlan 10 Feb '16

10 Feb '16

v1: http://www.redhat.com/archives/libvir-list/2016-February/msg00428.html Adjustments since v1: * Implement suggestions - created qemuParseCommandLineVnc to handle the alloc/free of the 'vnc'... Note: Difference in refactored code is to use of "cleanup" instead of "error" and "ret = -1" initializer. * Modify the virDomainGraphicsListenSetAddress, to have one call instead of two... adjusting the 'val' based on whether find '[' in first char * Split out the qemuParseCommandLine{String|Pid} functions into their own module along with all the collateral damage that causes. Pared down the list of #includes for new modules by build trial and error. John Ferlan (3): qemu: Introduce qemuParseCommandLineVnc qemu: Check return status for virDomainGraphicsListenSetAddress qemu: Split the command parsing routines into own module po/POTFILES.in | 1 + src/Makefile.am | 1 + src/qemu/qemu_command.c | 2703 ---------------------------------------- src/qemu/qemu_command.h | 28 +- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_driver.c | 1 + src/qemu/qemu_monitor_json.c | 3 +- src/qemu/qemu_parse_command.c | 2744 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_parse_command.h | 53 + tests/qemuargv2xmltest.c | 2 +- 10 files changed, 2807 insertions(+), 2732 deletions(-) create mode 100644 src/qemu/qemu_parse_command.c create mode 100644 src/qemu/qemu_parse_command.h -- 2.5.0

3 8

[libvirt] [PATCH] tests: Don't link mock libraries against libvirt and gnulib
by Andrea Bolognani 10 Feb '16

10 Feb '16

Mock libraries are used with LD_PRELOAD from test binaries that are already linked against those libraries, so they will be able to resolve the symbols anyway. --- tests/Makefile.am | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c5986f0..fb862cd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -946,7 +946,6 @@ virnetserverclientmock_la_SOURCES = \ virnetserverclientmock.c virnetserverclientmock_la_CFLAGS = $(AM_CFLAGS) virnetserverclientmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) -virnetserverclientmock_la_LIBADD = $(GNULIB_LIBS) if WITH_GNUTLS virnettlscontexttest_SOURCES = \ @@ -1025,7 +1024,6 @@ libvirportallocatormock_la_SOURCES = \ virportallocatortest.c libvirportallocatormock_la_CFLAGS = $(AM_CFLAGS) -DMOCK_HELPER=1 libvirportallocatormock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) -libvirportallocatormock_la_LIBADD = ../src/libvirt.la vircgrouptest_SOURCES = \ vircgrouptest.c testutils.h testutils.c @@ -1051,8 +1049,6 @@ virpcitest_LDADD = $(LDADDS) virpcimock_la_SOURCES = \ virpcimock.c virpcimock_la_CFLAGS = $(AM_CFLAGS) -virpcimock_la_LIBADD = $(GNULIB_LIBS) \ - ../src/libvirt.la virpcimock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) nodeinfomock_la_SOURCES = \ @@ -1068,8 +1064,6 @@ virnetdevtest_LDADD = $(LDADDS) virnetdevmock_la_SOURCES = \ virnetdevmock.c virnetdevmock_la_CFLAGS = $(AM_CFLAGS) $(LIBNL_CFLAGS) -virnetdevmock_la_LIBADD = $(GNULIB_LIBS) \ - ../src/libvirt.la virnetdevmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virrotatingfiletest_SOURCES = \ -- 2.5.0

2 2

[libvirt] [PATCH v3 0/6] storage:dir: ploop volumes support
by Olga Krishtal 10 Feb '16

10 Feb '16

v3: - no VIR_STORAGE_VOL_PLOOP type any more - adapted all patches according to previous change - fixed comments v2: - fixed memory leak - chenged the return value of all helper functions to 0/-1. Now check for success is smth like that: vir****Ploop() < 0 - fixed some identation issues.

2 13

[libvirt] [PATCH 0/2] Couple of coverity fixes
by Michal Privoznik 10 Feb '16

10 Feb '16

It was brought to my attention that coverity spotted couple of defects. Here are the fixes. Michal Privoznik (2): xenconfig: Properly check retval of virDomainGraphicsListenSetAddress virDomainFormatSchedDef: Check @schedMap bounds src/conf/domain_conf.c | 21 +++++++++++---------- src/xenconfig/xen_sxpr.c | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) -- 2.4.10

4 8

[libvirt] [PATCH v2 0/6] tests: qemu: unconditionally enable QEMU_CAPS_DEVICE
by Cole Robinson 10 Feb '16

10 Feb '16

First series is here: https://www.redhat.com/archives/libvir-list/2016-January/msg01233.html This series does two main things: it conditionally enables QEMU_CAPS_DEVICE in the test suite (since that's all we support nowadays), and it unconditionally calls qemuDomainAssignAddresses for qemuxml2xml testing, since that's the only realistic XML parsing scenario in the qemu driver. The first 3 patches have been committed, but there's still a couple big churn patches in here but the actual code changes are small. v2: Remove accidentally squashed bits from patch #1 Rebase to master Cole Robinson (6): tests: qemuxml2argv: remove some QEMU_CAPS_DEVICE problem cases tests: Unconditionally enable QEMU_CAPS_DEVICE tests: qemuxml2xml: Allow test cases to pass in qemuCaps tests: utils: Add PreFormat callback for CompareXML2XML helper tests: qemuxml2xml: assign device addresses tests: qemu: More aarch64 virtio and pci tests tests/bhyvexml2xmltest.c | 3 +- tests/genericxml2xmltest.c | 3 +- tests/lxcxml2xmltest.c | 3 +- ...> qemuxml2argv-aarch64-virtio-pci-default.args} | 0 ...=> qemuxml2argv-aarch64-virtio-pci-default.xml} | 0 ...2argv-aarch64-virtio-pci-manual-addresses.args} | 0 ...l2argv-aarch64-virtio-pci-manual-addresses.xml} | 0 .../qemuxml2argv-blkiotune-device.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 7 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 10 +- .../qemuxml2argv-boot-menu-disable.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 8 +- .../qemuxml2argv-boot-network.args | 7 +- .../qemuxml2argv-clock-catchup.args | 8 +- .../qemuxml2argv-clock-france.args | 8 +- .../qemuxml2argv-clock-hpet-off.args | 8 +- ...muxml2argv-clock-localtime-basis-localtime.args | 8 +- .../qemuxml2argv-clock-localtime.args | 7 +- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 8 +- .../qemuxml2argv-clock-variable.args | 8 +- .../qemuxml2argv-console-compat-auto.args | 7 +- .../qemuxml2argv-console-compat.args | 8 +- .../qemuxml2argv-cpu-Haswell-noTSX.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 5 +- .../qemuxml2argv-cpu-Haswell2.args | 5 +- .../qemuxml2argv-cpu-Haswell3.args | 5 +- .../qemuxml2argv-cpu-eoi-disabled.args | 5 +- .../qemuxml2argv-cpu-eoi-enabled.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 5 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 5 +- .../qemuxml2argv-cpu-fallback.args | 5 +- .../qemuxml2argv-cpu-host-kvmclock.args | 5 +- .../qemuxml2argv-cpu-host-model-fallback.args | 5 +- .../qemuxml2argv-cpu-host-model-vendor.args | 5 +- .../qemuxml2argv-cpu-host-model.args | 5 +- ...qemuxml2argv-cpu-host-passthrough-features.args | 8 +- .../qemuxml2argv-cpu-host-passthrough.args | 5 +- .../qemuxml2argv-cpu-kvmclock.args | 5 +- .../qemuxml2argv-cpu-minimum1.args | 5 +- .../qemuxml2argv-cpu-minimum2.args | 5 +- .../qemuxml2argv-cpu-numa-disjoint.args | 5 +- .../qemuxml2argv-cpu-numa-no-memory-element.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 5 +- .../qemuxml2argv-cpu-topology1.args | 5 +- .../qemuxml2argv-cpu-topology2.args | 5 +- .../qemuxml2argv-cpu-topology3.args | 5 +- .../qemuxml2argv-cputune-numatune.args | 7 +- .../qemuxml2argv-cputune-numatune.xml | 12 +- .../qemuxml2argv-cputune-zero-shares.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 8 +- .../qemuxml2argv-default-kvm-host-arch.args | 5 +- .../qemuxml2argv-default-qemu-host-arch.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 15 +- .../qemuxml2argv-disk-cdrom-empty.args | 10 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 11 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 10 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 11 +- .../qemuxml2argv-disk-drive-boot-disk.args | 11 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 11 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 12 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 12 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 11 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 11 +- .../qemuxml2argv-disk-drive-copy-on-read.args | 8 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 13 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 13 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 13 +- .../qemuxml2argv-disk-drive-fat.args | 8 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 11 +- .../qemuxml2argv-disk-drive-network-gluster.args | 13 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 12 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 14 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 12 +- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 11 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 11 +- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 12 +- .../qemuxml2argv-disk-drive-network-nbd.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd.args | 26 +- .../qemuxml2argv-disk-drive-network-sheepdog.args | 12 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 13 +- .../qemuxml2argv-disk-drive-shared.args | 12 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 14 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 13 +- .../qemuxml2argv-disk-geometry.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 16 +- .../qemuxml2argv-disk-snapshot.args | 17 +- .../qemuxml2argv-disk-usb-nosupport.xml} | 0 tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 23 - .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 19 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 13 +- .../qemuxml2argv-eoi-disabled.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 5 +- .../qemuxml2argv-fips-enabled.args | 8 +- .../qemuxml2argv-floppy-drive-fat.args | 8 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 7 +- .../qemuxml2argv-graphics-sdl.args | 7 +- .../qemuxml2argv-graphics-vnc-policy.args | 7 +- .../qemuxml2argv-graphics-vnc-sasl.args | 7 +- .../qemuxml2argv-graphics-vnc-socket.args | 7 +- .../qemuxml2argv-graphics-vnc-tls.args | 7 +- .../qemuxml2argv-graphics-vnc-websocket.args | 4 +- .../qemuxml2argv-graphics-vnc.args | 7 +- .../qemuxml2argv-hostdev-pci-address.args | 9 +- .../qemuxml2argv-hostdev-usb-address.args | 9 +- .../qemuxml2argv-hugepages-pages.args | 8 +- .../qemuxml2argv-hugepages-pages2.args | 8 +- .../qemuxml2argv-hugepages-pages3.args | 8 +- .../qemuxml2argv-hugepages-pages5.args | 8 +- .../qemuxml2argv-hugepages-pages6.args | 8 +- .../qemuxml2argv-hugepages-shared.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 5 +- .../qemuxml2argv-hyperv-panic.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 6 +- .../qemuxml2argv-input-usbmouse.args | 9 +- .../qemuxml2argv-input-usbtablet.args | 9 +- .../qemuxml2argv-iothreads-ids-partial.args | 7 +- .../qemuxml2argv-iothreads-ids.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 7 +- .../qemuxml2argv-kvm-features-off.args | 5 +- .../qemuxml2argv-kvm-features.args | 6 +- .../qemuxml2argv-kvm-pit-delay.args | 8 +- .../qemuxml2argv-kvm-pit-device.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 6 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 6 +- .../qemuxml2argv-machine-aliases1.args | 8 +- .../qemuxml2argv-machine-aliases2.args | 8 +- .../qemuxml2argv-machine-core-off.args | 7 +- .../qemuxml2argv-machine-core-on.args | 7 +- .../qemuxml2argv-machine-usb-opt.args | 8 +- .../qemuxml2argv-machine-vmport-opt.args | 8 +- .../qemuxml2argv-memory-hotplug.args | 8 +- .../qemuxml2argv-memtune-unlimited.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 8 +- .../qemuxml2argv-migrate-numa-unaligned.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 7 +- .../qemuxml2argv-minimal-msg-timestamp.args | 8 +- .../qemuxml2argv-minimal-s390.args | 21 - .../qemuxml2argvdata/qemuxml2argv-minimal-s390.xml | 21 - tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 7 +- .../qemuxml2argv-misc-disable-s3.args | 7 +- .../qemuxml2argv-misc-disable-suspends.args | 7 +- .../qemuxml2argv-misc-enable-s4.args | 7 +- .../qemuxml2argv-misc-no-reboot.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 6 +- .../qemuxml2argv-mlock-unsupported.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 9 +- .../qemuxml2argv-net-eth-ifname.args | 10 +- .../qemuxml2argv-net-eth-names.args | 11 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 10 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 9 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 10 +- .../qemuxml2argv-nographics-vga.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 8 +- .../qemuxml2argv-nosharepages.args | 7 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 8 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 8 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 8 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 8 +- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 8 +- .../qemuxml2argv-numatune-auto-prefer.args | 5 +- .../qemuxml2argv-numatune-memnode-no-memory.args | 5 +- .../qemuxml2argv-numatune-memnode.args | 5 +- .../qemuxml2argv-numatune-memory.args | 8 +- .../qemuxml2argv-parallel-tcp.args | 6 +- .../qemuxml2argv-pmu-feature-off.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 4 +- .../qemuxml2argv-pseries-nvram.args | 4 +- .../qemuxml2argv-pv-spinlock-disabled.args | 5 +- .../qemuxml2argv-pv-spinlock-enabled.args | 5 +- .../qemuxml2argv-qemu-ns-commandline-ns0.args | 8 +- .../qemuxml2argv-qemu-ns-commandline-ns1.args | 8 +- .../qemuxml2argv-qemu-ns-commandline.args | 8 +- ...emuxml2argv-qemu-ns-domain-commandline-ns0.args | 8 +- .../qemuxml2argv-qemu-ns-domain-commandline.args | 8 +- .../qemuxml2argv-qemu-ns-domain-ns0.args | 8 +- .../qemuxml2argv-qemu-ns-no-env.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 8 +- .../qemuxml2argv-reboot-timeout-disabled.args | 6 +- .../qemuxml2argv-reboot-timeout-enabled.args | 6 +- .../qemuxml2argv-restore-v2-fd.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 7 +- .../qemuxml2argv-seclabel-dac-none.args | 8 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 8 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 8 +- .../qemuxml2argv-seclabel-dynamic-override.args | 11 +- .../qemuxml2argv-seclabel-dynamic-relabel.args | 8 +- .../qemuxml2argv-seclabel-dynamic.args | 8 +- .../qemuxml2argv-seclabel-none.args | 8 +- .../qemuxml2argv-seclabel-static-labelskip.args | 8 +- .../qemuxml2argv-seclabel-static-relabel.args | 8 +- .../qemuxml2argv-seclabel-static.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 8 +- .../qemuxml2argv-serial-spiceport-nospice.args | 8 +- .../qemuxml2argv-serial-tcp-telnet.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 12 +- .../qemuxml2argv-video-qxl-nodevice.args | 14 +- .../qemuxml2argv-video-vga-nodevice.args | 12 +- .../qemuxml2argv-watchdog-dump.args | 12 +- .../qemuxml2argv-watchdog-injectnmi.args | 12 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 9 +- tests/qemuxml2argvtest.c | 582 ++++++++++----------- .../qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml | 6 +- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 69 +++ ...2xmlout-aarch64-virtio-pci-manual-addresses.xml | 53 ++ .../qemuxml2xmlout-balloon-device-auto.xml | 12 +- .../qemuxml2xmlout-balloon-device-period.xml | 8 +- .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 12 +- .../qemuxml2xmlout-bios-nvram.xml | 12 +- .../qemuxml2xmlout-blkdeviotune.xml | 12 +- .../qemuxml2xmlout-blkiotune-device.xml | 12 +- .../qemuxml2xmlout-blkiotune.xml | 12 +- .../qemuxml2xmlout-boot-cdrom.xml | 8 +- .../qemuxml2xmlout-boot-floppy.xml | 8 +- ...muxml2xmlout-boot-menu-disable-with-timeout.xml | 12 +- .../qemuxml2xmlout-boot-menu-disable.xml | 12 +- ...emuxml2xmlout-boot-menu-enable-with-timeout.xml | 12 +- .../qemuxml2xmlout-boot-multi.xml | 12 +- .../qemuxml2xmlout-boot-network.xml | 8 +- .../qemuxml2xmlout-boot-order.xml | 14 +- .../qemuxml2xmlout-channel-guestfwd.xml | 12 +- .../qemuxml2xmlout-channel-virtio-auto.xml | 29 +- .../qemuxml2xmlout-channel-virtio-state-active.xml | 12 +- ...emuxml2xmlout-channel-virtio-state-inactive.xml | 12 +- .../qemuxml2xmlout-channel-virtio.xml | 12 +- .../qemuxml2xmlout-chardev-label.xml | 13 +- .../qemuxml2xmlout-clock-catchup.xml | 12 +- .../qemuxml2xmlout-clock-localtime.xml | 8 +- .../qemuxml2xmlout-clock-timer-hyperv-rtc.xml | 8 +- .../qemuxml2xmlout-clock-utc.xml | 8 +- .../qemuxml2xmlout-console-compat-auto.xml | 12 +- .../qemuxml2xmlout-console-compat.xml | 8 +- .../qemuxml2xmlout-console-compat2.xml | 12 +- .../qemuxml2xmlout-console-virtio-many.xml | 16 +- .../qemuxml2xmlout-console-virtio.xml | 16 +- .../qemuxml2xmlout-controller-usb-order.xml | 4 +- .../qemuxml2xmlout-cpu-empty.xml | 8 +- .../qemuxml2xmlout-cpu-eoi-disabled.xml | 8 +- .../qemuxml2xmlout-cpu-eoi-enabled.xml | 8 +- .../qemuxml2xmlout-cpu-host-kvmclock.xml | 8 +- .../qemuxml2xmlout-cpu-host-model-features.xml | 12 +- ...emuxml2xmlout-cpu-host-passthrough-features.xml | 12 +- .../qemuxml2xmlout-cpu-kvmclock.xml | 8 +- .../qemuxml2xmlout-cpu-numa-disjoint.xml | 8 +- .../qemuxml2xmlout-cpu-numa-disordered.xml | 8 +- .../qemuxml2xmlout-cpu-numa-memshared.xml | 8 +- .../qemuxml2xmlout-cpu-numa-no-memory-element.xml | 8 +- .../qemuxml2xmlout-cpu-numa1.xml | 8 +- .../qemuxml2xmlout-cpu-numa2.xml | 8 +- .../qemuxml2xmlout-cputune-iothreads.xml | 12 +- ...l2xmlout-cputune-iothreadsched-zeropriority.xml | 12 +- .../qemuxml2xmlout-cputune-iothreadsched.xml | 12 +- .../qemuxml2xmlout-cputune-numatune.xml | 14 +- .../qemuxml2xmlout-cputune-zero-shares.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml | 12 +- .../qemuxml2xmlout-default-kvm-host-arch.xml | 8 +- .../qemuxml2xmlout-default-qemu-host-arch.xml | 8 +- .../qemuxml2xmlout-disk-active-commit.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml | 12 +- .../qemuxml2xmlout-disk-backing-chains-active.xml | 13 +- ...qemuxml2xmlout-disk-backing-chains-inactive.xml | 13 +- .../qemuxml2xmlout-disk-cdrom-empty.xml | 8 +- .../qemuxml2xmlout-disk-cdrom.xml | 8 +- .../qemuxml2xmlout-disk-copy_on_read.xml | 13 +- .../qemuxml2xmlout-disk-drive-boot-cdrom.xml | 8 +- .../qemuxml2xmlout-disk-drive-boot-disk.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-directsync.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-unsafe.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-v2-none.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-v2-wb.xml | 8 +- .../qemuxml2xmlout-disk-drive-cache-v2-wt.xml | 8 +- .../qemuxml2xmlout-disk-drive-copy-on-read.xml | 12 +- .../qemuxml2xmlout-disk-drive-discard.xml | 12 +- ...xml2xmlout-disk-drive-error-policy-enospace.xml | 8 +- ...qemuxml2xmlout-disk-drive-error-policy-stop.xml | 8 +- ...out-disk-drive-error-policy-wreport-rignore.xml | 8 +- .../qemuxml2xmlout-disk-drive-fat.xml | 12 +- .../qemuxml2xmlout-disk-drive-fmt-qcow.xml | 8 +- .../qemuxml2xmlout-disk-drive-network-gluster.xml | 6 +- ...emuxml2xmlout-disk-drive-network-iscsi-auth.xml | 6 +- .../qemuxml2xmlout-disk-drive-network-iscsi.xml | 6 +- ...emuxml2xmlout-disk-drive-network-nbd-export.xml | 9 +- ...l2xmlout-disk-drive-network-nbd-ipv6-export.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-nbd-unix.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-nbd.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-rbd-auth.xml | 9 +- ...uxml2xmlout-disk-drive-network-rbd-ceph-env.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-rbd-ipv6.xml | 9 +- .../qemuxml2xmlout-disk-drive-network-rbd.xml | 12 +- .../qemuxml2xmlout-disk-drive-network-sheepdog.xml | 9 +- .../qemuxml2xmlout-disk-floppy.xml | 8 +- .../qemuxml2xmlout-disk-many.xml | 8 +- .../qemuxml2xmlout-disk-mirror-active.xml | 14 +- .../qemuxml2xmlout-disk-mirror-inactive.xml | 14 +- .../qemuxml2xmlout-disk-mirror-old-inactive.xml | 14 +- .../qemuxml2xmlout-disk-mirror-old.xml | 14 +- .../qemuxml2xmlout-disk-scsi-device-auto.xml | 16 +- .../qemuxml2xmlout-disk-scsi-device.xml | 16 +- .../qemuxml2xmlout-disk-scsi-disk-vpd.xml | 16 +- ...muxml2xmlout-disk-scsi-lun-passthrough-sgio.xml | 16 +- .../qemuxml2xmlout-disk-scsi-megasas.xml | 16 +- .../qemuxml2xmlout-disk-scsi-virtio-scsi.xml | 16 +- .../qemuxml2xmlout-disk-scsi-vscsi.xml | 16 +- .../qemuxml2xmlout-disk-source-pool-mode.xml | 12 +- .../qemuxml2xmlout-disk-source-pool.xml | 12 +- .../qemuxml2xmlout-disk-usb-device.xml} | 14 +- ...qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml | 9 +- .../qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml | 9 +- ...qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml | 9 +- .../qemuxml2xmlout-disk-virtio-scsi-num_queues.xml | 9 +- .../qemuxml2xmlout-disk-virtio.xml | 10 +- .../qemuxml2xmlout-disk-xenvbd.xml | 8 +- .../qemuxml2xmlout-encrypted-disk.xml | 8 +- .../qemuxml2xmlout-eoi-disabled.xml | 8 +- .../qemuxml2xmlout-eoi-enabled.xml | 8 +- .../qemuxml2xmlout-event_idx.xml | 13 +- .../qemuxml2xmlout-floppy-drive-fat.xml | 12 +- .../qemuxml2xmlout-graphics-listen-network.xml | 13 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 13 +- .../qemuxml2xmlout-graphics-sdl-fullscreen.xml | 9 +- .../qemuxml2xmlout-graphics-sdl.xml | 9 +- .../qemuxml2xmlout-graphics-spice-compression.xml | 14 +- .../qemuxml2xmlout-graphics-spice-qxl-vga.xml | 14 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 4 +- .../qemuxml2xmlout-graphics-spice.xml | 14 +- .../qemuxml2xmlout-graphics-vnc-sasl.xml | 9 +- .../qemuxml2xmlout-graphics-vnc-tls.xml | 9 +- .../qemuxml2xmlout-graphics-vnc-websocket.xml | 5 +- .../qemuxml2xmlout-graphics-vnc.xml | 9 +- .../qemuxml2xmlout-hostdev-pci-address.xml | 9 +- ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 20 +- .../qemuxml2xmlout-hostdev-scsi-large-unit.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-lsi.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-rawio.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-readonly.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-sgio.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-shareable.xml | 16 +- ...muxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml | 16 +- .../qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml | 16 +- .../qemuxml2xmlout-hostdev-usb-address.xml | 8 +- .../qemuxml2xmlout-hostdev-vfio.xml | 13 +- .../qemuxml2xmlout-hugepages-pages.xml | 12 +- .../qemuxml2xmlout-hugepages-pages2.xml | 12 +- .../qemuxml2xmlout-hugepages-pages3.xml | 12 +- .../qemuxml2xmlout-hugepages-shared.xml | 12 +- .../qemuxml2xmlout-hugepages.xml | 12 +- .../qemuxml2xmlout-hyperv-off.xml | 8 +- .../qemuxml2xmlout-hyperv-panic.xml | 4 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml | 4 +- .../qemuxml2xmlout-input-usbmouse.xml | 8 +- .../qemuxml2xmlout-input-usbtablet.xml | 8 +- .../qemuxml2xmlout-interface-driver.xml | 13 +- .../qemuxml2xmlout-iothreads-disk-virtio-ccw.xml | 1 + .../qemuxml2xmlout-iothreads-disk.xml | 9 +- .../qemuxml2xmlout-iothreads-ids-partial.xml | 8 +- .../qemuxml2xmlout-iothreads-ids.xml | 8 +- .../qemuxml2xmlout-iothreads.xml | 8 +- .../qemuxml2xmlout-kvm-features-off.xml | 8 +- .../qemuxml2xmlout-kvm-features.xml | 4 +- .../qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml | 4 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml | 12 +- .../qemuxml2xmlout-machine-core-off.xml | 8 +- .../qemuxml2xmlout-machine-core-on.xml | 8 +- .../qemuxml2xmlout-memory-hotplug-dimm.xml | 12 +- .../qemuxml2xmlout-memory-hotplug-nonuma.xml | 8 +- .../qemuxml2xmlout-memory-hotplug.xml | 12 +- .../qemuxml2xmlout-memtune-unlimited.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml | 12 +- .../qemuxml2xmlout-metadata-duplicate.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 12 +- .../qemuxml2xmloutdata/qemuxml2xmlout-migrate.xml | 8 +- .../qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml | 12 +- .../qemuxml2xmlout-misc-acpi.xml | 8 +- .../qemuxml2xmlout-misc-disable-s3.xml | 8 +- .../qemuxml2xmlout-misc-disable-suspends.xml | 8 +- .../qemuxml2xmlout-misc-enable-s4.xml | 8 +- .../qemuxml2xmlout-misc-no-reboot.xml | 8 +- .../qemuxml2xmlout-misc-uuid.xml | 8 +- .../qemuxml2xmlout-net-bandwidth.xml | 4 +- .../qemuxml2xmlout-net-bandwidth2.xml | 4 +- .../qemuxml2xmlout-net-eth-ifname.xml | 9 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml | 9 +- .../qemuxml2xmlout-net-hostdev-vfio.xml | 13 +- .../qemuxml2xmlout-net-hostdev.xml | 13 +- .../qemuxml2xmlout-net-midonet.xml | 13 +- .../qemuxml2xmlout-net-openvswitch.xml | 13 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml | 13 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml | 9 +- .../qemuxml2xmlout-net-vhostuser.xml | 11 +- .../qemuxml2xmlout-net-virtio-device.xml | 13 +- .../qemuxml2xmlout-net-virtio-disable-offloads.xml | 13 +- ...qemuxml2xmlout-net-virtio-network-portgroup.xml | 15 +- .../qemuxml2xmlout-net-virtio.xml | 9 +- .../qemuxml2xmlout-nographics-vga.xml | 8 +- .../qemuxml2xmlout-nosharepages.xml | 8 +- ...emuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml | 12 +- ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 12 +- .../qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml | 12 +- ...emuxml2xmlout-numad-static-vcpu-no-numatune.xml | 12 +- .../qemuxml2xmlout-numatune-auto-prefer.xml | 8 +- .../qemuxml2xmlout-numatune-memnode-no-memory.xml | 8 +- .../qemuxml2xmlout-numatune-memnode.xml | 8 +- .../qemuxml2xmlout-panic-double.xml | 4 +- .../qemuxml2xmlout-panic-isa.xml | 12 +- .../qemuxml2xmlout-panic-no-address.xml | 12 +- .../qemuxml2xmlout-panic-pseries.xml | 8 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml | 12 +- .../qemuxml2xmlout-parallel-tcp.xml | 8 +- .../qemuxml2xmlout-pci-autoadd-addr.xml | 35 ++ .../qemuxml2xmlout-pci-autoadd-idx.xml | 41 +- .../qemuxml2xmlout-pci-bridge-many-disks.xml | 124 ++++- .../qemuxml2xmlout-pci-bridge.xml | 44 +- .../qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml | 16 +- .../qemuxml2xmlout-pci-serial-dev-chardev.xml | 12 +- .../qemuxml2xmlout-pcie-root-port-too-many.xml | 62 --- .../qemuxml2xmlout-pcie-root-port.xml | 23 +- .../qemuxml2xmlout-pcie-root.xml | 15 +- .../qemuxml2xmlout-pcie-switch-downstream-port.xml | 69 ++- .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 34 +- .../qemuxml2xmlout-pcihole64-gib.xml | 8 +- .../qemuxml2xmlout-pcihole64-none.xml | 8 +- .../qemuxml2xmlout-pcihole64-q35.xml | 16 +- .../qemuxml2xmlout-pcihole64.xml | 8 +- .../qemuxml2xmlout-pmu-feature-off.xml | 4 +- .../qemuxml2xmlout-pmu-feature.xml | 4 +- .../qemuxml2xmlout-pseries-nvram.xml | 4 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 8 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 8 +- .../qemuxml2xmlout-pv-spinlock-disabled.xml | 8 +- .../qemuxml2xmlout-pv-spinlock-enabled.xml | 8 +- .../qemuxml2xmlout-q35-usb2-multi.xml | 28 +- .../qemuxml2xmlout-q35-usb2-reorder.xml | 28 +- .../qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml | 14 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 22 +- .../qemuxml2xmlout-qemu-ns-no-env.xml | 8 +- .../qemuxml2xmlout-reboot-timeout-disabled.xml | 4 +- .../qemuxml2xmlout-reboot-timeout-enabled.xml | 4 +- .../qemuxml2xmlout-restore-v2.xml | 8 +- .../qemuxml2xmlout-s390-defaultconsole.xml | 3 +- .../qemuxml2xmlout-seclabel-dac-none.xml | 12 +- .../qemuxml2xmlout-seclabel-device-multiple.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-baselabel.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-labelskip.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-none.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-override.xml | 12 +- .../qemuxml2xmlout-seclabel-dynamic-relabel.xml | 12 +- .../qemuxml2xmlout-seclabel-none.xml | 12 +- .../qemuxml2xmlout-seclabel-static-labelskip.xml | 12 +- .../qemuxml2xmlout-seclabel-static.xml | 12 +- .../qemuxml2xmlout-serial-dev.xml | 8 +- .../qemuxml2xmlout-serial-file.xml | 8 +- .../qemuxml2xmlout-serial-many.xml | 8 +- .../qemuxml2xmlout-serial-pty.xml | 8 +- .../qemuxml2xmlout-serial-spiceport-nospice.xml | 12 +- .../qemuxml2xmlout-serial-spiceport.xml | 13 +- .../qemuxml2xmlout-serial-target-port-auto.xml | 12 +- .../qemuxml2xmlout-serial-tcp-telnet.xml | 8 +- .../qemuxml2xmlout-serial-tcp.xml | 8 +- .../qemuxml2xmlout-serial-udp.xml | 8 +- .../qemuxml2xmlout-serial-unix.xml | 8 +- .../qemuxml2xmlout-serial-vc.xml | 8 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 14 +- .../qemuxml2xmlout-smbios-multiple-type2.xml | 12 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml | 12 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml | 8 +- .../qemuxml2xmlout-sound-device.xml | 30 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml | 16 +- .../qemuxml2xmlout-tap-vhost-incorrect.xml | 14 +- .../qemuxml2xmlout-tap-vhost.xml | 13 +- .../qemuxml2xmlout-tpm-passthrough.xml | 8 +- .../qemuxml2xmlout-usb-ich9-ehci-addr.xml | 25 +- .../qemuxml2xmlout-usb-redir-filter-version.xml | 8 +- .../qemuxml2xmlout-usb-redir-filter.xml | 4 +- .../qemuxml2xmlout-usb-redir.xml | 4 +- .../qemuxml2xmlout-vcpu-placement-static.xml | 3 + .../qemuxml2xmlout-vhost_queues.xml | 13 +- .../qemuxml2xmlout-video-virtio-gpu-device.xml | 13 +- .../qemuxml2xmlout-video-virtio-gpu-virgl.xml | 13 +- .../qemuxml2xmlout-virtio-input-passthrough.xml | 9 +- .../qemuxml2xmlout-virtio-input.xml | 16 +- .../qemuxml2xmlout-virtio-lun.xml | 13 +- .../qemuxml2xmlout-virtio-rng-egd.xml | 9 +- .../qemuxml2xmlout-virtio-rng-random.xml | 9 +- .../qemuxml2xmloutdata/qemuxml2xmlout-watchdog.xml | 8 +- tests/qemuxml2xmltest.c | 272 +++++++--- tests/testutils.c | 7 +- tests/testutils.h | 6 +- 517 files changed, 4082 insertions(+), 2119 deletions(-) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-mmio-default-pci.args => qemuxml2argv-aarch64-virtio-pci-default.args} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-mmio-default-pci.xml => qemuxml2argv-aarch64-virtio-pci-default.xml} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virtio-pci.args => qemuxml2argv-aarch64-virtio-pci-manual-addresses.args} (100%) rename tests/qemuxml2argvdata/{qemuxml2argv-aarch64-virtio-pci.xml => qemuxml2argv-aarch64-virtio-pci-manual-addresses.xml} (100%) rename tests/{qemuxml2xmloutdata/qemuxml2xmlout-disk-usb.xml => qemuxml2argvdata/qemuxml2argv-disk-usb-nosupport.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-default.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-virtio-pci-manual-addresses.xml rename tests/{qemuxml2argvdata/qemuxml2argv-disk-usb.xml => qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml} (70%) delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-too-many.xml -- 2.5.0

4 25