- Devel - libvirt List Archives

[libvirt] [PATCHv2 0/2] disable default gateway in IPv6 RA for isolated networks
by Maxim Perevedentsev 13 Jul '16

13 Jul '16

In case of DHCPv6 in isolated network, we start dnsmasq which sends Router Advertisements (RA). If RA containts no gateway then the link-local address of the source of RA is considered a gateway (and guest installs a corresponding default route). If a guest has two network interfaces (public and isolated network) and the user installs a default route through "public" interface, the guest will have something like default via fe80::ffff:1:1 dev eth2 metric 1024 default via fe80::5054:ff:fe0a:d808 dev eth3 proto ra metric 1024 expires 1789sec RA route metric may vary, and it is preferred. The validity of default route is controlled by "default [route] lifetime" field in RA. If it is 0, then the default gateway announced is considered invalid, and no default route is installed into guest. dnsmasq 2.67+ supports "ra-param=<interface>,<RA interval>,<default lifetime>" option. We can pass "ra-param=*,0,0" (here, RA_interval=0 means default) to disable default gateway in RA. This patchset adds detection for "ra-param" in dnsmasq and sets "ra-param=*,0,0" for isolated network if dnsmasq supports it. Maxim Perevedentsev (2): Fix message about dnsmasq BINDTODEVICE capability. dnsmasq: disable IPv6 default gateway in RA for isolated networks src/network/bridge_driver.c | 7 +++++++ src/util/virdnsmasq.c | 8 ++++++-- src/util/virdnsmasq.h | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) -- 1.8.3.1

3 5

[libvirt] [PATCH] qemu: getAutoDumpPath() return value should be dumpfile not domname.
by Yan Fu 13 Jul '16

13 Jul '16

Resolves:https://bugzilla.redhat.com/show_bug.cgi?id=1354238 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f8d9afe..55a5404 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3869,7 +3869,7 @@ getAutoDumpPath(virQEMUDriverPtr driver, timestr)); virObjectUnref(cfg); - return domname; + return dumpfile; } static void -- 1.8.3.1

2 1

[libvirt] [PATCH V2] systemd: fix ready notification on abstract socket
by Jim Fehlig 12 Jul '16

12 Jul '16

At least with systemd v210, NOTIFY_SOCKET is abstact, e.g. @/org/freedesktop/systemd1/notify. sendmsg() fails on such a socket with "Connection refused". The unix(7) man page contains the following details wrt abstract socket addresses abstract: an abstract socket address is distinguished (from a pathname socket) by the fact that sun_path[0] is a null byte ('\0'). The socket's address in this namespace is given by the additional bytes in sun_path that are covered by the specified length of the address structure. (Null bytes in the name have no special significance.) So we need to be more precise about the address length, setting it to the sizeof sa_family_t + length of address copied to sun_path instead of setting it to the sizeof the entire sockaddr_un struct. Resolves: https://bugzilla.opensuse.org/show_bug.cgi?id=987668 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V2: Use offsetof() to calculate size of sa_family_t field of the sockaddr_un structure instead of sizeof(). src/util/virsystemd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 871db7e..969cd68 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -495,7 +495,6 @@ virSystemdNotifyStartup(void) }; struct msghdr mh = { .msg_name = &un, - .msg_namelen = sizeof(un), .msg_iov = &iov, .msg_iovlen = 1, }; @@ -515,6 +514,8 @@ virSystemdNotifyStartup(void) if (un.sun_path[0] == '@') un.sun_path[0] = '\0'; + mh.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(path); + fd = socket(AF_UNIX, SOCK_DGRAM, 0); if (fd < 0) { VIR_WARN("Unable to create socket FD"); -- 2.8.4

2 2

[libvirt] [PATCH] systemd: fix ready notification on abstract socket
by Jim Fehlig 12 Jul '16

12 Jul '16

At least with systemd v210, NOTIFY_SOCKET is abstact, e.g. @/org/freedesktop/systemd1/notify. sendmsg() fails on such a socket with "Connection refused". The unix(7) man page contains the following details wrt abstract socket addresses abstract: an abstract socket address is distinguished (from a pathname socket) by the fact that sun_path[0] is a null byte ('\0'). The socket's address in this namespace is given by the additional bytes in sun_path that are covered by the specified length of the address structure. (Null bytes in the name have no special significance.) So we need to be more precise about the address length, setting it to the sizeof sa_family_t + length of address copied to sun_path instead of setting it to the sizeof the entire sockaddr_un struct. Resolves: https://bugzilla.opensuse.org/show_bug.cgi?id=987668 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/util/virsystemd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 871db7e..1b5e9fe 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -495,7 +495,6 @@ virSystemdNotifyStartup(void) }; struct msghdr mh = { .msg_name = &un, - .msg_namelen = sizeof(un), .msg_iov = &iov, .msg_iovlen = 1, }; @@ -521,6 +520,7 @@ virSystemdNotifyStartup(void) return; } + mh.msg_namelen = sizeof(sa_family_t) + strlen(path); if (sendmsg(fd, &mh, MSG_NOSIGNAL) < 0) VIR_WARN("Failed to notify systemd"); -- 2.1.4

2 2

[libvirt] [PATCH] esx: Fetch snapshot info directly for filtering
by Tomáš Golembiovský 12 Jul '16

12 Jul '16

When fetching domains with virConnectListAllDomains() and when filtering by snapshot existence is requested the ESX driver first lists all the domains and then check one-by-one for snapshot existence. This process takes unnecessarily long time. To significantly improve the time necessary to finish the query we can request the snapshot related info directly when querying the list of domains from VMware. Signed-off-by: Tomáš Golembiovský <tgolembi(a)redhat.com> --- src/esx/esx_driver.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index eae015a..3d90b69 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4924,6 +4924,7 @@ esxConnectListAllDomains(virConnectPtr conn, int count = 0; bool autostart; int state; + esxVI_DynamicProperty *dynamicProperty = NULL; virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); @@ -4985,6 +4986,13 @@ esxConnectListAllDomains(virConnectPtr conn, } } + if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT)) { + if (esxVI_String_AppendValueToList(&propertyNameList, + "snapshot.rootSnapshotList") < 0) { + goto cleanup; + } + } + if (esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, &virtualMachineList) < 0) goto cleanup; @@ -5023,11 +5031,19 @@ esxConnectListAllDomains(virConnectPtr conn, /* filter by snapshot existence */ if (MATCH(VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT)) { + esxVI_VirtualMachineSnapshotTree_Free(&rootSnapshotTreeList); - if (esxVI_LookupRootSnapshotTreeList(priv->primary, uuid, - &rootSnapshotTreeList) < 0) { - goto cleanup; + for (dynamicProperty = virtualMachine->propSet; dynamicProperty; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "snapshot.rootSnapshotList")) { + if (esxVI_VirtualMachineSnapshotTree_CastListFromAnyType + (dynamicProperty->val, &rootSnapshotTreeList) < 0) { + goto cleanup; + } + + break; + } } if (!((MATCH(VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT) && -- 2.9.0

2 1

[libvirt] [PATCH 0/2] mingw build fixes
by Eric Blake 12 Jul '16

12 Jul '16

If I don't get a review in a couple of days, I can probably justify them under the build-breaker rule; on the other hand, since mingw doesn't get as much testing, I'm not in a rush to push right away. Eric Blake (2): build: virrandommock.c not needed on mingw build: drop hack for old mingw ssize_t gnulib/local/m4/ssize_t.m4.diff | 34 ---------------------------------- tests/virrandommock.c | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 41 deletions(-) delete mode 100644 gnulib/local/m4/ssize_t.m4.diff -- 2.5.5

3 9

[libvirt] [PATCH] examples: If parameters count is zero we have nothing to do
by Marc Hartmayer 12 Jul '16

12 Jul '16

The virDomainGetCPUStats() API contract permits nparams == 0. print_cpu_usage() assumes nparams > 0 because the domtop example application isn't very useful if there are no statistics. Explicitly error out to avoid potentially using the local variable pos uninitialized. Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Sascha Silbe <silbe(a)linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> --- examples/domtop/domtop.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c index 2283994..f8e250b 100644 --- a/examples/domtop/domtop.c +++ b/examples/domtop/domtop.c @@ -203,6 +203,11 @@ print_cpu_usage(const char *dom_name, size_t nparams = now_nparams; bool delim = false; + if (nparams == 0) { + ERROR("parameter count is zero"); + return; + } + if (then_nparams != now_nparams) { /* this should not happen (TM) */ ERROR("parameters counts don't match"); -- 2.5.5

2 3

[libvirt] [PATCH v2] qemu: add a max_core setting to qemu.conf for core dump size
by Daniel P. Berrange 12 Jul '16

12 Jul '16

Currently the QEMU processes inherit their core dump rlimit from libvirtd, which is really suboptimal. This change allows their limit to be directly controller from qemu.conf instead. --- Changed in v2: - Allow use of string "unlimited" src/libvirt_private.syms | 2 ++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 16 +++++++++++++++- src/qemu/qemu_conf.c | 17 +++++++++++++++++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_process.c | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircommand.c | 14 ++++++++++++++ src/util/vircommand.h | 1 + src/util/virprocess.c | 36 ++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 1 + 11 files changed, 90 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 597ce5f..773d935 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1371,6 +1371,7 @@ virCommandSetErrorFD; virCommandSetGID; virCommandSetInputBuffer; virCommandSetInputFD; +virCommandSetMaxCoreSize; virCommandSetMaxFiles; virCommandSetMaxMemLock; virCommandSetMaxProcesses; @@ -2180,6 +2181,7 @@ virProcessRunInMountNamespace; virProcessSchedPolicyTypeFromString; virProcessSchedPolicyTypeToString; virProcessSetAffinity; +virProcessSetMaxCoreSize; virProcessSetMaxFiles; virProcessSetMaxMemLock; virProcessSetMaxProcesses; diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 8bc23ba..a8edc2b 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -72,6 +72,7 @@ module Libvirtd_qemu = | bool_entry "set_process_name" | int_entry "max_processes" | int_entry "max_files" + | int_entry "max_core" | str_entry "stdio_handler" let device_entry = bool_entry "mac_filter" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 7964273..fac33ec 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -401,7 +401,21 @@ #max_processes = 0 #max_files = 0 - +# If max_core is set to a positive integer, then QEMU will be +# permitted to create core dumps when it crashes, provided its +# RAM size is smaller than the limit set. Be warned that the +# core dump will include a full copy of the guest RAM, so if +# the largest guest is 32 GB in size, the max_core limit will +# have to be at least 33/34 GB to allow enough overhead. +# +# As a special case it can be set to the string "unlimited" to +# to allow arbitrarily sized core dumps. +# +# By default the core dump size is set to 0 disabling all dumps +# +# Size is in bytes or string "unlimited" +#max_core = 0 +#max_core = "unlimited" # mac_filter enables MAC addressed based filtering on bridge ports. # This currently requires ebtables to be installed. diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fa9d65e..45d039c 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -393,6 +393,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, char **controllers = NULL; char **hugetlbfs = NULL; char **nvram = NULL; + char *corestr = NULL; /* Just check the file is readable before opening it, otherwise * libvirt emits an error. @@ -633,6 +634,21 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "max_files", &cfg->maxFiles) < 0) goto cleanup; + if (virConfGetValueType(conf, "max_core") == VIR_CONF_STRING) { + if (virConfGetValueString(conf, "max_core", &corestr) < 0) + goto cleanup; + if (STREQ(corestr, "unlimited")) { + cfg->maxCore = ULLONG_MAX; + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unknown core size '%s'"), + corestr); + goto cleanup; + } + } else if (virConfGetValueULLong(conf, "max_core", &cfg->maxCore) < 0) { + goto cleanup; + } + if (virConfGetValueString(conf, "lock_manager", &cfg->lockManagerName) < 0) goto cleanup; if (virConfGetValueString(conf, "stdio_handler", &stdioHandler) < 0) @@ -715,6 +731,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, virStringFreeList(controllers); virStringFreeList(hugetlbfs); virStringFreeList(nvram); + VIR_FREE(corestr); VIR_FREE(user); VIR_FREE(group); virConfFree(conf); diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 510cd9a..b730202 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -148,6 +148,7 @@ struct _virQEMUDriverConfig { unsigned int maxProcesses; unsigned int maxFiles; + unsigned long long maxCore; unsigned int maxQueuedJobs; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4adb14e..a7cbd59 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5069,6 +5069,7 @@ qemuProcessLaunch(virConnectPtr conn, virCommandSetPreExecHook(cmd, qemuProcessHook, &hookData); virCommandSetMaxProcesses(cmd, cfg->maxProcesses); virCommandSetMaxFiles(cmd, cfg->maxFiles); + virCommandSetMaxCoreSize(cmd, cfg->maxCore); virCommandSetUmask(cmd, 0x002); VIR_DEBUG("Setting up security labelling"); diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index c4d4f19..c3d6da5 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -62,6 +62,7 @@ module Test_libvirtd_qemu = { "set_process_name" = "1" } { "max_processes" = "0" } { "max_files" = "0" } +{ "max_core" = "0" } { "mac_filter" = "1" } { "relaxed_acs_check" = "1" } { "allow_disk_format_probing" = "1" } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index f5bd7af..6baa37a 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -124,6 +124,8 @@ struct _virCommand { unsigned long long maxMemLock; unsigned int maxProcesses; unsigned int maxFiles; + bool setMaxCore; + unsigned long long maxCore; uid_t uid; gid_t gid; @@ -687,6 +689,9 @@ virExec(virCommandPtr cmd) goto fork_error; if (virProcessSetMaxFiles(0, cmd->maxFiles) < 0) goto fork_error; + if (cmd->setMaxCore && + virProcessSetMaxCoreSize(0, cmd->maxCore) < 0) + goto fork_error; if (cmd->hook) { VIR_DEBUG("Run hook %p %p", cmd->hook, cmd->opaque); @@ -1105,6 +1110,15 @@ virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files) cmd->maxFiles = files; } +void virCommandSetMaxCoreSize(virCommandPtr cmd, unsigned long long bytes) +{ + if (!cmd || cmd->has_error) + return; + + cmd->maxCore = bytes; + cmd->setMaxCore = true; +} + void virCommandSetUmask(virCommandPtr cmd, int mask) { if (!cmd || cmd->has_error) diff --git a/src/util/vircommand.h b/src/util/vircommand.h index 44818ef..99dcdeb 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -75,6 +75,7 @@ void virCommandSetUID(virCommandPtr cmd, uid_t uid); void virCommandSetMaxMemLock(virCommandPtr cmd, unsigned long long bytes); void virCommandSetMaxProcesses(virCommandPtr cmd, unsigned int procs); void virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files); +void virCommandSetMaxCoreSize(virCommandPtr cmd, unsigned long long bytes); void virCommandSetUmask(virCommandPtr cmd, int umask); void virCommandClearCaps(virCommandPtr cmd); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 09dd3c9..2b71445 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -914,6 +914,42 @@ virProcessSetMaxFiles(pid_t pid ATTRIBUTE_UNUSED, unsigned int files) } #endif /* ! (HAVE_SETRLIMIT && defined(RLIMIT_NOFILE)) */ +#if HAVE_SETRLIMIT && defined(RLIMIT_CORE) +int +virProcessSetMaxCoreSize(pid_t pid, unsigned long long bytes) +{ + struct rlimit rlim; + + rlim.rlim_cur = rlim.rlim_max = bytes; + if (pid == 0) { + if (setrlimit(RLIMIT_CORE, &rlim) < 0) { + virReportSystemError(errno, + _("cannot limit core file size to %llu"), + bytes); + return -1; + } + } else { + if (virProcessPrLimit(pid, RLIMIT_CORE, &rlim, NULL) < 0) { + virReportSystemError(errno, + _("cannot limit core file size " + "of process %lld to %llu"), + (long long int)pid, bytes); + return -1; + } + } + return 0; +} +#else /* ! (HAVE_SETRLIMIT && defined(RLIMIT_CORE)) */ +int +virProcessSetMaxCoreSize(pid_t pid ATTRIBUTE_UNUSED, + unsigned long long bytes ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); + return -1; +} +#endif /* ! (HAVE_SETRLIMIT && defined(RLIMIT_CORE)) */ + + #ifdef __linux__ /* * Port of code from polkitunixprocess.c under terms diff --git a/src/util/virprocess.h b/src/util/virprocess.h index a7a1fe9..04e9802 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -75,6 +75,7 @@ int virProcessSetNamespaces(size_t nfdlist, int virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes); int virProcessSetMaxProcesses(pid_t pid, unsigned int procs); int virProcessSetMaxFiles(pid_t pid, unsigned int files); +int virProcessSetMaxCoreSize(pid_t pid, unsigned long long bytes); int virProcessGetMaxMemLock(pid_t pid, unsigned long long *bytes); -- 2.7.4

2 5

[libvirt] libvirt on up-for-grabs.net?
by Andrea Bolognani 12 Jul '16

12 Jul '16

I just bumped into this website: http://up-for-grabs.net/ I wonder if we could try to get our Bite-sized Tasks[1] in the list... Of course we don't use GitHub for pull requests or issue tracking, but we could create a dummy issue called "Look at the Bite-sized Tasks wiki page" that contains a link to the wiki along with some explanation, and leave it open just so that it can be listed on up-for-grabs.net. What do you guys think? :) [1] http://wiki.libvirt.org/page/BiteSizedTasks -- Andrea Bolognani / Red Hat / Virtualization

2 5

[libvirt] [PATCH v2] storage: dir: adapts .wipeVol for ploop volumes
by Olga Krishtal 12 Jul '16

12 Jul '16

The modification of .volWipe callback wipes ploop volume using one of given wiping algorithm: dod, nnsa, etc. However, in case of ploop volume we need to reinitialize root.hds and DiskDescriptor.xml. v2: - added check on ploop tools presens - virCommandAddArgFormat changed to virCommandAddArg Signed-off-by: Olga Krishtal <okrishtal(a)virtuozzo.com> --- src/storage/storage_backend.c | 68 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 5adf1fd..14b3a64 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -2195,6 +2195,55 @@ virStorageBackendWipeLocal(virStorageVolDefPtr vol, return ret; } +static int +virStorageBackendVolWipePloop(virStorageVolDefPtr vol) +{ + virCommandPtr cmd = NULL; + char *target_path = NULL; + char *disk_desc = NULL; + char *create_tool = NULL; + + int ret = -1; + + create_tool = virFindFileInPath("ploop"); + if (!create_tool) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unable to find ploop tools, please install them")); + return -1; + } + + if (virAsprintf(&target_path, "%s/root.hds", vol->target.path) < 0) + goto cleanup; + + if (virAsprintf(&disk_desc, "%s/DiskDescriptor.xml", vol->target.path) < 0) + goto cleanup; + + if (virFileRemove(disk_desc, 0, 0) < 0) { + virReportError(errno, _("Failed to delete DiskDescriptor.xml of volume '%s'"), + vol->target.path); + goto cleanup; + } + if (virFileRemove(target_path, 0, 0) < 0) { + virReportError(errno, _("failed to delete root.hds of volume '%s'"), + vol->target.path); + goto cleanup; + } + + cmd = virCommandNewArgList(create_tool, "init", "-s", NULL); + + virCommandAddArgFormat(cmd, "%lluM", VIR_DIV_UP(vol->target.capacity, + (1024 * 1024))); + virCommandAddArgList(cmd, "-t", "ext4", NULL); + virCommandAddArg(cmd, target_path); + ret = virCommandRun(cmd, NULL); + + cleanup: + VIR_FREE(disk_desc); + VIR_FREE(target_path); + VIR_FREE(create_tool); + virCommandFree(cmd); + return ret; +} int virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -2207,6 +2256,8 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, const char *alg_char = NULL; struct stat st; virCommandPtr cmd = NULL; + char *path = NULL; + char *target_path = vol->target.path; virCheckFlags(0, -1); @@ -2214,12 +2265,12 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, vol->target.path, algorithm); if (vol->target.format == VIR_STORAGE_FILE_PLOOP) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("wiping for ploop volumes is not supported")); - goto cleanup; + if (virAsprintf(&path, "%s/root.hds", vol->target.path) < 0) + goto cleanup; + target_path = path; } - fd = open(vol->target.path, O_RDWR); + fd = open(target_path, O_RDWR); if (fd == -1) { virReportSystemError(errno, _("Failed to open storage volume with path '%s'"), @@ -2276,13 +2327,12 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, if (algorithm != VIR_STORAGE_VOL_WIPE_ALG_ZERO) { cmd = virCommandNew(SCRUB); virCommandAddArgList(cmd, "-f", "-p", alg_char, - vol->target.path, NULL); + target_path, NULL); if (virCommandRun(cmd, NULL) < 0) goto cleanup; ret = 0; - goto cleanup; } else { if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { ret = virStorageBackendVolZeroSparseFileLocal(vol, st.st_size, fd); @@ -2292,10 +2342,16 @@ virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, vol->target.allocation, st.st_blksize); } + if (ret < 0) + goto cleanup; } + if (vol->target.format == VIR_STORAGE_FILE_PLOOP) + ret = virStorageBackendVolWipePloop(vol); + cleanup: virCommandFree(cmd); + VIR_FREE(path); VIR_FORCE_CLOSE(fd); return ret; } -- 1.8.3.1

2 1

[libvirt] [PATCH] tests: add missed directories in EXTRA_DIST
by Luyao Huang 12 Jul '16

12 Jul '16

In commit ec5dcf2a and b0b4a35c, we have moved some xml to new directories, but forget fix the Makefile. Add 2 directories in EXTRA_DIST to fix broken vpath build. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tests/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index fb2380d..010e348 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -122,6 +122,8 @@ EXTRA_DIST = \ qemucaps2xmldata \ qemuhelpdata \ qemuhotplugtestdata \ + qemuhotplugtestdevices \ + qemuhotplugtestdomains \ qemumonitorjsondata \ qemuxml2argvdata \ qemuxml2xmloutdata \ -- 1.8.3.1

3 2

[libvirt] [PATCH v2] virCommandExec: Report error if execve fails
by Michal Privoznik 12 Jul '16

12 Jul '16

In an unlikely event of execve() failing, the virCommandExec() function does not report any error, even though checks that are at the beginning of the function are verbose when failing. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Fixed the test (used virFork() instead of plain fork(), prolonged the waiting time for child reply, ...) src/util/vircommand.c | 7 +++++- tests/commandtest.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index f5bd7af..3c67c90 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2152,7 +2152,12 @@ int virCommandExec(virCommandPtr cmd) return -1; } - return execve(cmd->args[0], cmd->args, cmd->env); + execve(cmd->args[0], cmd->args, cmd->env); + + virReportSystemError(errno, + _("cannot execute binary %s"), + cmd->args[0]); + return -1; } #else int virCommandExec(virCommandPtr cmd ATTRIBUTE_UNUSED) diff --git a/tests/commandtest.c b/tests/commandtest.c index f433ad7..2b77b9b 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1063,6 +1063,74 @@ static int test24(const void *unused ATTRIBUTE_UNUSED) return ret; } + +static int test25(const void *unused ATTRIBUTE_UNUSED) +{ + int ret = -1; + int pipeFD[2] = { -1, -1}; + char rv = 0; + ssize_t tries = 100; + pid_t pid; + + if (pipe(pipeFD) < 0) { + fprintf(stderr, "Unable to create pipe\n"); + goto cleanup; + } + + if (virSetNonBlock(pipeFD[0]) < 0) { + fprintf(stderr, "Unable to make read end of pipe nonblocking\n"); + goto cleanup; + } + + /* Now, fork and try to exec a nonexistent binary. */ + pid = virFork(); + if (pid < 0) { + fprintf(stderr, "Unable to spawn child\n"); + goto cleanup; + } + + if (pid == 0) { + /* Child */ + virCommandPtr cmd = virCommandNew("some/nonexistent/binary"); + + rv = virCommandExec(cmd); + if (safewrite(pipeFD[1], &rv, sizeof(rv)) < 0) + fprintf(stderr, "Unable to write to pipe\n"); + _exit(EXIT_FAILURE); + } + + /* Parent */ + while (--tries) { + if (saferead(pipeFD[0], &rv, sizeof(rv)) < 0) { + if (errno != EWOULDBLOCK) { + fprintf(stderr, "Unable to read from pipe\n"); + goto cleanup; + } + + usleep(10 * 1000); + } else { + break; + } + } + + if (!tries) { + fprintf(stderr, "Child hasn't returned anything\n"); + goto cleanup; + } + + if (rv >= 0) { + fprintf(stderr, "Child should have returned an error\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FORCE_CLOSE(pipeFD[0]); + VIR_FORCE_CLOSE(pipeFD[1]); + return ret; +} + + static void virCommandThreadWorker(void *opaque) { virCommandTestDataPtr test = opaque; @@ -1215,6 +1283,7 @@ mymain(void) DO_TEST(test22); DO_TEST(test23); DO_TEST(test24); + DO_TEST(test25); virMutexLock(&test->lock); if (test->running) { -- 2.8.4

2 1

[libvirt] [PATCH 0/2] Add qemu hotplug tests with ccw devices
by Tomasz Flendrich 12 Jul '16

12 Jul '16

These changes require another patch, or else there would be conflicts: [libvirt] [PATCH 0/3] Clean up qemuhotplugtest xml files https://www.redhat.com/archives/libvir-list/2016-July/msg00202.html Hotplugging ccw devices was previously not tested, so I decided to add some testcases because I plan on making changes to different address types and want to make sure regression won't happen. Please let me know if you think that the filenames are too long. I know that some device files are duplicated. It is (right now) required because of the way qemuhotplugtest.c calculates the expected xml filenames. I plan on changing that to explicitly stating the basis xml, the device xml, and the expected xml, so that there would be no duplicates. It will also make filenames shorter. In another patch, I will add testcases that verify attaching a device to the persistent config. Explicitly stating the expected xml will be even more useful then. Tomasz Flendrich (2): Add qemu hotplug test files Add ccw test cases to qemu hotplug tests/qemuhotplugtest.c | 37 +++++++++++ .../qemuhotplug-ccw-virtio-1-explicit-reverse.xml | 8 +++ .../qemuhotplug-ccw-virtio-1-explicit.xml | 8 +++ .../qemuhotplug-ccw-virtio-2-explicit.xml | 8 +++ .../qemuhotplug-ccw-virtio-2.xml | 8 +++ .../qemuhotplug-ccw-virtio.xml | 8 +++ .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 63 +++++++++++++++++++ ...-2-ccw-virtio+ccw-virtio-1-explicit-reverse.xml | 73 ++++++++++++++++++++++ ...ive-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 73 ++++++++++++++++++++++ ...qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 63 +++++++++++++++++++ ...-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 73 ++++++++++++++++++++++ ...-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 73 ++++++++++++++++++++++ .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 63 +++++++++++++++++++ .../qemuhotplug-base-ccw-live.xml | 53 ++++++++++++++++ 14 files changed, 611 insertions(+) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ccw-virtio-1-explicit-reverse.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ccw-virtio-1-explicit.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ccw-virtio-2-explicit.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ccw-virtio-2.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ccw-virtio.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit-reverse.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml -- 1.9.1

2 4

[libvirt] Status of gnulib/local/m4/ssize_t.m4.diff ?
by Daniel P. Berrange 12 Jul '16

12 Jul '16

Way back in 2012, we added the ssize_t.m4.diff file because we didn't want to risk pulling in a gnulib update at time of release. ommit 1012dc2933378640ac0ab1025a4fec2fc8c6f84c Author: Eric Blake <eblake(a)redhat.com> Date: Fri Mar 30 10:28:03 2012 -0600 build: fix mingw ssize_t, syntax check We are so close to a release that we don't want to pull in a gnulib submodule update and risk regressions, since there has been a lot of other gnulib churn upstream. However, there are a couple of gnulib issues that are worth fixing in isolation, by applying local patches to gnulib. There was an upstream gnulib bug in maint.mk that rendered most of our syntax checks ineffective (and fixing it flushed out a minor bug in our code): https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00194.html There is still an upstream bug where gnulib uses the wrong type for ssize_t on mingw; we need the fix now even though it has not yet been accepted into gnulib: https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00188.html Fast forward 4 years, and I'm wondering why we stsill have a ssize_t.m4.diff file that we're updating. It doesn't look like gnulib ever merged it upstream. Can we kill it from libvirt too yet, or does gnulib really need to accept it ? Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 2

[libvirt] question about PCI new_id sysfs interface
by Jim Fehlig 11 Jul '16

11 Jul '16

After updating the dom0 kernel on one of my Xen test hosts, I noticed problems with PCI hostdev management. E.g # virsh nodedev-detach pci_0000_07_10_1 error: Failed to detach device pci_0000_07_10_1 error: Failed to add PCI device ID '8086 1520' to pciback: File exists It turns out there was a small interface change to new_id with the following commit to 3.16 kernel https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/driv… which now causes xen_pciback to fail writes of "vendorid productid" to new_id. e.g. # echo "8086 1520" > /sys/bus/pci/drivers/pciback/new_id -bash: echo: write error: File exists Interestingly, vfio doesn't encounter the same error # echo "8086 1520" > /sys/bus/pci/drivers/vfio-pci/new_id # echo $? 0 vfio-pci has: static struct pci_driver vfio_pci_driver = { .name = "vfio-pci", .id_table = NULL, /* only dynamic ids */ while xen-pciback has: static const struct pci_device_id pcistub_ids[] = { { .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, }, {0,}, }; static struct pci_driver xen_pcibk_pci_driver = { .name = "pciback", .id_table = pcistub_ids, So any vendor/device pair will match for xen-pciback, while none will match for vfio-pci. But after reading that commit and the associated thread, it is not clear to me how to best fix this. Options are 1. set .id_table to NULL for xen-pciback 2. drop using the new_id interface from libvirt 3. pass more values (subvendor, subdevice, class, etc) to the new_id interface I'm not sure what problems, if any, options 1 and 2 might cause. Option 2 seems the best approach since new_id seems to be a rather unsafe interface. Thanks for your opinions! Regards, Jim

5 8

[libvirt] [PATCH] virCommandExec: Report error if execve fails
by Michal Privoznik 11 Jul '16

11 Jul '16

In an unlikely event of execve() failing, the virCommandExec() function does not report any error, even though checks that are at the beginning of the function are verbose when failing. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/vircommand.c | 7 +++++- tests/commandtest.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index f5bd7af..3c67c90 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2152,7 +2152,12 @@ int virCommandExec(virCommandPtr cmd) return -1; } - return execve(cmd->args[0], cmd->args, cmd->env); + execve(cmd->args[0], cmd->args, cmd->env); + + virReportSystemError(errno, + _("cannot execute binary %s"), + cmd->args[0]); + return -1; } #else int virCommandExec(virCommandPtr cmd ATTRIBUTE_UNUSED) diff --git a/tests/commandtest.c b/tests/commandtest.c index f433ad7..8dc57d7 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1063,6 +1063,74 @@ static int test24(const void *unused ATTRIBUTE_UNUSED) return ret; } + +static int test25(const void *unused ATTRIBUTE_UNUSED) +{ + int ret = -1; + int pipeFD[2] = { -1, -1}; + int rv = 0; + ssize_t tries = 10; + pid_t pid; + + if (pipe(pipeFD) < 0) { + fprintf(stderr, "Unable to create pipe\n"); + goto cleanup; + } + + if (virSetNonBlock(pipeFD[0]) < 0) { + fprintf(stderr, "Unable to make read end of pipe nonblocking\n"); + goto cleanup; + } + + /* Now, fork and try to exec a nonexistent binary. */ + pid = fork(); + if (pid < 0) { + fprintf(stderr, "Unable to spawn child\n"); + goto cleanup; + } + + if (pid == 0) { + /* Child */ + virCommandPtr cmd = virCommandNew("some/nonexistent/binary"); + + rv = virCommandExec(cmd); + if (safewrite(pipeFD[1], (void *) &rv, sizeof(rv)) < 0) + fprintf(stderr, "Unable to write to pipe\n"); + _exit(EXIT_FAILURE); + } + + /* Parent */ + while (tries--) { + if (saferead(pipeFD[0], (void *) &rv, sizeof(rv)) < 0) { + if (errno != EWOULDBLOCK) { + fprintf(stderr, "Unable to read from pipe\n"); + goto cleanup; + } + + usleep(1000); + } else { + break; + } + } + + if (!tries) { + fprintf(stderr, "Child hasn't returned anything\n"); + goto cleanup; + } + + if (rv >= 0) { + fprintf(stderr, "Child should have returned an error\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FORCE_CLOSE(pipeFD[0]); + VIR_FORCE_CLOSE(pipeFD[1]); + return ret; +} + + static void virCommandThreadWorker(void *opaque) { virCommandTestDataPtr test = opaque; @@ -1215,6 +1283,7 @@ mymain(void) DO_TEST(test22); DO_TEST(test23); DO_TEST(test24); + DO_TEST(test25); virMutexLock(&test->lock); if (test->running) { -- 2.8.4

2 2

[libvirt] [PATCHv2 0/3] qemu: add support for intel-iommu
by Ján Tomko 11 Jul '16

11 Jul '16

https://bugzilla.redhat.com/show_bug.cgi?id=1235581 v2: * removed '-iommu' suffix from the model name * mentioned the device in formatdomain.html * added the device to ABI stability check and the hot/coldplug parser (where both operations are rejected) * error out on non-q35 machines * added a comment about broken qemu to the commit message of patch 2/3 * no change wrt the device order on the command line - qemu seems to take care of this Ján Tomko (3): Introduce <iommu> device Add QEMU_CAPS_DEVICE_INTEL_IOMMU qemu: format intel-iommu on the command line docs/formatdomain.html.in | 26 +++++++ docs/schemas/domaincommon.rng | 11 +++ src/conf/domain_conf.c | 90 +++++++++++++++++++++- src/conf/domain_conf.h | 16 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 35 +++++++++ src/qemu/qemu_driver.c | 6 ++ src/qemu/qemu_hotplug.c | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-intel-iommu.args | 22 ++++++ .../qemuxml2argvdata/qemuxml2argv-intel-iommu.xml | 37 +++++++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-intel-iommu.xml | 37 +++++++++ tests/qemuxml2xmltest.c | 4 + 18 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu.xml -- 2.7.3

2 4

[libvirt] [PATCH 0/5] test-rewrap-args improvements
by Ján Tomko 11 Jul '16

11 Jul '16

Ján Tomko (5): qemuxml2argvtest: drop empty pseries-vio-address-clash.args testutils: find perl early testutils: only rewrap args files test-wrap-argv: print diff instead of the incorrectly wrapped file test-wrap-argv: set cutoff at 78 characters .../qemuargv2xml-disk-drive-cache-unsafe.args | 3 ++- .../qemuargv2xml-disk-drive-network-rbd-ipv6.args | 4 ++-- .../qemuxml2argv-aarch64-virt-default-nic.args | 3 ++- ...qemuxml2argv-aarch64-virtio-pci-manual-addresses.args | 4 ++-- .../qemuxml2argv-arm-vexpressa9-virtio.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-autoindex.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 3 ++- .../qemuxml2argv-boot-complex-bootindex.args | 3 ++- .../qemuxml2argv-boot-menu-disable-drive-bootindex.args | 3 ++- .../qemuxml2argv-boot-menu-enable-bootindex.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-boot-order.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args | 3 ++- .../qemuxml2argv-console-virtio-ccw.args | 4 ++-- .../qemuxml2argv-cpu-host-model-vendor.args | 4 ++-- .../qemuxml2argv-disk-cdrom-network-ftp.args | 4 ++-- .../qemuxml2argv-disk-cdrom-network-http.args | 4 ++-- .../qemuxml2argv-disk-cdrom-network-tftp.args | 4 ++-- .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 8 ++++---- .../qemuxml2argv-disk-drive-network-iscsi.args | 4 ++-- .../qemuxml2argv-disk-drive-network-rbd-auth-AES.args | 5 +++-- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 4 ++-- .../qemuxml2argv-disk-drive-no-boot.args | 6 ++++-- tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args | 4 ++-- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 8 ++++---- .../qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args | 4 ++-- .../qemuxml2argv-disk-scsi-mptsas1068.args | 4 ++-- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args | 4 ++-- .../qemuxml2argv-disk-source-pool-mode.args | 4 ++-- .../qemuxml2argv-disk-virtio-ccw-many.args | 9 ++++++--- tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args | 3 ++- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 7 ++++--- .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 4 ++-- .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 4 ++-- .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 4 ++-- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 3 ++- .../qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args | 4 ++-- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 4 ++-- .../qemuxml2argv-hostdev-scsi-readonly.args | 4 ++-- .../qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 8 ++++---- .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 12 ++++++------ .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args | 3 ++- .../qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args | 3 ++- .../qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args | 3 ++- .../qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args | 3 ++- .../qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args | 3 ++- .../qemuxml2argvdata/qemuxml2argv-hugepages-shared.args | 7 ++++--- .../qemuxml2argv-iothreads-virtio-scsi-ccw.args | 4 ++-- .../qemuxml2argv-iothreads-virtio-scsi-pci.args | 4 ++-- .../qemuxml2argv-machine-aeskeywrap-off-cap.args | 3 ++- .../qemuxml2argv-machine-aeskeywrap-off-caps.args | 3 ++- .../qemuxml2argv-machine-aeskeywrap-on-cap.args | 3 ++- .../qemuxml2argv-machine-aeskeywrap-on-caps.args | 3 ++- .../qemuxml2argv-machine-deakeywrap-off-cap.args | 3 ++- .../qemuxml2argv-machine-deakeywrap-off-caps.args | 3 ++- .../qemuxml2argv-machine-deakeywrap-on-cap.args | 3 ++- .../qemuxml2argv-machine-deakeywrap-on-caps.args | 3 ++- .../qemuxml2argv-machine-keywrap-none-caps.args | 3 ++- .../qemuxml2argv-machine-keywrap-none.args | 3 ++- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 3 ++- .../qemuxml2argv-memory-hotplug-dimm.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-name-escape.args | 4 ++-- .../qemuxml2argv-net-vhostuser-multiq.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args | 3 ++- .../qemuxml2argv-net-virtio-disable-offloads.args | 8 ++++---- tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 4 ++-- .../qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 4 ++-- .../qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args | 3 ++- .../qemuxml2argv-pseries-vio-address-clash.args | 0 .../qemuxml2argv-pseries-vio-user-assigned.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args | 4 ++-- .../qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args | 4 ++-- .../qemuxml2argv-s390-allow-bogus-usb-controller.args | 4 ++-- .../qemuxml2argv-s390-allow-bogus-usb-none.args | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args | 4 ++-- tests/test-wrap-argv.pl | 16 ++++++++++------ tests/testutils.c | 16 +++++++++++++++- 83 files changed, 208 insertions(+), 151 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.args -- 2.7.3

2 7

[libvirt] [PATCH 0/3] Clean up qemuhotplugtest xml files
by Tomasz Flendrich 11 Jul '16

11 Jul '16

I plan on doing bigger changes to qemuhotplugtest.c. It's going to test device attachment/detachment to both live (like now) and persistent (something that is missing now) domains. More files will be added, so I decided to clean up ones that are there now. Many files were not even connected to any qemuxml2argv test, and yet they were in tests/qemuxml2argvdata/ Tomasz Flendrich (3): Move all qemuhotplugtest XMLs to one directory Move domain and device xmls to different directories Use virschematest on qemuhotplugtest domain xmls tests/qemuhotplugtest.c | 52 ++++++------- .../qemuhotplug-console-virtio.xml | 0 .../qemuhotplug-disk-cdrom-nochange.xml | 0 .../qemuhotplug-disk-scsi-2.xml | 0 .../qemuhotplug-disk-scsi.xml | 0 .../qemuhotplug-disk-usb.xml | 0 .../qemuhotplug-disk-virtio.xml | 0 ...lug-graphics-spice-listen-network-password.xml} | 0 .../qemuhotplug-graphics-spice-listen.xml | 0 .../qemuhotplug-graphics-spice-nochange.xml | 0 ...qemuhotplug-graphics-spice-timeout-nochange.xml | 0 ...qemuhotplug-graphics-spice-timeout-password.xml | 0 .../qemuhotplug-qemu-agent-detach.xml | 0 .../qemuhotplug-qemu-agent.xml | 0 .../qemuhotplug-base+qemu-agent-detach.xml} | 0 .../qemuhotplug-base+qemu-agent.xml} | 0 .../qemuhotplug-base-live+disk-scsi.xml} | 0 .../qemuhotplug-base-live+disk-usb.xml} | 0 .../qemuhotplug-base-live+disk-virtio.xml} | 0 .../qemuhotplug-base-live+qemu-agent-detach.xml} | 0 .../qemuhotplug-base-live+qemu-agent.xml} | 0 .../qemuhotplug-base-live.xml} | 0 ...base-with-scsi-controller-live+disk-scsi-2.xml} | 0 ...qemuhotplug-base-with-scsi-controller-live.xml} | 0 ...e-without-scsi-controller-live+disk-scsi-2.xml} | 0 ...uhotplug-base-without-scsi-controller-live.xml} | 0 ...otplug-console-compat-2-live+console-virtio.xml | 0 .../qemuhotplug-console-compat-2-live.xml} | 0 .../qemuhotplug-disk-cdrom.xml | 37 +++++++++ .../qemuhotplug-graphics-spice-listen-network.xml} | 0 .../qemuhotplug-graphics-spice-timeout.xml | 87 ++++++++++++++++++++++ .../qemuhotplug-graphics-spice.xml | 47 ++++++++++++ tests/virschematest.c | 3 +- 33 files changed, 199 insertions(+), 27 deletions(-) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-console-virtio.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-cdrom-nochange.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-scsi-2.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-scsi.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-usb.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-virtio.xml (100%) rename tests/{qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml => qemuhotplugtestdevices/qemuhotplug-graphics-spice-listen-network-password.xml} (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-listen.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-nochange.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-timeout-nochange.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-timeout-password.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-qemu-agent-detach.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-qemu-agent.xml (100%) rename tests/{qemuhotplugtestdata/qemuhotplug-hotplug-base-live+qemu-agent-detach.xml => qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml} (100%) rename tests/{qemuhotplugtestdata/qemuhotplug-hotplug-base-live+qemu-agent.xml => qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml} (100%) rename tests/{qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-scsi.xml => qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml} (100%) rename tests/{qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-usb.xml => qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml} (100%) rename tests/{qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-virtio.xml => qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml} (100%) rename tests/{qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent-detach.xml => qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml} (100%) rename tests/{qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent.xml => qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-hotplug-base-live.xml => qemuhotplugtestdomains/qemuhotplug-base-live.xml} (100%) rename tests/{qemuhotplugtestdata/qemuhotplug-hotplug-base-with-scsi-controller-live+disk-scsi-2.xml => qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-hotplug-base-with-scsi-controller-live.xml => qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml} (100%) rename tests/{qemuhotplugtestdata/qemuhotplug-hotplug-base-without-scsi-controller-live+disk-scsi-2.xml => qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-hotplug-base-without-scsi-controller-live.xml => qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live.xml} (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-console-compat-2-live+console-virtio.xml (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml => qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml} (100%) create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml rename tests/{qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml => qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml} (100%) create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml -- 2.7.4 (Apple Git-66)

2 1

[libvirt] [PATCH 0/5] Couple of memleaks fixes
by Michal Privoznik 11 Jul '16

11 Jul '16

I've found these while procrastinating on friday afternoon. Michal Privoznik (5): virStorageEncryptionSecretFree: Don't leak secret lookup definition qemuBuildCpuCommandLine: Don't leak @buf qemuDomainObjPrivateFree: Free @masterKey too qemuxml2argvtest: Don't leak dummy monitor qemuxml2argvmock: Don't leak @netdef->ifname src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 21 +++++++++++++++------ src/util/virstorageencryption.c | 1 + tests/qemuxml2argvmock.c | 1 + tests/qemuxml2argvtest.c | 5 +++-- 5 files changed, 21 insertions(+), 8 deletions(-) -- 2.8.4

2 10

[libvirt] [PATCH v3] virsh: allow both --uuid and --name at same time
by Chen Hanxiao 11 Jul '16

11 Jul '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> #virsh list --uuid --name 49c765a0-25e7-40d0-964f-dac99724b32c c7 918f1dd6-b19f-412b-ba17-d113bad89af8 f23 Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v3: add virsh.pod sections v2: drop uuid-name option, enable both --uuid and --name tools/virsh-domain-monitor.c | 14 ++++++++------ tools/virsh.pod | 10 ++++++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 0a93949..c712fa5 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1844,12 +1844,8 @@ cmdList(vshControl *ctl, const vshCmd *cmd) FILTER("state-shutoff", VIR_CONNECT_LIST_DOMAINS_SHUTOFF); FILTER("state-other", VIR_CONNECT_LIST_DOMAINS_OTHER); - if (optTable + optName + optUUID > 1) { - vshError(ctl, "%s", - _("Only one argument from --table, --name and --uuid " - "may be specified.")); - return false; - } + VSH_EXCLUSIVE_OPTIONS("table", "name"); + VSH_EXCLUSIVE_OPTIONS("table", "uuid"); if (!optUUID && !optName) optTable = true; @@ -1907,6 +1903,12 @@ cmdList(vshControl *ctl, const vshCmd *cmd) state == -2 ? _("saved") : virshDomainStateToString(state)); } + } else if (optUUID && optName) { + if (virDomainGetUUIDString(dom, uuid) < 0) { + vshError(ctl, "%s", _("Failed to get domain's UUID")); + goto cleanup; + } + vshPrint(ctl, "%-36s %-30s\n", uuid, virDomainGetName(dom)); } else if (optUUID) { if (virDomainGetUUIDString(dom, uuid) < 0) { vshError(ctl, "%s", _("Failed to get domain's UUID")); diff --git a/tools/virsh.pod b/tools/virsh.pod index 601cb44..d7cd10e 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -524,8 +524,14 @@ Note that this flag does not filter the list of domains. If I<--name> is specified, domain names are printed instead of the table formatted one per line. If I<--uuid> is specified domain's UUID's are printed instead of names. Flag I<--table> specifies that the legacy table-formatted -output should be used. This is the default. All of these are mutually -exclusive. +output should be used. This is the default. + +If both I<--name> and I<--uuid> are specified, domain UUID's and names +are printed side by side without any header. Flag I<--table> specifies +that the legacy table-formatted output should be used. This is the +default if neither I<--name> nor I<--uuid> are specified. Options +I<--uuid> and I<--name> are mutually exclusive if option I<--table> is +specified. If I<--title> is specified, then the short domain description (title) is printed in an extra column. This flag is usable only with the default -- 1.8.3.1

2 1

[libvirt] [PATCH RFC 0/5] libxl: host cpu element in capabilities
by Joao Martins 11 Jul '16

11 Jul '16

Hey! This series is the RFC I mentioned in cpu map discussion for libxl[0]. That is to implement host.cpu element in caps,by getting topology and xen hwcaps parsing done, followed by having cpu-{compare,baseline} and get cpu models APIs implemented. Last thing missing I think it would be to libxl_cpuid_set the features to enable/disable whichever format we choose plus the appropriate XML convertion to/from XM and XL config formats. Cheers, Joao [0] https://www.redhat.com/archives/libvir-list/2016-July/msg00237.html Joao Martins (5): libxl: describe host topology in capabilities libxl: describe host cpu features based on hwcaps libxl: implement virConnectCompareCPU libxl: implement virConnectBaselineCPU libxl: implement virConnectGetCPUModelNames src/libxl/libxl_capabilities.c | 148 ++++++++++++++++++++++++++++++++++++++--- src/libxl/libxl_driver.c | 74 +++++++++++++++++++++ 2 files changed, 212 insertions(+), 10 deletions(-) -- 2.1.4

2 7

[libvirt] [PATCH] libvirt.spec.in: soft-static allocation of qemu and kvm groups
by Jaroslav Suchanek 11 Jul '16

11 Jul '16

Follow the same logic for adding qemu user also for kvm and qemu groups. As is described in https://fedoraproject.org/wiki/Packaging:UsersAndGroups document there should be preallocated UIDs and GIDs for libvirt. A check for required group id was added prior groupadd execution. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1351792 --- libvirt.spec.in | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2b98836..3dc3193 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1464,8 +1464,20 @@ fi # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name; see # https://fedoraproject.org/wiki/Packaging:UsersAndGroups -getent group kvm >/dev/null || groupadd -f -g 36 -r kvm -getent group qemu >/dev/null || groupadd -f -g 107 -r qemu +if ! getent group kvm >/dev/null; then + if ! getent group 36 >/dev/null; then + groupadd -f -g 36 -r kvm + else + groupadd -f -r kvm + fi +fi +if ! getent group qemu >/dev/null; then + if ! getent group 107 >/dev/null; then + groupadd -f -g 107 -r qemu + else + groupadd -f -r qemu + fi +fi if ! getent passwd qemu >/dev/null; then if ! getent passwd 107 >/dev/null; then useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu -- 1.8.3.1

2 2

Re: [libvirt] [Qemu-devel] [RFC 00/28] s390x CPU models: exposing features
by David Hildenbrand 11 Jul '16

11 Jul '16

Are there any further comments, especially on patches 23-25, introducing new QOM interfaces? Also, if anybody is planning to look into this, please speak up :) Otherwise it might make sense to put this onto the next KVM call agenda. David > This is our second attempt to implement CPU models for s390x. We realized > that we also want to have features exposed via the CPU model. While doing > that we realized that we want to have a better interface for libvirt. > > Unfortunately, CPU models on s390x are special and we have to take care of: > - A CPU like z13 looks differently in various environments (under different > LPAR versions, under different z/VM versions, under different KVM > versions, export regulation) - we have _a lot_ of feature variability. > - We still have certain features that are not published but might be > implemented/introduced in the future. As they are a theoretical part > of a CPU already, we have to find a way to model these future changes. > - We still have certain features that are already published, but not > implemented. Implementation might be added in the future in KVM. > - We heavily rely on KVM to tell us which features it can actually > virtualize - user space queries like "STFL(e)" give no guarantees. > - Certain "subfeatures" were introduced in one run. In practice, they are > always around, but in theory, subfeatures could be dropped in the future. > - Just because two CPU models have the same features doesn't mean they > are equal - some internal numbers might be different. E.g. we won't allow > running a z13 under a zBC12 just by turning off features. > - We cannot blindly enable all possible features for a CPU generation, > the IBC "Instruction Blocking Control" in KVM will try to block > instructions introduced with certain features. So a CPU generation always > has some maximum feature set that is guaranteed to work. > > It all boils down to a specific released CPU to have. > a) A fixed feature set that we expect it to be have on every hypervisor. > b) A variable part that depends on the hypervisor and that could be > extended in the future (adding not yet implemented features) that we > always want to enable later on. > c) A variable part that we want to enable only if requested - nested > virtualization ("vsie") and assists are one example. > > But, the fixed feature set is not really what we want to use as a default. > It is just like a really minimum, stable base. > > So we have > a) A "stable" CPU model for each released CPU that will never change and > maps to the minimum feature set we expect to be around on all > hypervisors. e.g. "z13-base" or "z10EC.2-base". These are migration > safe. > b) A "default" CPU model for each released CPU, that can change between > QEMU versions and that will always include the features we expect to > be around in our currently supported environments and will contain only > features we expect to be stable. E.g. nested virtualization will not be > contained in these models. These models are not migration safe, e.g > "z13" or "z10EC.2". The feature set can differ between QEMU versions. > c) An internal "maximum" CPU model for each generation that tells us which > features were supported as a maximum back when the hardware was > released. This will not be exposed > > To not have to replicate all CPU model changes ("new default fetaures") in > libvirt, to not duplicate the logic about compatibility and the like, > our approach tries to keep all the QEMU logic in libvirt and provide > standardized interfaces for libvirt to e.g. baseline, compare. This > allows libvirt to not have to care about any model names or feature names, > it can just pass the data from interface to interface and report it to > the user. > > Also, libvirt might want to know what the "host" model looks like and > convert a CPU model to a migration safe variant. For this reason, a QMP > command is added that can create a migration safe variant of a variable > CPU model, indicating only the delta changes done to a stable model. > > So we have: > a) "query-cpu-model-expansion" - tell us what the "host" or a migration > unsafe model looks like. Either falling back to a stable model or > completely exposing all properties. We are interested in stable models. > b) "query-cpu-model-comparison" - tell us how two CPU models compare, > indicating which properties were responsible for the decision. > c) "query-cpu-model-baseline" - create a new model out of two models, > taking a requested level of stability into account. > > As we are aware that e.g. x86 has their own idea of a CPU model and their > existing implementation in place, but are also looking into to ways to e.g. > expand the "host" CPU model to a detailed representation, we designed the > "expansion" interface to also allow that. > > Comments are very welcome, but please always keep the restrictions and > specialties in mind when suggesting some major design changes. > > The header update will be replaced by a kvm-next header update as soon as > the VSIE patches are upstream. The major KVM interface changes are already > part of kvm-next. > > The current state is available on git://github.com/cohuck/qemu on branch > "cpumodel-s390x". > > David Hildenbrand (26): > s390x/cpumodel: "host" and "qemu" as CPU subclasses > s390x/cpumodel: expose CPU class properties > s390x/cpumodel: generate CPU feature group lists > s390x/cpumodel: introduce CPU feature group definitions > s390x/cpumodel: register defined CPU models as subclasses > s390x/cpumodel: store the CPU model in the CPU instance > s390x/cpumodel: expose features and feature groups as properties > s390x/cpumodel: let the CPU model handle feature checks > s390x/cpumodel: check and apply the CPU model > s390x/sclp: factor out preparation of cpu entries > s390x/sclp: introduce sclp feature blocks > s390x/sclp: indicate sclp features > s390x/sclp: propagate the ibc val(lowest and unblocked ibc) > s390x/sclp: propagate the mha via sclp > s390x/sclp: propagate hmfai > update linux headers (CPU model) > s390x/kvm: allow runtime-instrumentation for "none" machine > s390x/kvm: implement CPU model support > s390x/kvm: disable host model for existing compat machines > s390x/kvm: let the CPU model control CMM(A) > qmp: add QMP interface "query-cpu-model-expansion" > qmp: add QMP interface "query-cpu-model-comparison" > qmp: add QMP interface "query-cpu-model-baseline" > s390x/cpumodel: implement QMP interface "query-cpu-model-expansion" > s390x/cpumodel: implement QMP interface "query-cpu-model-comparison" > s390x/cpumodel: implement QMP interface "query-cpu-model-baseline" > > Michael Mueller (2): > s390x/cpumodel: introduce CPU features > s390x/cpumodel: generate CPU feature lists for CPU models > > Makefile.target | 2 +- > hw/s390x/s390-virtio-ccw.c | 5 + > hw/s390x/s390-virtio.c | 6 +- > hw/s390x/sclp.c | 35 +- > include/hw/s390x/sclp.h | 17 +- > include/sysemu/arch_init.h | 10 + > linux-headers/asm-s390/kvm.h | 40 ++ > qapi-schema.json | 184 ++++++ > qmp-commands.hx | 18 + > qmp.c | 22 + > rules.mak | 1 + > stubs/Makefile.objs | 3 + > stubs/arch-query-cpu-model-baseline.c | 13 + > stubs/arch-query-cpu-model-comparison.c | 12 + > stubs/arch-query-cpu-model-expansion.c | 12 + > target-s390x/Makefile.objs | 22 +- > target-s390x/cpu-qom.h | 5 + > target-s390x/cpu.c | 35 +- > target-s390x/cpu.h | 5 + > target-s390x/cpu_features.c | 376 +++++++++++ > target-s390x/cpu_features.h | 302 +++++++++ > target-s390x/cpu_models.c | 1055 +++++++++++++++++++++++++++++++ > target-s390x/cpu_models.h | 113 ++++ > target-s390x/gen-features.c | 587 +++++++++++++++++ > target-s390x/helper.c | 29 +- > target-s390x/kvm.c | 346 +++++++++- > target-s390x/machine.c | 14 +- > 27 files changed, 3203 insertions(+), 66 deletions(-) > create mode 100644 stubs/arch-query-cpu-model-baseline.c > create mode 100644 stubs/arch-query-cpu-model-comparison.c > create mode 100644 stubs/arch-query-cpu-model-expansion.c > create mode 100644 target-s390x/cpu_features.c > create mode 100644 target-s390x/cpu_features.h > create mode 100644 target-s390x/cpu_models.c > create mode 100644 target-s390x/cpu_models.h > create mode 100644 target-s390x/gen-features.c >

2 2

[libvirt] [PATCH v2 0/4] devices: filesystem: type volume
by Olga Krishtal 11 Jul '16

11 Jul '16

The patches introduce new filesystem type volume: <filesystem type='volume' accessmode='passthrough'> <driver type='ploop' format='ploop'/> <source pool='pool' volume='volume'/> <target dir='/'/> </filesystem> This makes possible to use storage volumes as the source for disks. v2: -split patches -rebased Olga Krishtal (4): filesystem: adds possibility to use storage pool as fs source devices: filesystems: added volume type vz: refactoring of prlsdkCreateCt vz: support filesystem type volume src/conf/domain_audit.c | 4 +- src/conf/domain_conf.c | 52 +++++++++++++--- src/conf/domain_conf.h | 4 +- src/libvirt_private.syms | 1 + src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_container.c | 50 +++++++-------- src/lxc/lxc_controller.c | 18 +++--- src/lxc/lxc_native.c | 5 +- src/lxc/lxc_process.c | 4 +- src/openvz/openvz_conf.c | 6 +- src/openvz/openvz_driver.c | 4 +- src/qemu/qemu_command.c | 2 +- src/storage/storage_driver.c | 4 +- src/vbox/vbox_common.c | 6 +- src/vmx/vmx.c | 6 +- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 145 ++++++++++++++++++++++++++++++++++--------- src/vz/vz_sdk.h | 2 +- 18 files changed, 221 insertions(+), 96 deletions(-) -- 1.8.3.1

2 6

[libvirt] [PATCH] Fix logic in qemuDomainObjPrivateXMLParseVcpu
by Daniel P. Berrange 11 Jul '16

11 Jul '16

The code in qemuDomainObjPrivateXMLParseVcpu for parsing the 'idstr' string was comparing the overall boolean result against 0 which was always true qemu/qemu_domain.c: In function 'qemuDomainObjPrivateXMLParseVcpu': qemu/qemu_domain.c:1482:59: error: comparison of constant '0' with boolean expression is always false [-Werror=bool-compare] if ((idstr && virStrToLong_uip(idstr, NULL, 10, &idx)) < 0 || ^ It was further performing two distinct error checks in the same conditional and reporting a single error message, which was misleading in one of the two cases. This splits the conditional check into two parts with distinct error messages and fixes the logic error. Fixes the bug in commit 5184f398b40a5e0d7d84b86182edcb2b48ab04ba Author: Peter Krempa <pkrempa(a)redhat.com> Date: Fri Jul 1 14:56:14 2016 +0200 qemu: Store vCPU thread ids in vcpu private data objects Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a broken build fix src/qemu/qemu_domain.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bf23d46..f7c659b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1479,10 +1479,15 @@ qemuDomainObjPrivateXMLParseVcpu(xmlNodePtr node, idstr = virXMLPropString(node, "id"); - if ((idstr && virStrToLong_uip(idstr, NULL, 10, &idx)) < 0 || - !(vcpu = virDomainDefGetVcpu(def, idx))) { + if (idstr && + (virStrToLong_uip(idstr, NULL, 10, &idx) < 0)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid vcpu index '%s'"), idstr); + _("cannot parse vcpu index '%s'"), idstr); + goto cleanup; + } + if (!(vcpu = virDomainDefGetVcpu(def, idx))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid vcpu index '%u'"), idx); goto cleanup; } -- 2.7.4

1 0

[libvirt] [PATCH REPOST 0/3] Small cleanups and improvements
by Andrea Bolognani 11 Jul '16

11 Jul '16

Rebased on top of current master. Previous attempt: https://www.redhat.com/archives/libvir-list/2016-June/msg02037.html Andrea Bolognani (3): util: hostcpu: Add virHostCPUGetKVMMaxVCPUs() stub util: hostcpu: Drop obsolete compatibility code qemu: capabilities: Make virHostCPUGetKVMMaxVCPUs() errors fatal src/qemu/qemu_capabilities.c | 9 ++++++--- src/util/virhostcpu.c | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 16 deletions(-) -- 2.7.4

2 9

[libvirt] cpu_map data access for libxl driver
by Cedric Bosdonnat 11 Jul '16

11 Jul '16

Hi Jiri, all, As I mentioned earlier today on IRC, I have started implementing CPU configuration support for libxl driver. libxl expects a string definition the state of all the feature (easy to create), but also the numeric values for the CPU family and model. virCPUDef holds the name as a string, but not the numeric values though there are stored in the cpu_map.xml. For what libxl expects, search for 'cpuid=' in this man page: http://xenbits.xen.org/docs/unstable/man/xl.cfg.5.html Any idea how to get those values from the libxl driver? -- Cedric

4 8

[libvirt] [PATCH 0/4] virsh: Provide better auto-completion
by Nishith Shah 11 Jul '16

11 Jul '16

This series of patches are meant to improve existing auto-complete functionality in virsh. The first patch breaks vshCmddefOptParse into two smaller functions, for use later in the third patch. The second patch simply changes the types of variables used in existing readline generators. The third patch introduces quiet mode for the functions vshCmddefGetOption and vshCommandStringGetArg. The fourth patch introduces vshReadlineParse, which uses existing parsing functions and borrows from vshCommandParse to quite some extent and provides better auto-completion. Nishith Shah (4): virsh: Break vshCmddefOptParse into helper functions virsh: Fix variable types in readline generators virsh: Add option to suppress error in various functions virsh: Introduce vshReadlineParse for improved auto-completion tools/vsh.c | 318 +++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 271 insertions(+), 47 deletions(-) -- 2.7.4

2 5

[libvirt] [PATCH] bhyve: implement virConnectGetDomainCapabilities
by Fabian Freyer 10 Jul '16

10 Jul '16

This patch adds virConnectGetDomainCapabilities support for bhyve. --- src/bhyve/bhyve_capabilities.c | 26 ++++++++++++++++++++ src/bhyve/bhyve_capabilities.h | 5 ++++ src/bhyve/bhyve_driver.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index d0af4d9..10c33b9 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -3,6 +3,7 @@ * * Copyright (C) 2014 Roman Bogorodskiy * Copyright (C) 2014 Semihalf + * Copyright (C) 2016 Fabian Freyer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -106,6 +107,31 @@ virBhyveCapsBuild(void) return NULL; } +virDomainCapsPtr +virBhyveDomainCapsBuild(const char *emulatorbin, + const char *machine, + virArch arch, + virDomainVirtType virttype) +{ + virDomainCapsPtr caps = NULL; + + if (!(caps = virDomainCapsNew(emulatorbin, machine, arch, virttype))) + goto cleanup; + + caps->os.supported = true; + caps->disk.supported = true; + VIR_DOMAIN_CAPS_ENUM_SET(caps->disk.diskDevice, + VIR_DOMAIN_DISK_DEVICE_DISK, + VIR_DOMAIN_DISK_DEVICE_CDROM); + + VIR_DOMAIN_CAPS_ENUM_SET(caps->disk.bus, + VIR_DOMAIN_DISK_BUS_SATA, + VIR_DOMAIN_DISK_BUS_VIRTIO); + + cleanup: + return caps; +} + int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps) { diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index 0eb22a4..85018cb 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -23,8 +23,13 @@ # define _BHYVE_CAPABILITIES # include "capabilities.h" +#include "conf/domain_capabilities.h" virCapsPtr virBhyveCapsBuild(void); +virDomainCapsPtr virBhyveDomainCapsBuild(const char *emulatorbin, + const char *machine, + virArch arch, + virDomainVirtType virttype); /* These are bit flags: */ typedef enum { diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 8036661..ae37a2d 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -53,6 +53,7 @@ #include "nodeinfo.h" #include "virhostcpu.h" #include "virhostmem.h" +#include "conf/domain_capabilities.h" #include "bhyve_device.h" #include "bhyve_driver.h" @@ -1539,6 +1540,60 @@ bhyveConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) return 0; } +static char * +bhyveConnectGetDomainCapabilities(virConnectPtr conn, + const char *emulatorbin, + const char *arch_str, + const char *machine, + const char *virttype_str, + unsigned int flags) +{ + //bhyveConnPtr privconn = conn->privateData; + virDomainCapsPtr caps = NULL; + char *ret = NULL; + int virttype = VIR_DOMAIN_VIRT_BHYVE; + int arch = virArchFromHost(); /* virArch */ + + virCheckFlags(0, ret); + + if (virConnectGetDomainCapabilitiesEnsureACL(conn) < 0) + return ret; + + if (virttype_str && + (virttype = virDomainVirtTypeFromString(virttype_str)) < 0) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown virttype: %s"), + virttype_str); + goto cleanup; + } + + if (virttype != VIR_DOMAIN_VIRT_BHYVE) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown virttype: %s"), + virttype_str); + goto cleanup; + } + + if (arch_str && (arch = virArchFromString(arch_str)) == VIR_ARCH_NONE) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown architecture: %s"), + arch_str); + goto cleanup; + } + + if (emulatorbin == NULL) + emulatorbin = "/usr/sbin/bhyve"; + + if (!(caps = virBhyveDomainCapsBuild(emulatorbin, machine, arch, virttype))) + goto cleanup; + + ret = virDomainCapsFormat(caps); + + cleanup: + virObjectUnref(caps); + return ret; +} + static virHypervisorDriver bhyveHypervisorDriver = { .name = "bhyve", .connectOpen = bhyveConnectOpen, /* 1.2.2 */ @@ -1592,6 +1647,7 @@ static virHypervisorDriver bhyveHypervisorDriver = { .connectIsAlive = bhyveConnectIsAlive, /* 1.3.5 */ .connectIsSecure = bhyveConnectIsSecure, /* 1.3.5 */ .connectIsEncrypted = bhyveConnectIsEncrypted, /* 1.3.5 */ + .connectGetDomainCapabilities = bhyveConnectGetDomainCapabilities, /* 2.1.0 */ }; -- 2.5.5

2 1

[libvirt] [PATCH] bhyve: fix bhyveargv2xml custom loader test
by Roman Bogorodskiy 10 Jul '16

10 Jul '16

Before pushing this test, I changed the appropriate args file to pet test-wrap-argv.pl, but forgot to change the xml file, so update it accordingly. --- Pushed as trivial. tests/bhyveargv2xmldata/bhyveargv2xml-custom-loader.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-custom-loader.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-custom-loader.xml index 3e9bd29..68a488f 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-custom-loader.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-custom-loader.xml @@ -5,7 +5,7 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <bootloader>/usr/bin/custom-loader</bootloader> - <bootloader_args>with several arguments</bootloader_args> + <bootloader_args>-s ome --args</bootloader_args> <os> <type>hvm</type> </os> -- 2.7.4

1 0

[libvirt] [PATCH v5 0/6] bhyve: virConnectDomainXMLFromNative
by Fabian Freyer 10 Jul '16

10 Jul '16

Differences to v4: - fixed various memory leaks - various style improvements by Roman Bogorodskiy and fixes for his comments on v4 Link to v4: https://www.redhat.com/archives/libvir-list/2016-June/msg02138.html Link to v3: https://www.redhat.com/archives/libvir-list/2016-June/msg01741.html Link to v2: https://www.redhat.com/archives/libvir-list/2016-June/msg00728.html Link to v1: https://www.redhat.com/archives/libvir-list/2016-June/msg00001.html Fabian Freyer (6): config-post.h: define __GNUC_PREREQ if not defined gnulib: add getopt module bhyve: implement virConnectDomainXMLFromNative bhyve: implement bhyve argument parser bhyve: implement argument parser for loader Add some tests for bhyveParseCommandLineString bootstrap.conf | 1 + config-post.h | 18 + m4/virt-driver-bhyve.m4 | 3 + po/POTFILES.in | 2 + src/Makefile.am | 2 + src/bhyve/bhyve_driver.c | 41 + src/bhyve/bhyve_parse_command.c | 903 +++++++++++++++++++++ src/bhyve/bhyve_parse_command.h | 30 + tests/Makefile.am | 23 +- .../bhyveargv2xmldata/bhyveargv2xml-acpiapic.args | 9 + tests/bhyveargv2xmldata/bhyveargv2xml-acpiapic.xml | 20 + tests/bhyveargv2xmldata/bhyveargv2xml-ahci-hd.args | 8 + tests/bhyveargv2xmldata/bhyveargv2xml-ahci-hd.xml | 21 + tests/bhyveargv2xmldata/bhyveargv2xml-base.args | 7 + tests/bhyveargv2xmldata/bhyveargv2xml-base.xml | 16 + .../bhyveargv2xml-bhyveload-bootorder.args | 13 + .../bhyveargv2xml-bhyveload-bootorder.xml | 27 + .../bhyveargv2xml-bhyveload-custom.args | 11 + .../bhyveargv2xml-bhyveload-custom.xml | 18 + .../bhyveargv2xml-bhyveload-mem-mismatch.args | 12 + .../bhyveargv2xml-bhyveload-memsize-fail.args | 12 + .../bhyveargv2xml-bhyveload-name-mismatch.args | 12 + .../bhyveargv2xml-bhyveload-vda.args | 12 + .../bhyveargv2xml-bhyveload-vda.xml | 21 + .../bhyveargv2xml-bhyverun-mem-mismatch.args | 12 + .../bhyveargv2xml-bhyverun-name-mismatch.args | 12 + tests/bhyveargv2xmldata/bhyveargv2xml-cdrom.args | 8 + tests/bhyveargv2xmldata/bhyveargv2xml-cdrom.xml | 21 + tests/bhyveargv2xmldata/bhyveargv2xml-console.args | 10 + tests/bhyveargv2xmldata/bhyveargv2xml-console.xml | 24 + .../bhyveargv2xmldata/bhyveargv2xml-console2.args | 10 + tests/bhyveargv2xmldata/bhyveargv2xml-console2.xml | 15 + .../bhyveargv2xmldata/bhyveargv2xml-console3.args | 11 + tests/bhyveargv2xmldata/bhyveargv2xml-console3.xml | 27 + .../bhyveargv2xmldata/bhyveargv2xml-console4.args | 10 + tests/bhyveargv2xmldata/bhyveargv2xml-console4.xml | 15 + .../bhyveargv2xml-custom-loader.args | 8 + .../bhyveargv2xml-custom-loader.xml | 18 + .../bhyveargv2xml-disk-toomany.args | 34 + .../bhyveargv2xml-disk-toomany.xml | 146 ++++ .../bhyveargv2xmldata/bhyveargv2xml-extraargs.args | 8 + .../bhyveargv2xml-memsize-fail.args | 7 + .../bhyveargv2xml-memsize-human.args | 7 + .../bhyveargv2xml-memsize-human.xml | 16 + .../bhyveargv2xml-memsize-large.args | 7 + .../bhyveargv2xml-memsize-large.xml | 16 + tests/bhyveargv2xmldata/bhyveargv2xml-name.args | 7 + tests/bhyveargv2xmldata/bhyveargv2xml-name.xml | 16 + tests/bhyveargv2xmldata/bhyveargv2xml-oneline.args | 1 + tests/bhyveargv2xmldata/bhyveargv2xml-oneline.xml | 16 + tests/bhyveargv2xmldata/bhyveargv2xml-utc.args | 8 + tests/bhyveargv2xmldata/bhyveargv2xml-utc.xml | 16 + tests/bhyveargv2xmldata/bhyveargv2xml-uuid.args | 8 + tests/bhyveargv2xmldata/bhyveargv2xml-uuid.xml | 16 + tests/bhyveargv2xmldata/bhyveargv2xml-uuid2.args | 8 + tests/bhyveargv2xmldata/bhyveargv2xml-vcpus.args | 7 + tests/bhyveargv2xmldata/bhyveargv2xml-vcpus.xml | 16 + .../bhyveargv2xml-virtio-blk.args | 8 + .../bhyveargv2xmldata/bhyveargv2xml-virtio-blk.xml | 21 + .../bhyveargv2xml-virtio-net.args | 9 + .../bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml | 26 + .../bhyveargv2xml-virtio-net2.args | 8 + .../bhyveargv2xml-virtio-net2.xml | 16 + .../bhyveargv2xml-virtio-net3.args | 8 + .../bhyveargv2xml-virtio-net3.xml | 16 + .../bhyveargv2xml-virtio-net4.args | 8 + .../bhyveargv2xml-virtio-net4.xml | 21 + tests/bhyveargv2xmlmock.c | 27 + tests/bhyveargv2xmltest.c | 213 +++++ 69 files changed, 2181 insertions(+), 3 deletions(-) create mode 100644 src/bhyve/bhyve_parse_command.c create mode 100644 src/bhyve/bhyve_parse_command.h create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-acpiapic.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-acpiapic.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-ahci-hd.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-ahci-hd.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-base.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-base.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyveload-bootorder.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyveload-bootorder.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyveload-custom.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyveload-custom.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyveload-mem-mismatch.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyveload-memsize-fail.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyveload-name-mismatch.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyveload-vda.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyveload-vda.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyverun-mem-mismatch.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-bhyverun-name-mismatch.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-cdrom.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-cdrom.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console2.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console2.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console3.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console3.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console4.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-console4.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-custom-loader.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-custom-loader.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-disk-toomany.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-disk-toomany.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-extraargs.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-memsize-fail.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-memsize-human.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-memsize-human.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-memsize-large.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-memsize-large.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-name.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-name.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-oneline.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-oneline.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-utc.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-utc.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-uuid.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-uuid.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-uuid2.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vcpus.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vcpus.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-blk.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-blk.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net2.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net2.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net3.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net3.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml create mode 100644 tests/bhyveargv2xmlmock.c create mode 100644 tests/bhyveargv2xmltest.c -- 2.5.5

2 7

[libvirt] [PATCH 00/10] Test persistent device attachment
by Tomasz Flendrich 10 Jul '16

10 Jul '16

This patch requires two other patches: https://www.redhat.com/archives/libvir-list/2016-July/msg00264.html https://www.redhat.com/archives/libvir-list/2016-July/msg00202.html In qemu_driver.c, two functions were split to have less responsibility. They were also modified so that they could be used in qemuhotplugtest. Now instead of running different functions to attach different device types, a generic function is run. Hopefully this will result in more device types tested in the future. Suggestions on how to name these two new functions are very welcome. In the future, if one uses the following command: virsh attach-device --live --config the new device will have the same address assigned in both live and config domain. To make sure that everything will work properly after making these changes, I reworked qemuhotplug.c to work with attaching devices to persistent domains. So far, there is only one test for persistent attachment. I will add more testcases as soon as I hear some feedback on these changes. qemuhotplugtest.c should first be modified anyway, so that the three xmls's filenames (basis domain xml, device xml, expected xml) are stated explicitly instead of being calculated. This will allow for more flexibility in testing and less xml files duplicates. Tomasz Tomasz Flendrich (10): Change parameters to qemuDomainAttachDeviceLive Remove an unnecessary variable Split qemuDomainAttachDeviceFlags in two Narrow down a parameter Split qemuDomainDetachDeviceFlags in two Make qemu attach/detach functions public Narrow down a parameter to function Use more generic functions in qemuhotplugtest Make qemuhotplugtest work with persistent domains Add a persistent attachment testcase src/qemu/qemu_driver.c | 221 +++++++++++---------- src/qemu/qemu_driver.h | 14 ++ tests/qemuhotplugtest.c | 213 ++++++++++++-------- .../qemuhotplug-base-config+qemu-agent+config.xml | 45 +++++ .../qemuhotplug-base-config.xml | 40 ++++ 5 files changed, 349 insertions(+), 184 deletions(-) create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-config+qemu-agent+config.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-config.xml -- 1.9.1

1 10

[libvirt] [PATCH 0/3] bitmap: Clarify and add tests for empty bitmap
by Marc Hartmayer 09 Jul '16

09 Jul '16

This patch series clarifies the virBitmapLastSetBit function and adds some tests for the empty bitmap. It also clarifies the documentations of virBitmapNewQuiet and virBitmapNew. Marc Hartmayer (3): util: bitmap: clarify virBitmapLastSetBit() behavior for empty bitmaps util: bitmap: Mention the size == 0 handling tests: Add test cases for the empty bitmap src/util/virbitmap.c | 18 +++++++++++------- tests/virbitmaptest.c | 17 +++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH] tests: env perl shebang for test-wrap-argv.pl
by Fabian Freyer 09 Jul '16

09 Jul '16

On some systems perl is not necessarily in /usr/bin/perl. Use the perl version in the PATH instead. --- tests/test-wrap-argv.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl index d66f5b4..b053f28 100755 --- a/tests/test-wrap-argv.pl +++ b/tests/test-wrap-argv.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # # Copyright (C) 2015 Red Hat, Inc. # -- 2.5.5

2 1

[libvirt] [PATCH 00/11] vCPU information storage improvements
by Peter Krempa 08 Jul '16

08 Jul '16

Cleanups and improvements that will make adding the new vCPU hotplug that was recently added to qemu easier. Peter Krempa (11): conf: Annotate that private data for objects are not copied conf: Extract code formatting vCPU info conf: Rename virDomainVcpuInfoPtr to virDomainVcpuDefPtr conf: Don't report errors from virDomainDefGetVcpu tests: qemuxml2xml: Format status XML header dynamically conf: convert def->vcpus to a array of pointers conf: Add private data for virDomainVcpuDef qemu: domain: Add vcpu private data structure qemu: domain: Extract formating and parsing of vCPU thread ids qemu: Add cpu ID to the vCPU pid list in the status XML qemu: Store vCPU thread ids in vcpu private data objects src/conf/domain_conf.c | 127 +++++++++++++++++--------- src/conf/domain_conf.h | 32 ++++--- src/hyperv/hyperv_driver.c | 3 +- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 6 +- src/lxc/lxc_native.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 16 ++-- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_domain.c | 206 +++++++++++++++++++++++++++++++----------- src/qemu/qemu_domain.h | 18 +++- src/qemu/qemu_driver.c | 22 ++--- src/qemu/qemu_parse_command.c | 9 +- src/qemu/qemu_process.c | 6 +- src/test/test_driver.c | 8 +- src/vbox/vbox_common.c | 4 +- src/vmx/vmx.c | 2 +- src/vz/vz_sdk.c | 2 +- src/xen/xm_internal.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- src/xenconfig/xen_common.c | 13 ++- src/xenconfig/xen_common.h | 3 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 3 +- src/xenconfig/xen_xm.c | 3 +- tests/qemuxml2xmltest.c | 73 ++++++++++++--- 27 files changed, 396 insertions(+), 176 deletions(-) -- 2.9.0

2 14

[libvirt] [PATCH] qemu: report vcpu state in virDomainGetVcpus
by Boris Fiuczynski 08 Jul '16

08 Jul '16

From: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Currently, the virVcpuInfo returned by virDomainGetVcpus() will always report a state of VIR_VCPU_RUNNING for each defined domain vcpu even if the vcpu is currently in the halted state. As the monitor interface is in fact reporting the accurate state, it is rather easy to transport this information with the existing API. This is done by - adding a new state of VIR_VCPU_HALTED - extending the monitor to pass back the halted state for the vcpus - adding a new array to the private domain object reflecting the halted state for the vcpus and update it along with the vcpu pids array - modifying the driver code to report the vcpu state based on the halted indicator - extending virsh vcpuinfo to also display the halted state - modifying the monitor_json testcase The vcpu state is however not recorded in the internal XML format, since the state can change asynchronously (without notification). Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> --- include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_domain.c | 26 +++++++++++++++++++++++++- src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_driver.c | 14 +++++++++++++- src/qemu/qemu_monitor.c | 7 ++++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 22 +++++++++++++++++++--- src/qemu/qemu_monitor_json.h | 3 ++- src/qemu/qemu_monitor_text.c | 17 +++++++++++++++-- src/qemu/qemu_monitor_text.h | 3 ++- src/qemu/qemu_process.c | 1 + tests/qemumonitorjsontest.c | 18 +++++++++++++++--- tools/virsh-domain.c | 3 ++- 13 files changed, 103 insertions(+), 17 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 7ea93aa..98b9420 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1656,6 +1656,7 @@ typedef enum { VIR_VCPU_OFFLINE = 0, /* the virtual CPU is offline */ VIR_VCPU_RUNNING = 1, /* the virtual CPU is running */ VIR_VCPU_BLOCKED = 2, /* the virtual CPU is blocked on resource */ + VIR_VCPU_HALTED = 3, /* the virtual CPU is halted */ # ifdef VIR_ENUM_SENTINELS VIR_VCPU_LAST diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 42b5511..3428605 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1256,6 +1256,7 @@ qemuDomainObjPrivateFree(void *data) virDomainChrSourceDefFree(priv->monConfig); qemuDomainObjFreeJob(priv); VIR_FREE(priv->vcpupids); + VIR_FREE(priv->vcpuhalted); VIR_FREE(priv->lockState); VIR_FREE(priv->origname); @@ -5470,6 +5471,7 @@ qemuDomainDetectVcpuPids(virQEMUDriverPtr driver, int asyncJob) { pid_t *cpupids = NULL; + bool *cpuhalted = NULL; int ncpupids = 0; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -5506,7 +5508,7 @@ qemuDomainDetectVcpuPids(virQEMUDriverPtr driver, if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) return -1; - ncpupids = qemuMonitorGetCPUInfo(priv->mon, &cpupids); + ncpupids = qemuMonitorGetCPUInfo(priv->mon, &cpupids, &cpuhalted); if (qemuDomainObjExitMonitor(driver, vm) < 0) { VIR_FREE(cpupids); return -2; @@ -5526,16 +5528,38 @@ qemuDomainDetectVcpuPids(virQEMUDriverPtr driver, "got %d, wanted %d"), ncpupids, virDomainDefGetVcpus(vm->def)); VIR_FREE(cpupids); + VIR_FREE(cpuhalted); return -1; } done: VIR_FREE(priv->vcpupids); + VIR_FREE(priv->vcpuhalted); priv->nvcpupids = ncpupids; priv->vcpupids = cpupids; + priv->vcpuhalted = cpuhalted; return ncpupids; } +/** + * qemuDomainGetVcpuHalted: + * @vm: domain object + * @vcpu: cpu id + * + * Returns the vCPU halted state. + */ +bool +qemuDomainGetVcpuHalted(virDomainObjPtr vm, + unsigned int vcpu) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + + if (vcpu >= priv->nvcpupids) + return 0; + + return priv->vcpuhalted[vcpu]; +} + bool qemuDomainSupportsNicdev(virDomainDefPtr def, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index c49f31c..8f7d421 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -186,6 +186,7 @@ struct _qemuDomainObjPrivate { int nvcpupids; int *vcpupids; + bool *vcpuhalted; virDomainPCIAddressSetPtr pciaddrs; virDomainCCWAddressSetPtr ccwaddrs; @@ -639,6 +640,7 @@ bool qemuDomainHasVcpuPids(virDomainObjPtr vm); pid_t qemuDomainGetVcpuPid(virDomainObjPtr vm, unsigned int vcpu); int qemuDomainDetectVcpuPids(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob); +bool qemuDomainGetVcpuHalted(virDomainObjPtr vm, unsigned int vcpu); bool qemuDomainSupportsNicdev(virDomainDefPtr def, virDomainNetDefPtr net); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f9a3b15..f7ea745 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1477,13 +1477,17 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, for (i = 0; i < virDomainDefGetVcpusMax(vm->def) && ncpuinfo < maxinfo; i++) { virDomainVcpuInfoPtr vcpu = virDomainDefGetVcpu(vm->def, i); pid_t vcpupid = qemuDomainGetVcpuPid(vm, i); + bool vcpuhalted = qemuDomainGetVcpuHalted(vm, i); if (!vcpu->online) continue; if (info) { info[i].number = i; - info[i].state = VIR_VCPU_RUNNING; + if (vcpuhalted) + info[i].state = VIR_VCPU_HALTED; + else + info[i].state = VIR_VCPU_RUNNING; if (qemuGetProcessInfo(&(info[i].cpuTime), &(info[i].cpu), NULL, vm->pid, vcpupid) < 0) { @@ -5272,6 +5276,7 @@ qemuDomainGetVcpus(virDomainPtr dom, unsigned char *cpumaps, int maplen) { + virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; @@ -5288,6 +5293,13 @@ qemuDomainGetVcpus(virDomainPtr dom, goto cleanup; } + if (qemuDomainDetectVcpuPids(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", + _("could not detect vcpu pids")); + return -1; + } + ret = qemuDomainHelperGetVcpus(vm, info, NULL, maxinfo, cpumaps, maplen); cleanup: diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 098e654..0272fb4 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1656,14 +1656,15 @@ qemuMonitorSystemReset(qemuMonitorPtr mon) */ int qemuMonitorGetCPUInfo(qemuMonitorPtr mon, - int **pids) + int **pids, + bool **haltpids) { QEMU_CHECK_MONITOR(mon); if (mon->json) - return qemuMonitorJSONGetCPUInfo(mon, pids); + return qemuMonitorJSONGetCPUInfo(mon, pids, haltpids); else - return qemuMonitorTextGetCPUInfo(mon, pids); + return qemuMonitorTextGetCPUInfo(mon, pids, haltpids); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index cb4cca8..9f6ef72 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -391,7 +391,8 @@ int qemuMonitorSystemReset(qemuMonitorPtr mon); int qemuMonitorSystemPowerdown(qemuMonitorPtr mon); int qemuMonitorGetCPUInfo(qemuMonitorPtr mon, - int **pids); + int **pids, + bool **haltpids); int qemuMonitorGetVirtType(qemuMonitorPtr mon, virDomainVirtType *virtType); int qemuMonitorGetBalloonInfo(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index bb426dc..87343c0 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1324,13 +1324,15 @@ int qemuMonitorJSONSystemReset(qemuMonitorPtr mon) */ static int qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, - int **pids) + int **pids, + bool **haltpids) { virJSONValuePtr data; int ret = -1; size_t i; int *threads = NULL; ssize_t ncpus; + bool *haltedpids = NULL; if (!(data = virJSONValueObjectGetArray(reply, "return"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1347,9 +1349,13 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, if (VIR_ALLOC_N(threads, ncpus) < 0) goto cleanup; + if (VIR_ALLOC_N(haltedpids, ncpus) < 0) + goto cleanup; + for (i = 0; i < ncpus; i++) { virJSONValuePtr entry = virJSONValueArrayGet(data, i); int thread; + bool halted; if (!entry) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cpu information was missing an array element")); @@ -1363,21 +1369,31 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, goto cleanup; } + if (virJSONValueObjectGetBoolean(entry, "halted", &halted) < 0) { + /* Some older qemu versions may not report the halted state, + * for backword compatibility we assume it's not halted */ + halted = false; + } + threads[i] = thread; + haltedpids[i] = halted; } *pids = threads; + *haltpids = haltedpids; threads = NULL; + haltedpids = NULL; ret = ncpus; cleanup: VIR_FREE(threads); + VIR_FREE(haltedpids); return ret; } int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon, - int **pids) + int **pids, bool **haltpids) { int ret = -1; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-cpus", @@ -1395,7 +1411,7 @@ int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - ret = qemuMonitorJSONExtractCPUInfo(reply, pids); + ret = qemuMonitorJSONExtractCPUInfo(reply, pids, haltpids); cleanup: virJSONValueFree(cmd); virJSONValueFree(reply); diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 37a739e..c7808aa 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -59,7 +59,8 @@ int qemuMonitorJSONSystemPowerdown(qemuMonitorPtr mon); int qemuMonitorJSONSystemReset(qemuMonitorPtr mon); int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon, - int **pids); + int **pids, + bool **haltpids); int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon, virDomainVirtType *virtType); int qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 9295219..fbacdbd 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -501,12 +501,15 @@ int qemuMonitorTextSystemReset(qemuMonitorPtr mon) int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, - int **pids) + int **pids, + bool **haltpids) { char *qemucpus = NULL; char *line; pid_t *cpupids = NULL; size_t ncpupids = 0; + bool *cpuhalted = NULL; + size_t ncpuhalted = 0; if (qemuMonitorHMPCommand(mon, "info cpus", &qemucpus) < 0) return -1; @@ -517,7 +520,7 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, * (qemu) info cpus * * CPU #0: pc=0x00000000000f0c4a thread_id=30019 * CPU #1: pc=0x00000000fffffff0 thread_id=30020 - * CPU #2: pc=0x00000000fffffff0 thread_id=30021 + * CPU #2: pc=0x00000000fffffff0 (halted) thread_id=30021 * */ line = qemucpus; @@ -525,6 +528,7 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, char *offset = NULL; char *end = NULL; int tid = 0; + bool halted = false; /* Extract host Thread ID */ if ((offset = strstr(line, "thread_id=")) == NULL) @@ -538,6 +542,13 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, if (VIR_APPEND_ELEMENT_COPY(cpupids, ncpupids, tid) < 0) goto error; + /* Extract halted indicator */ + if ((offset = strstr(line, "(halted)")) != NULL) + halted = true; + + if (VIR_APPEND_ELEMENT_COPY(cpuhalted, ncpuhalted, halted) < 0) + goto error; + VIR_DEBUG("tid=%d", tid); /* Skip to next data line */ @@ -549,11 +560,13 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, /* Validate we got data for all VCPUs we expected */ VIR_FREE(qemucpus); *pids = cpupids; + *haltpids = cpuhalted; return ncpupids; error: VIR_FREE(qemucpus); VIR_FREE(cpupids); + VIR_FREE(cpuhalted); /* Returning 0 to indicate non-fatal failure, since * older QEMU does not have VCPU<->PID mapping and diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index eeaca52..e7009b3 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -50,7 +50,8 @@ int qemuMonitorTextSystemPowerdown(qemuMonitorPtr mon); int qemuMonitorTextSystemReset(qemuMonitorPtr mon); int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, - int **pids); + int **pids, + bool **haltpids); int qemuMonitorTextGetVirtType(qemuMonitorPtr mon, virDomainVirtType *virtType); int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 129c070..403b332 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5900,6 +5900,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, vm->pid = -1; virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason); VIR_FREE(priv->vcpupids); + VIR_FREE(priv->vcpuhalted); priv->nvcpupids = 0; for (i = 0; i < vm->def->niothreadids; i++) vm->def->iothreadids[i]->thread_id = 0; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index f698c14..441720e 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1210,6 +1210,8 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUInfo(const void *data) int ret = -1; pid_t *cpupids = NULL; pid_t expected_cpupids[] = {17622, 17624, 17626, 17628}; + bool *cpuhalted = NULL; + bool expected_cpuhalted[] = {true, true, false, false}; int ncpupids; size_t i; @@ -1237,14 +1239,14 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUInfo(const void *data) " \"current\": false," " \"CPU\": 2," " \"pc\": -2130530478," - " \"halted\": true," + " \"halted\": false," " \"thread_id\": 17626" " }," " {" " \"current\": false," " \"CPU\": 3," " \"pc\": -2130530478," - " \"halted\": true," + " \"halted\": false," " \"thread_id\": 17628" " }" " ]," @@ -1252,7 +1254,7 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUInfo(const void *data) "}") < 0) goto cleanup; - ncpupids = qemuMonitorJSONGetCPUInfo(qemuMonitorTestGetMonitor(test), &cpupids); + ncpupids = qemuMonitorJSONGetCPUInfo(qemuMonitorTestGetMonitor(test), &cpupids, &cpuhalted); if (ncpupids != 4) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1269,10 +1271,20 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUInfo(const void *data) } } + for (i = 0; i < ncpupids; i++) { + if (cpuhalted[i] != expected_cpuhalted[i]) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Expecting cpuhalted[%zu] = %d but got %d", + i, expected_cpuhalted[i], cpuhalted[i]); + goto cleanup; + } + } + ret = 0; cleanup: VIR_FREE(cpupids); + VIR_FREE(cpuhalted); qemuMonitorTestFree(test); return ret; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index dbdee5b..4650eb3 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -181,7 +181,8 @@ VIR_ENUM_IMPL(virshDomainVcpuState, VIR_VCPU_LAST, N_("offline"), N_("running"), - N_("blocked")) + N_("blocked"), + N_("halted")) static const char * virshDomainVcpuStateToString(int state) -- 2.9.0

3 4

[libvirt] [PATCH 0/3] Clean up some duplicated code in qemuProcessSetup* functions
by Martin Kletzander 08 Jul '16

08 Jul '16

Initially posted in order to achieve something else, but that got rejected, so at least the cleanup part of it could make it in. The previous versions (whose goal was something completely idfferent) are here: - https://www.redhat.com/archives/libvir-list/2016-June/msg01537.html - https://www.redhat.com/archives/libvir-list/2016-July/msg00173.html Martin Kletzander (3): qemu: Add qemuProcessSetupPid() and use it in qemuProcessSetupIOThread() qemu: Use qemuProcessSetupPid() in qemuProcessSetupEmulator() qemu: Use qemuProcessSetupPid() in qemuProcessSetupVcpu() src/qemu/qemu_process.c | 283 ++++++++++++++++-------------------------------- 1 file changed, 92 insertions(+), 191 deletions(-) -- 2.9.0

2 4

[libvirt] [PATCH 0/2] qemu: use -display none instead of -nographic
by Paolo Bonzini 08 Jul '16

08 Jul '16

-display none is preferrable to -nographic which (in addition to disabling graphics output) redirects the serial port to stdio and on OpenBIOS enables the firmware's serial console. Paolo Bonzini (2): qemu: detect -display qemu: generate -display none src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 7 ++++- src/qemu/qemu_parse_command.c | 4 +++ .../qemuargv2xml-nographics-vga-display.args | 23 +++++++++++++++ .../qemuargv2xml-nographics-vga-display.xml | 34 ++++++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemuhelptest.c | 6 ++-- .../qemuxml2argv-nographics-display.args | 22 ++++++++++++++ .../qemuxml2argv-nographics-display.xml | 25 ++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ tests/qemuxml2xmltest.c | 2 +- 25 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-nographics-display.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-nographics-display.xml -- 2.7.4

3 8

[libvirt] [libvirt-php][PATCH 00/14] Couple of fixes
by Michal Privoznik 08 Jul '16

08 Jul '16

This is for examples/ reformat mostly. But there are some other fixes too. BTW: This is pushed, so if you have any objections - patches are welcome :) Michal Privoznik (14): gitignore: Ignore tags file configure: Provide default for php-confdir libvirt-php.spec.in: Honour php-{extensiondir,confdir} examples: Reformat libvirt.php examples: Fix 'if-else' formatting in libvirt.php examples: Fix curly braces indent in libvirt.php examples: Reformat header.php examples: Reformat index.php examples: Properly detect if we're connected examples: Don't report errors when looking up a domain examples: Show screenshot only for active domains examples: Better translate volume perms examples: Don't fetch volume count for inactive pools examples: Switch to ImageMagick for scaling pictures .gitignore | 1 + configure.ac | 2 + examples/header.php | 2 +- examples/index.php | 1335 +++++++++++++------------- examples/libvirt.php | 2317 +++++++++++++++++++++++----------------------- libvirt-php.spec.in | 7 +- m4/virt-php-confdir.m4 | 4 + m4/virt-php-extension.m4 | 35 + 8 files changed, 1865 insertions(+), 1838 deletions(-) create mode 100644 m4/virt-php-extension.m4 -- 2.8.4

1 14

[libvirt] [PATCH 0/2] qemu: Fix SPICE migration with incorrect URI
by Jiri Denemark 08 Jul '16

08 Jul '16

https://bugzilla.redhat.com/show_bug.cgi?id=1151723 Jiri Denemark (2): qemu: Properly reset spiceMigration flag qemu: Drop useless SPICE migration code src/qemu/qemu_domain.c | 1 + src/qemu/qemu_migration.c | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) -- 2.9.0

2 5

[libvirt] gconfig: Add hostdev support v4
by Zeeshan Ali (Khattak) 08 Jul '16

08 Jul '16

Finally I got the time to clean-up and fix the patches. It's been a while last i looked into them already and I got a bit confused at some point so I appologize if I didn't address some of the review comments.

2 21

[libvirt] [PATCH 2/3] Move domain and device xmls to different directories
by Tomasz Flendrich 07 Jul '16

07 Jul '16

--- tests/qemuhotplugtest.c | 6 +++--- .../qemuhotplug-console-virtio.xml | 0 .../qemuhotplug-disk-cdrom-nochange.xml | 0 .../qemuhotplug-disk-scsi-2.xml | 0 .../qemuhotplug-disk-scsi.xml | 0 .../qemuhotplug-disk-usb.xml | 0 .../qemuhotplug-disk-virtio.xml | 0 .../qemuhotplug-graphics-spice-listen-network-password.xml | 0 .../qemuhotplug-graphics-spice-listen.xml | 0 .../qemuhotplug-graphics-spice-nochange.xml | 0 .../qemuhotplug-graphics-spice-timeout-nochange.xml | 0 .../qemuhotplug-graphics-spice-timeout-password.xml | 0 .../qemuhotplug-qemu-agent-detach.xml | 0 .../qemuhotplug-qemu-agent.xml | 0 .../qemuhotplug-base+qemu-agent-detach.xml | 0 .../qemuhotplug-base+qemu-agent.xml | 0 .../qemuhotplug-base-live+disk-scsi.xml | 0 .../qemuhotplug-base-live+disk-usb.xml | 0 .../qemuhotplug-base-live+disk-virtio.xml | 0 .../qemuhotplug-base-live+qemu-agent-detach.xml | 0 .../qemuhotplug-base-live+qemu-agent.xml | 0 .../qemuhotplug-base-live.xml | 0 .../qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml | 0 .../qemuhotplug-base-with-scsi-controller-live.xml | 0 .../qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml | 0 .../qemuhotplug-base-without-scsi-controller-live.xml | 0 .../qemuhotplug-console-compat-2-live+console-virtio.xml | 0 .../qemuhotplug-console-compat-2-live.xml | 0 .../qemuhotplug-disk-cdrom.xml | 0 .../qemuhotplug-graphics-spice-listen-network.xml | 0 .../qemuhotplug-graphics-spice-timeout.xml | 0 .../qemuhotplug-graphics-spice.xml | 0 32 files changed, 3 insertions(+), 3 deletions(-) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-console-virtio.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-cdrom-nochange.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-scsi-2.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-scsi.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-usb.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-disk-virtio.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-listen-network-password.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-listen.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-nochange.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-timeout-nochange.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-graphics-spice-timeout-password.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-qemu-agent-detach.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdevices}/qemuhotplug-qemu-agent.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base+qemu-agent-detach.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base+qemu-agent.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live+disk-scsi.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live+disk-usb.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live+disk-virtio.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live+qemu-agent-detach.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live+qemu-agent.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-live.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-with-scsi-controller-live.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-base-without-scsi-controller-live.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-console-compat-2-live+console-virtio.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-console-compat-2-live.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-disk-cdrom.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-graphics-spice-listen-network.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-graphics-spice-timeout.xml (100%) rename tests/{qemuhotplugtestdata => qemuhotplugtestdomains}/qemuhotplug-graphics-spice.xml (100%) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 369d27e..f2e7567 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -225,12 +225,12 @@ testQemuHotplug(const void *data) qemuMonitorTestPtr test_mon = NULL; qemuDomainObjPrivatePtr priv = NULL; - if (virAsprintf(&domain_filename, "%s/qemuhotplugtestdata/qemuhotplug-%s.xml", + if (virAsprintf(&domain_filename, "%s/qemuhotplugtestdomains/qemuhotplug-%s.xml", abs_srcdir, test->domain_filename) < 0 || - virAsprintf(&device_filename, "%s/qemuhotplugtestdata/qemuhotplug-%s.xml", + virAsprintf(&device_filename, "%s/qemuhotplugtestdevices/qemuhotplug-%s.xml", abs_srcdir, test->device_filename) < 0 || virAsprintf(&result_filename, - "%s/qemuhotplugtestdata/qemuhotplug-%s+%s.xml", + "%s/qemuhotplugtestdomains/qemuhotplug-%s+%s.xml", abs_srcdir, test->domain_filename, test->device_filename) < 0) goto cleanup; diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-virtio.xml b/tests/qemuhotplugtestdevices/qemuhotplug-console-virtio.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-console-virtio.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-console-virtio.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom-nochange.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-cdrom-nochange.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom-nochange.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-disk-cdrom-nochange.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-scsi-2.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-disk-scsi-2.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-2.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-scsi.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-disk-scsi.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-usb.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-usb.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-disk-usb.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-disk-usb.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-virtio.xml b/tests/qemuhotplugtestdevices/qemuhotplug-disk-virtio.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-disk-virtio.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-disk-virtio.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml b/tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-listen-network-password.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-listen-network-password.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen.xml b/tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-listen.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-listen.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-nochange.xml b/tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-nochange.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-nochange.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-nochange.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-nochange.xml b/tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-timeout-nochange.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-nochange.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-timeout-nochange.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-password.xml b/tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-timeout-password.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout-password.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-graphics-spice-timeout-password.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-qemu-agent-detach.xml b/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-qemu-agent-detach.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-qemu-agent.xml b/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-qemu-agent.xml rename to tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent-detach.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent-detach.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-scsi.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-scsi.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-usb.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-usb.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-virtio.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent-detach.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent-detach.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-live.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live+console-virtio.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml b/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-graphics-spice.xml rename to tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml -- 2.7.4 (Apple Git-66)

1 1

[libvirt] [PATCH 1/3] Move all qemuhotplugtest XMLs to one directory
by Tomasz Flendrich 07 Jul '16

07 Jul '16

--- tests/qemuhotplugtest.c | 48 ++++++------ ....xml => qemuhotplug-base+qemu-agent-detach.xml} | 0 ...u-agent.xml => qemuhotplug-base+qemu-agent.xml} | 0 ...csi.xml => qemuhotplug-base-live+disk-scsi.xml} | 0 ...-usb.xml => qemuhotplug-base-live+disk-usb.xml} | 0 ...o.xml => qemuhotplug-base-live+disk-virtio.xml} | 0 ...=> qemuhotplug-base-live+qemu-agent-detach.xml} | 0 ...nt.xml => qemuhotplug-base-live+qemu-agent.xml} | 0 .../qemuhotplug-base-live.xml} | 0 ...base-with-scsi-controller-live+disk-scsi-2.xml} | 0 ...qemuhotplug-base-with-scsi-controller-live.xml} | 0 ...e-without-scsi-controller-live+disk-scsi-2.xml} | 0 ...uhotplug-base-without-scsi-controller-live.xml} | 0 .../qemuhotplug-console-compat-2-live.xml} | 0 .../qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml | 37 +++++++++ ...plug-graphics-spice-listen-network-password.xml | 11 +++ .../qemuhotplug-graphics-spice-listen-network.xml | 36 ++++++++- .../qemuhotplug-graphics-spice-timeout.xml | 87 ++++++++++++++++++++++ .../qemuhotplug-graphics-spice.xml} | 26 ++++--- 19 files changed, 208 insertions(+), 37 deletions(-) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-live+qemu-agent-detach.xml => qemuhotplug-base+qemu-agent-detach.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-live+qemu-agent.xml => qemuhotplug-base+qemu-agent.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-live+disk-scsi.xml => qemuhotplug-base-live+disk-scsi.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-live+disk-usb.xml => qemuhotplug-base-live+disk-usb.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-live+disk-virtio.xml => qemuhotplug-base-live+disk-virtio.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base+qemu-agent-detach.xml => qemuhotplug-base-live+qemu-agent-detach.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base+qemu-agent.xml => qemuhotplug-base-live+qemu-agent.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-hotplug-base-live.xml => qemuhotplugtestdata/qemuhotplug-base-live.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-with-scsi-controller-live+disk-scsi-2.xml => qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-hotplug-base-with-scsi-controller-live.xml => qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live.xml} (100%) rename tests/qemuhotplugtestdata/{qemuhotplug-hotplug-base-without-scsi-controller-live+disk-scsi-2.xml => qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-hotplug-base-without-scsi-controller-live.xml => qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live.xml} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml => qemuhotplugtestdata/qemuhotplug-console-compat-2-live.xml} (100%) create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml rename tests/{qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml => qemuhotplugtestdata/qemuhotplug-graphics-spice.xml} (57%) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index ae57c0a..369d27e 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -225,7 +225,7 @@ testQemuHotplug(const void *data) qemuMonitorTestPtr test_mon = NULL; qemuDomainObjPrivatePtr priv = NULL; - if (virAsprintf(&domain_filename, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml", + if (virAsprintf(&domain_filename, "%s/qemuhotplugtestdata/qemuhotplug-%s.xml", abs_srcdir, test->domain_filename) < 0 || virAsprintf(&device_filename, "%s/qemuhotplugtestdata/qemuhotplug-%s.xml", abs_srcdir, test->device_filename) < 0 || @@ -423,7 +423,7 @@ mymain(void) DO_TEST_UPDATE("graphics-spice-timeout", "graphics-spice-timeout-password", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); DO_TEST_UPDATE("graphics-spice", "graphics-spice-listen", true, false, NULL); - DO_TEST_UPDATE("graphics-spice-listen-network", "graphics-spice-listen-network", false, false, + DO_TEST_UPDATE("graphics-spice-listen-network", "graphics-spice-listen-network-password", false, false, "set_password", QMP_OK, "expire_password", QMP_OK); /* Strange huh? Currently, only graphics can be updated :-P */ DO_TEST_UPDATE("disk-cdrom", "disk-cdrom-nochange", true, false, NULL); @@ -436,58 +436,58 @@ mymain(void) "device_del", QMP_OK, "chardev-remove", QMP_OK); - DO_TEST_ATTACH("hotplug-base-live", "disk-virtio", false, true, + DO_TEST_ATTACH("base-live", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-virtio", false, false, + DO_TEST_DETACH("base-live", "disk-virtio", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("hotplug-base-live", "disk-virtio", false, true, + DO_TEST_ATTACH_EVENT("base-live", "disk-virtio", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-virtio", true, true, + DO_TEST_DETACH("base-live", "disk-virtio", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_DETACH("hotplug-base-live", "disk-virtio", false, false, + DO_TEST_DETACH("base-live", "disk-virtio", false, false, "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("hotplug-base-live", "disk-usb", false, true, + DO_TEST_ATTACH("base-live", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-usb", false, false, + DO_TEST_DETACH("base-live", "disk-usb", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("hotplug-base-live", "disk-usb", false, true, + DO_TEST_ATTACH_EVENT("base-live", "disk-usb", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-usb", true, true, + DO_TEST_DETACH("base-live", "disk-usb", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_DETACH("hotplug-base-live", "disk-usb", false, false, + DO_TEST_DETACH("base-live", "disk-usb", false, false, "device_del", QMP_DEVICE_DELETED("usb-disk16") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("hotplug-base-live", "disk-scsi", false, true, + DO_TEST_ATTACH("base-live", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-scsi", false, false, + DO_TEST_DETACH("base-live", "disk-scsi", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("hotplug-base-live", "disk-scsi", false, true, + DO_TEST_ATTACH_EVENT("base-live", "disk-scsi", false, true, "human-monitor-command", HMP("OK\\r\\n"), "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "disk-scsi", true, true, + DO_TEST_DETACH("base-live", "disk-scsi", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_DETACH("hotplug-base-live", "disk-scsi", false, false, + DO_TEST_DETACH("base-live", "disk-scsi", false, false, "device_del", QMP_DEVICE_DELETED("scsi0-0-0-5") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("hotplug-base-without-scsi-controller-live", "disk-scsi-2", false, true, + DO_TEST_ATTACH("base-without-scsi-controller-live", "disk-scsi-2", false, true, /* Four controllers added */ "device_add", QMP_OK, "device_add", QMP_OK, @@ -496,11 +496,11 @@ mymain(void) "human-monitor-command", HMP("OK\\r\\n"), /* Disk added */ "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-with-scsi-controller-live", "disk-scsi-2", false, false, + DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false, false, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH_EVENT("hotplug-base-without-scsi-controller-live", "disk-scsi-2", false, true, + DO_TEST_ATTACH_EVENT("base-without-scsi-controller-live", "disk-scsi-2", false, true, /* Four controllers added */ "device_add", QMP_OK, "device_add", QMP_OK, @@ -509,17 +509,17 @@ mymain(void) "human-monitor-command", HMP("OK\\r\\n"), /* Disk added */ "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-with-scsi-controller-live", "disk-scsi-2", true, true, + DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", true, true, "device_del", QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_DETACH("hotplug-base-with-scsi-controller-live", "disk-scsi-2", false, false, + DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false, false, "device_del", QMP_DEVICE_DELETED("scsi3-0-5-7") QMP_OK, "human-monitor-command", HMP("")); - DO_TEST_ATTACH("hotplug-base-live", "qemu-agent", false, true, + DO_TEST_ATTACH("base-live", "qemu-agent", false, true, "chardev-add", QMP_OK, "device_add", QMP_OK); - DO_TEST_DETACH("hotplug-base-live", "qemu-agent-detach", false, false, + DO_TEST_DETACH("base-live", "qemu-agent-detach", false, false, "device_del", QMP_OK, "chardev-remove", QMP_OK); diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+qemu-agent-detach.xml b/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent-detach.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+qemu-agent-detach.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent-detach.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+qemu-agent.xml b/tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+qemu-agent.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base+qemu-agent.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-scsi.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-scsi.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-scsi.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-scsi.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-usb.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-usb.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-usb.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-usb.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-virtio.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-virtio.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-live+disk-virtio.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live+disk-virtio.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent-detach.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent-detach.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent-detach.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent-detach.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live+qemu-agent.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-live.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-live.xml similarity index 100% rename from tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-live.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-live.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-with-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-with-scsi-controller-live+disk-scsi-2.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-with-scsi-controller-live.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live.xml similarity index 100% rename from tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-with-scsi-controller-live.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-with-scsi-controller-live.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-without-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml similarity index 100% rename from tests/qemuhotplugtestdata/qemuhotplug-hotplug-base-without-scsi-controller-live+disk-scsi-2.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-without-scsi-controller-live.xml b/tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live.xml similarity index 100% rename from tests/qemuxml2argvdata/qemuxml2argv-hotplug-base-without-scsi-controller-live.xml rename to tests/qemuhotplugtestdata/qemuhotplug-base-without-scsi-controller-live.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live.xml similarity index 100% rename from tests/qemuxml2argvdata/qemuxml2argv-console-compat-2-live.xml rename to tests/qemuhotplugtestdata/qemuhotplug-console-compat-2-live.xml diff --git a/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml b/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml new file mode 100644 index 0000000..04f4976 --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-disk-cdrom.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml new file mode 100644 index 0000000..426a14d --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network-password.xml @@ -0,0 +1,11 @@ + <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password2' passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901' type='spice'> + <listen address='10.65.210.231' network='vdsm-rhevm' type='network'/> + <channel mode='secure' name='main'/> + <channel mode='secure' name='display'/> + <channel mode='secure' name='inputs'/> + <channel mode='secure' name='cursor'/> + <channel mode='secure' name='playback'/> + <channel mode='secure' name='record'/> + <channel mode='secure' name='smartcard'/> + <channel mode='secure' name='usbredir'/> + </graphics> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml index 426a14d..34971fe 100644 --- a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-listen-network.xml @@ -1,4 +1,29 @@ - <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password2' passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901' type='spice'> +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password' passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901' type='spice'> <listen address='10.65.210.231' network='vdsm-rhevm' type='network'/> <channel mode='secure' name='main'/> <channel mode='secure' name='display'/> @@ -9,3 +34,12 @@ <channel mode='secure' name='smartcard'/> <channel mode='secure' name='usbredir'/> </graphics> + <video> + <model type='qxl' ram='65536' vram='18432' heads='1'/> + </video> + <video> + <model type='qxl' ram='65536' vram='32768' heads='1'/> + </video> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml new file mode 100644 index 0000000..bfb189c --- /dev/null +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice-timeout.xml @@ -0,0 +1,87 @@ +<domain type='kvm'> + <name>f14</name> + <uuid>553effab-b5e1-2d80-dfe3-da4344826c43</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <cpu match='exact'> + <model>core2duo</model> + <vendor>Intel</vendor> + <topology sockets='1' cores='2' threads='1'/> + <feature policy='require' name='lahf_lm'/> + <feature policy='require' name='xtpr'/> + <feature policy='require' name='cx16'/> + <feature policy='require' name='tm2'/> + <feature policy='require' name='est'/> + <feature policy='require' name='vmx'/> + <feature policy='require' name='ds_cpl'/> + <feature policy='require' name='pbe'/> + <feature policy='require' name='tm'/> + <feature policy='require' name='ht'/> + <feature policy='require' name='ss'/> + <feature policy='require' name='acpi'/> + <feature policy='require' name='ds'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/f14.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </controller> + <interface type='ethernet'> + <mac address='52:54:00:71:70:89'/> + <script path='/etc/qemu-ifup'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </interface> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <input type='tablet' bus='usb'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' port='5900' autoport='no' passwd='sercet' passwdValidTo='2011-05-31T16:11:22' connected='disconnect'/> + <sound model='ac97'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </sound> + <video> + <model type='vga' vram='16384' heads='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice.xml similarity index 57% rename from tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml rename to tests/qemuhotplugtestdata/qemuhotplug-graphics-spice.xml index 34971fe..0c61ee5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml +++ b/tests/qemuhotplugtestdata/qemuhotplug-graphics-spice.xml @@ -23,22 +23,24 @@ <controller type='ide' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> - <graphics autoport='yes' connected='disconnect' keymap='en-us' passwd='password' passwdValidTo='2013-06-20T01:34:37' port='5900' tlsPort='5901' type='spice'> - <listen address='10.65.210.231' network='vdsm-rhevm' type='network'/> - <channel mode='secure' name='main'/> - <channel mode='secure' name='display'/> - <channel mode='secure' name='inputs'/> - <channel mode='secure' name='cursor'/> - <channel mode='secure' name='playback'/> - <channel mode='secure' name='record'/> - <channel mode='secure' name='smartcard'/> - <channel mode='secure' name='usbredir'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1' defaultMode='secure'> + <listen type='address' address='127.0.0.1'/> + <channel name='main' mode='secure'/> + <channel name='inputs' mode='insecure'/> + <image compression='auto_glz'/> + <jpeg compression='auto'/> + <zlib compression='auto'/> + <playback compression='on'/> + <streaming mode='filter'/> + <clipboard copypaste='no'/> + <filetransfer enable='no'/> </graphics> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/> </video> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> -- 2.7.4 (Apple Git-66)

1 0

[libvirt] [libvirt-php PATCH 0/3] Fix PHP5 compatibilty issues.
by Dawid Zamirski 07 Jul '16

07 Jul '16

With the patches that landed support for PHP7 some API calls were not behaving correctly when compiled against PHP5. The most obvious case is where connection to e.g. esx host, libvirt_connect wasn't properly reading out credentials from Zeng HashTable which resulted in failure to authenticate. This issue was caused mainly be the differnce in Zend's implementaion of zend_hash_get_current_data_ex which in PHP7 takes a pointer to zval whereas in PHP5 it takes pointer to pointer to zval. To address this, the first commit adds macros that abstract away such implementation details and the remaining commits make use of that. Dawid Zamirski (3): Define macros for looping php hash tables. libvirt_connect: use loop macros to read cred info. use VIRT_FOREACH macros everywhere. src/libvirt-php.c | 205 +++++++++++++++++------------------------------------- src/libvirt-php.h | 6 ++ 2 files changed, 69 insertions(+), 142 deletions(-) -- 2.7.4

2 5

[libvirt] [PATCH v2 0/5] Warn users with weird thread/memory alignment
by Martin Kletzander 07 Jul '16

07 Jul '16

v2: - Split into more patches for easier review. I tried splitting it even more and found out this is just enough not to increase complexity. - Also worked in some review comments from Jan and John v1: - https://www.redhat.com/archives/libvir-list/2016-June/msg01537.html Martin Kletzander (5): qemu: Add qemuProcessSetupPid() and use it in qemuProcessSetupIOThread() qemu: Use qemuProcessSetupPid() in qemuProcessSetupEmulator() qemu: Use qemuProcessSetupPid() in qemuProcessSetupVcpu() qemu: Add driver parameter to qemuProcessSetupPid() and callers qemu: Check for thread <=> memory alignment src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_process.c | 380 +++++++++++++++++++++++------------------------- src/qemu/qemu_process.h | 6 +- 3 files changed, 186 insertions(+), 204 deletions(-) -- 2.9.0

2 9

[libvirt] [PATCH] qemu: caps: Always assume QEMU_CAPS_SMP_TOPOLOGY
by Peter Krempa 07 Jul '16

07 Jul '16

Support for SMP topology was added by qemu commit dc6b1c09849484fbbc50 prior to 0.12.0, our minimum supported qemu version. $ git describe --tags dc6b1c09849484fbbc50803307e4c7a3d81eab62 v0.11.0-rc0-449-gdc6b1c0 $ git describe --tags --contains dc6b1c09849484fbbc50803307e4c7a3d81eab v0.12.0-rc0~1477 --- Note that I've trimmed most of the changes done in tests/qemuxml2argvdata to get under the mailing list size limit. All the changes were generated by running the test suite with VIR_TEST_REGENERATE_OUTPUT=1 and checking that only the -smp line has changed. src/qemu/qemu_capabilities.c | 5 --- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 40 ++++++++-------------- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - .../caps_2.6.0-gicv2.aarch64.xml | 1 - .../caps_2.6.0-gicv3.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemuhelptest.c | 8 ----- .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 2 +- .../qemuxml2argv-aarch64-cpu-passthrough.args | 2 +- .../qemuxml2argv-aarch64-gic-host.args | 2 +- .../qemuxml2argv-aarch64-gic-v2.args | 2 +- .../qemuxml2argv-aarch64-gic-v3.args | 2 +- .../qemuxml2argv-aarch64-kvm-32-on-64.args | 2 +- ...l2argv-aarch64-virt-2.6-virtio-pci-default.args | 2 +- .../qemuxml2argv-aarch64-virt-default-nic.args | 2 +- .../qemuxml2argv-aarch64-virt-virtio.args | 2 +- .../qemuxml2argv-aarch64-virtio-pci-default.args | 2 +- ...l2argv-aarch64-virtio-pci-manual-addresses.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-acpi-table.args | 2 +- .../qemuxml2argv-arm-vexpressa9-basic.args | 2 +- .../qemuxml2argv-arm-vexpressa9-nodevs.args | 2 +- .../qemuxml2argv-arm-vexpressa9-virtio.args | 2 +- .../qemuxml2argv-arm-virt-virtio.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-autoindex.args | 2 +- .../qemuxml2argv-balloon-ccw-deflate.args | 2 +- .../qemuxml2argv-balloon-device-auto.args | 2 +- .../qemuxml2argv-balloon-device-deflate-off.args | 2 +- .../qemuxml2argv-balloon-device-deflate.args | 2 +- .../qemuxml2argv-balloon-device-period.args | 2 +- .../qemuxml2argv-balloon-device.args | 2 +- .../qemuxml2argv-balloon-mmio-deflate.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-blkdeviotune-max.args | 2 +- .../qemuxml2argv-blkdeviotune.args | 2 +- .../qemuxml2argv-blkiotune-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 2 +- .../qemuxml2argv-boot-complex-bootindex.args | 2 +- .../qemuxml2argv-boot-complex.args | 2 +- .../qemuxml2argv-boot-floppy-q35.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 2 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 2 +- .../qemuxml2argv-boot-menu-disable-drive.args | 2 +- .../qemuxml2argv-boot-menu-disable.args | 2 +- .../qemuxml2argv-boot-menu-enable-bootindex.args | 2 +- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 2 +- .../qemuxml2argv-boot-menu-enable.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 2 +- .../qemuxml2argv-boot-network.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 2 +- .../qemuxml2argv-bootindex-floppy-q35.args | 2 +- .../qemuxml2argv-channel-guestfwd.args | 2 +- .../qemuxml2argv-channel-spicevmc-old.args | 2 +- .../qemuxml2argv-channel-spicevmc.args | 2 +- .../qemuxml2argv-channel-virtio-auto.args | 2 +- .../qemuxml2argv-channel-virtio-autoadd.args | 2 +- .../qemuxml2argv-channel-virtio-autoassign.args | 2 +- .../qemuxml2argv-channel-virtio-default.args | 2 +- .../qemuxml2argv-channel-virtio-state.args | 2 +- .../qemuxml2argv-channel-virtio-unix.args | 2 +- .../qemuxml2argv-channel-virtio.args | 2 +- .../qemuxml2argv-clock-catchup.args | 2 +- .../qemuxml2argv-clock-france.args | 2 +- .../qemuxml2argv-clock-hpet-off.args | 2 +- ...muxml2argv-clock-localtime-basis-localtime.args | 2 +- .../qemuxml2argv-clock-localtime.args | 2 +- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 2 +- .../qemuxml2argv-clock-variable.args | 2 +- .../qemuxml2argv-console-compat-auto.args | 2 +- .../qemuxml2argv-console-compat-chardev.args | 2 +- .../qemuxml2argv-console-compat.args | 2 +- .../qemuxml2argv-console-sclp.args | 2 +- .../qemuxml2argv-console-virtio-ccw.args | 2 +- .../qemuxml2argv-console-virtio-many.args | 2 +- .../qemuxml2argv-console-virtio-s390.args | 2 +- .../qemuxml2argv-console-virtio.args | 2 +- .../qemuxml2argv-controller-order.args | 2 +- .../qemuxml2argv-cpu-Haswell-noTSX.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 2 +- .../qemuxml2argv-cpu-Haswell2.args | 2 +- .../qemuxml2argv-cpu-Haswell3.args | 2 +- .../qemuxml2argv-cpu-eoi-disabled.args | 2 +- .../qemuxml2argv-cpu-eoi-enabled.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 2 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 2 +- .../qemuxml2argv-cpu-fallback.args | 2 +- .../qemuxml2argv-cpu-host-kvmclock.args | 2 +- .../qemuxml2argv-cpu-host-model-fallback.args | 2 +- .../qemuxml2argv-cpu-host-model-vendor.args | 2 +- .../qemuxml2argv-cpu-host-model.args | 2 +- ...qemuxml2argv-cpu-host-passthrough-features.args | 2 +- .../qemuxml2argv-cpu-host-passthrough.args | 2 +- .../qemuxml2argv-cpu-kvmclock.args | 2 +- .../qemuxml2argv-cpu-minimum1.args | 2 +- .../qemuxml2argv-cpu-minimum2.args | 2 +- .../qemuxml2argv-cpu-numa-disjoint.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 2 +- .../qemuxml2argv-cpu-topology3.args | 2 +- .../qemuxml2argv-cputune-zero-shares.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 2 +- .../qemuxml2argv-debug-threads.args | 2 +- .../qemuxml2argv-default-kvm-host-arch.args | 2 +- .../qemuxml2argv-default-qemu-host-arch.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 2 +- .../qemuxml2argv-disk-blockio.args | 2 +- .../qemuxml2argv-disk-cdrom-empty.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 2 +- .../qemuxml2argv-disk-cdrom-network-http.args | 2 +- .../qemuxml2argv-disk-cdrom-network-https.args | 2 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 2 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 2 +- .../qemuxml2argv-disk-cdrom-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 2 +- .../qemuxml2argv-disk-copy_on_read.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 2 +- .../qemuxml2argv-disk-drive-boot-disk.args | 2 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 2 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 2 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 2 +- .../qemuxml2argv-disk-drive-copy-on-read.args | 2 +- .../qemuxml2argv-disk-drive-detect-zeroes.args | 2 +- .../qemuxml2argv-disk-drive-discard.args | 2 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 2 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 2 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 2 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 2 +- .../qemuxml2argv-disk-drive-network-gluster.args | 2 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 2 +- .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 2 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 2 +- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 2 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 2 +- .../qemuxml2argv-disk-drive-network-nbd.args | 2 +- ...muxml2argv-disk-drive-network-rbd-auth-AES.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd.args | 2 +- .../qemuxml2argv-disk-drive-network-sheepdog.args | 2 +- .../qemuxml2argv-disk-drive-no-boot.args | 2 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 2 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 2 +- .../qemuxml2argv-disk-drive-shared.args | 2 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 2 +- .../qemuxml2argv-disk-floppy-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 2 +- .../qemuxml2argv-disk-geometry.args | 2 +- .../qemuxml2argv-disk-ide-drive-split.args | 2 +- .../qemuxml2argv-disk-ide-wwn.args | 2 +- .../qemuxml2argv-disk-ioeventfd.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 2 +- .../qemuxml2argv-disk-sata-device.args | 2 +- .../qemuxml2argv-disk-scsi-device-auto.args | 2 +- .../qemuxml2argv-disk-scsi-device.args | 2 +- .../qemuxml2argv-disk-scsi-disk-split.args | 2 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 2 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 2 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 2 +- .../qemuxml2argv-disk-scsi-megasas.args | 2 +- .../qemuxml2argv-disk-scsi-mptsas1068.args | 2 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 2 +- .../qemuxml2argv-disk-scsi-vscsi.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 2 +- .../qemuxml2argv-disk-snapshot.args | 2 +- .../qemuxml2argv-disk-source-pool-mode.args | 2 +- .../qemuxml2argv-disk-source-pool.args | 2 +- .../qemuxml2argv-disk-usb-device-removable.args | 2 +- .../qemuxml2argv-disk-usb-device.args | 2 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 2 +- .../qemuxml2argv-disk-virtio-ccw.args | 2 +- .../qemuxml2argv-disk-virtio-s390.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 2 +- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 2 +- .../qemuxml2argv-encrypted-disk-usage.args | 2 +- .../qemuxml2argv-encrypted-disk.args | 2 +- .../qemuxml2argv-eoi-disabled.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- .../qemuxml2argv-fips-enabled.args | 2 +- .../qemuxml2argv-floppy-drive-fat.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 2 +- .../qemuxml2argv-graphics-sdl.args | 2 +- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 2 +- .../qemuxml2argv-graphics-spice-agentmouse.args | 2 +- ...emuxml2argv-graphics-spice-auto-socket-cfg.args | 2 +- .../qemuxml2argv-graphics-spice-auto-socket.args | 2 +- .../qemuxml2argv-graphics-spice-compression.args | 2 +- .../qemuxml2argv-graphics-spice-no-args.args | 2 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 2 +- .../qemuxml2argv-graphics-spice-sasl.args | 2 +- .../qemuxml2argv-graphics-spice-socket.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-graphics-spice-usb-redir.args | 2 +- .../qemuxml2argv-graphics-spice.args | 2 +- .../qemuxml2argv-graphics-vnc-auto-socket-cfg.args | 2 +- .../qemuxml2argv-graphics-vnc-auto-socket.args | 2 +- .../qemuxml2argv-graphics-vnc-no-listen-attr.args | 2 +- .../qemuxml2argv-graphics-vnc-none.args | 2 +- .../qemuxml2argv-graphics-vnc-policy.args | 2 +- ...2argv-graphics-vnc-remove-generated-socket.args | 2 +- .../qemuxml2argv-graphics-vnc-sasl.args | 2 +- .../qemuxml2argv-graphics-vnc-socket.args | 2 +- .../qemuxml2argv-graphics-vnc-tls.args | 2 +- .../qemuxml2argv-graphics-vnc-websocket.args | 2 +- .../qemuxml2argv-graphics-vnc.args | 2 +- .../qemuxml2argv-hostdev-pci-address-device.args | 2 +- .../qemuxml2argv-hostdev-pci-address.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-readonly.args | 2 +- ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 2 +- .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 2 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 2 +- .../qemuxml2argv-hostdev-usb-address-device.args | 2 +- .../qemuxml2argv-hostdev-usb-address.args | 2 +- .../qemuxml2argv-hostdev-vfio-multidomain.args | 2 +- .../qemuxml2argv-hostdev-vfio.args | 2 +- .../qemuxml2argv-hotplug-base.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-hugepages-pages.args | 2 +- .../qemuxml2argv-hugepages-pages2.args | 2 +- .../qemuxml2argv-hugepages-pages3.args | 2 +- .../qemuxml2argv-hugepages-pages5.args | 2 +- .../qemuxml2argv-hugepages-pages6.args | 2 +- .../qemuxml2argv-hugepages-shared.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 2 +- .../qemuxml2argv-hyperv-panic.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 2 +- .../qemuxml2argv-input-usbmouse-addr.args | 2 +- .../qemuxml2argv-input-usbmouse.args | 2 +- .../qemuxml2argv-input-usbtablet.args | 2 +- .../qemuxml2argv-iothreads-disk-virtio-ccw.args | 2 +- .../qemuxml2argv-iothreads-disk.args | 2 +- .../qemuxml2argv-iothreads-ids-partial.args | 2 +- .../qemuxml2argv-iothreads-ids.args | 2 +- .../qemuxml2argv-iothreads-virtio-scsi-ccw.args | 2 +- .../qemuxml2argv-iothreads-virtio-scsi-pci.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 2 +- .../qemuxml2argv-kvm-features-off.args | 2 +- .../qemuxml2argv-kvm-features.args | 2 +- .../qemuxml2argv-kvm-pit-delay.args | 2 +- .../qemuxml2argv-kvm-pit-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 2 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-off-cap.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-off-caps.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-on-cap.args | 2 +- .../qemuxml2argv-machine-aeskeywrap-on-caps.args | 2 +- .../qemuxml2argv-machine-aliases1.args | 2 +- .../qemuxml2argv-machine-aliases2.args | 2 +- .../qemuxml2argv-machine-core-off.args | 2 +- .../qemuxml2argv-machine-core-on.args | 2 +- .../qemuxml2argv-machine-deakeywrap-off-cap.args | 2 +- .../qemuxml2argv-machine-deakeywrap-off-caps.args | 2 +- .../qemuxml2argv-machine-deakeywrap-on-cap.args | 2 +- .../qemuxml2argv-machine-deakeywrap-on-caps.args | 2 +- .../qemuxml2argv-machine-keywrap-none-caps.args | 2 +- .../qemuxml2argv-machine-keywrap-none.args | 2 +- .../qemuxml2argv-machine-usb-opt.args | 2 +- .../qemuxml2argv-machine-vmport-opt.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-master-key.args | 2 +- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 2 +- .../qemuxml2argv-memory-hotplug-dimm.args | 2 +- .../qemuxml2argv-memory-hotplug-ppc64-nonuma.args | 2 +- .../qemuxml2argv-memory-hotplug.args | 2 +- .../qemuxml2argv-memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 2 +- .../qemuxml2argv-migrate-numa-unaligned.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 2 +- .../qemuxml2argv-minimal-msg-timestamp.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 2 +- .../qemuxml2argv-misc-disable-s3.args | 2 +- .../qemuxml2argv-misc-disable-suspends.args | 2 +- .../qemuxml2argv-misc-enable-s4.args | 2 +- .../qemuxml2argv-misc-no-reboot.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 2 +- .../qemuxml2argv-mlock-unsupported.args | 2 +- .../qemuxml2argv-monitor-json.args | 2 +- .../qemuxml2argv-multifunction-pci-device.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 2 +- .../qemuxml2argv-net-eth-hostip.args | 2 +- .../qemuxml2argv-net-eth-ifname.args | 2 +- .../qemuxml2argv-net-eth-names.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 2 +- .../qemuxml2argv-net-hostdev-multidomain.args | 2 +- .../qemuxml2argv-net-hostdev-vfio-multidomain.args | 2 +- .../qemuxml2argv-net-hostdev-vfio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 2 +- .../qemuxml2argv-net-vhostuser-multiq.args | 2 +- .../qemuxml2argv-net-vhostuser.args | 2 +- .../qemuxml2argv-net-virtio-ccw.args | 2 +- .../qemuxml2argv-net-virtio-device.args | 2 +- .../qemuxml2argv-net-virtio-disable-offloads.args | 2 +- .../qemuxml2argv-net-virtio-netdev.args | 2 +- .../qemuxml2argv-net-virtio-s390.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 2 +- .../qemuxml2argv-nographics-vga.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 2 +- .../qemuxml2argv-nosharepages.args | 2 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 2 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 2 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 2 +- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 2 +- .../qemuxml2argv-numatune-auto-prefer.args | 2 +- .../qemuxml2argv-numatune-memnode-no-memory.args | 2 +- .../qemuxml2argv-numatune-memnode.args | 2 +- .../qemuxml2argv-numatune-memory.args | 2 +- .../qemuxml2argv-panic-double.args | 2 +- .../qemuxml2argv-panic-no-address.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-panic.args | 2 +- .../qemuxml2argv-parallel-parport-chardev.args | 2 +- .../qemuxml2argv-parallel-tcp-chardev.args | 2 +- .../qemuxml2argv-parallel-tcp.args | 2 +- .../qemuxml2argv-pci-autoadd-addr.args | 2 +- .../qemuxml2argv-pci-autoadd-idx.args | 2 +- .../qemuxml2argv-pci-autofill-addr.args | 2 +- .../qemuxml2argv-pci-bridge-many-disks.args | 2 +- .../qemuxml2argv-pci-expander-bus.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 2 +- .../qemuxml2argv-pci-serial-dev-chardev.args | 2 +- .../qemuxml2argv-pcie-expander-bus.args | 2 +- .../qemuxml2argv-pcie-root-port.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 2 +- .../qemuxml2argv-pcie-switch-downstream-port.args | 2 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 2 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 2 +- .../qemuxml2argv-pmu-feature-off.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +- .../qemuxml2argv-ppc64-usb-controller-legacy.args | 2 +- .../qemuxml2argv-ppc64-usb-controller.args | 2 +- .../qemuxml2argv-ppce500-serial.args | 2 +- .../qemuxml2argv-pseries-basic.args | 2 +- .../qemuxml2argv-pseries-cpu-compat.args | 2 +- .../qemuxml2argv-pseries-cpu-exact.args | 2 +- .../qemuxml2argv-pseries-cpu-le.args | 2 +- .../qemuxml2argv-pseries-nvram.args | 2 +- .../qemuxml2argv-pseries-panic-missing.args | 2 +- .../qemuxml2argv-pseries-panic-no-address.args | 2 +- .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 2 +- .../qemuxml2argv-pv-spinlock-disabled.args | 2 +- .../qemuxml2argv-pv-spinlock-enabled.args | 2 +- .../qemuxml2argv-q35-pm-disable-fallback.args | 2 +- .../qemuxml2argv-q35-pm-disable.args | 2 +- .../qemuxml2argv-q35-usb2-multi.args | 2 +- .../qemuxml2argv-q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-qemu-ns-commandline-ns0.args | 2 +- .../qemuxml2argv-qemu-ns-commandline-ns1.args | 2 +- .../qemuxml2argv-qemu-ns-commandline.args | 2 +- ...emuxml2argv-qemu-ns-domain-commandline-ns0.args | 2 +- .../qemuxml2argv-qemu-ns-domain-commandline.args | 2 +- .../qemuxml2argv-qemu-ns-domain-ns0.args | 2 +- .../qemuxml2argv-qemu-ns-no-env.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 2 +- .../qemuxml2argv-reboot-timeout-disabled.args | 2 +- .../qemuxml2argv-reboot-timeout-enabled.args | 2 +- .../qemuxml2argv-restore-v2-fd.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 2 +- ...muxml2argv-s390-allow-bogus-usb-controller.args | 2 +- .../qemuxml2argv-s390-allow-bogus-usb-none.args | 2 +- .../qemuxml2argv-s390-panic-missing.args | 2 +- .../qemuxml2argv-s390-panic-no-address.args | 2 +- .../qemuxml2argv-seclabel-dac-none.args | 2 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 2 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 2 +- .../qemuxml2argv-seclabel-dynamic-override.args | 2 +- .../qemuxml2argv-seclabel-dynamic-relabel.args | 2 +- .../qemuxml2argv-seclabel-dynamic.args | 2 +- .../qemuxml2argv-seclabel-none.args | 2 +- .../qemuxml2argv-seclabel-static-labelskip.args | 2 +- .../qemuxml2argv-seclabel-static-relabel.args | 2 +- .../qemuxml2argv-seclabel-static.args | 2 +- .../qemuxml2argv-serial-dev-chardev-iobase.args | 2 +- .../qemuxml2argv-serial-dev-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 2 +- .../qemuxml2argv-serial-file-chardev.args | 2 +- .../qemuxml2argv-serial-file-log.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 2 +- .../qemuxml2argv-serial-many-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 2 +- .../qemuxml2argv-serial-pty-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 2 +- .../qemuxml2argv-serial-spiceport-nospice.args | 2 +- .../qemuxml2argv-serial-spiceport.args | 2 +- .../qemuxml2argv-serial-tcp-chardev.args | 2 +- .../qemuxml2argv-serial-tcp-telnet-chardev.args | 2 +- .../qemuxml2argv-serial-tcp-telnet.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 2 +- .../qemuxml2argv-serial-udp-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 2 +- .../qemuxml2argv-serial-unix-chardev.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 2 +- .../qemuxml2argv-serial-vc-chardev.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 2 +- .../qemuxml2argv-smartcard-controller.args | 2 +- .../qemuxml2argv-smartcard-host-certificates.args | 2 +- .../qemuxml2argv-smartcard-host.args | 2 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 2 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 2 +- .../qemuxml2argv-sound-device.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 2 +- .../qemuxml2argv-tpm-passthrough.args | 2 +- .../qemuxml2argv-usb-controller-default-q35.args | 2 +- .../qemuxml2argv-usb-controller-explicit-q35.args | 2 +- .../qemuxml2argv-usb-controller-xhci.args | 2 +- .../qemuxml2argv-usb-controller.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 2 +- .../qemuxml2argv-usb-ich9-companion.args | 2 +- .../qemuxml2argv-usb-ich9-ehci-addr.args | 2 +- .../qemuxml2argv-usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 2 +- .../qemuxml2argv-usb-piix3-controller.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 2 +- .../qemuxml2argv-usb-redir-boot.args | 2 +- .../qemuxml2argv-usb-redir-filter-version.args | 2 +- .../qemuxml2argv-usb-redir-filter.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 2 +- .../qemuxml2argv-video-device-pciaddr-default.args | 2 +- .../qemuxml2argv-video-qxl-device-vgamem.args | 2 +- .../qemuxml2argv-video-qxl-device.args | 2 +- .../qemuxml2argv-video-qxl-heads.args | 2 +- .../qemuxml2argv-video-qxl-nodevice.args | 2 +- .../qemuxml2argv-video-qxl-noheads.args | 2 +- .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 2 +- .../qemuxml2argv-video-qxl-sec-device.args | 2 +- .../qemuxml2argv-video-vga-device-vgamem.args | 2 +- .../qemuxml2argv-video-vga-device.args | 2 +- .../qemuxml2argv-video-vga-nodevice.args | 2 +- .../qemuxml2argv-video-virtio-gpu-device.args | 2 +- .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- .../qemuxml2argv-video-virtio-gpu-virgl.args | 2 +- .../qemuxml2argv-virtio-input-passthrough.args | 2 +- .../qemuxml2argv-virtio-input.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 2 +- .../qemuxml2argv-virtio-rng-ccw.args | 2 +- .../qemuxml2argv-virtio-rng-default.args | 2 +- .../qemuxml2argv-virtio-rng-egd.args | 2 +- .../qemuxml2argv-virtio-rng-multiple.args | 2 +- .../qemuxml2argv-virtio-rng-random.args | 2 +- .../qemuxml2argv-watchdog-device.args | 2 +- .../qemuxml2argv-watchdog-diag288.args | 2 +- .../qemuxml2argv-watchdog-dump.args | 2 +- .../qemuxml2argv-watchdog-injectnmi.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 2 +- tests/qemuxml2argvtest.c | 17 +++++---- 498 files changed, 503 insertions(+), 542 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2c0b29d..b9ef49d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1229,10 +1229,6 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-sdl")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL); - if (strstr(help, "cores=") && - strstr(help, "threads=") && - strstr(help, "sockets=")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY); if (strstr(help, ",vhost=")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET); @@ -3381,7 +3377,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV); virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index affb639..53a156c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -85,7 +85,7 @@ typedef enum { X_QEMU_CAPS_BALLOON, /* -balloon available */ X_QEMU_CAPS_DEVICE, /* Is the -device arg available */ QEMU_CAPS_SDL, /* Is the new -sdl arg available */ - QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */ + X_QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */ QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */ /* 30 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3898ed7..9403196 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6862,8 +6862,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, static int qemuBuildSmpCommandLine(virCommandPtr cmd, - const virDomainDef *def, - virQEMUCapsPtr qemuCaps) + const virDomainDef *def) { char *smp; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -6872,29 +6871,18 @@ qemuBuildSmpCommandLine(virCommandPtr cmd, virBufferAsprintf(&buf, "%u", virDomainDefGetVcpus(def)); - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY)) { - if (virDomainDefHasVcpusOffline(def)) - virBufferAsprintf(&buf, ",maxcpus=%u", - virDomainDefGetVcpusMax(def)); - /* sockets, cores, and threads are either all zero - * or all non-zero, thus checking one of them is enough */ - if (def->cpu && def->cpu->sockets) { - virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets); - virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores); - virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads); - } else { - virBufferAsprintf(&buf, ",sockets=%u", - virDomainDefGetVcpusMax(def)); - virBufferAsprintf(&buf, ",cores=%u", 1); - virBufferAsprintf(&buf, ",threads=%u", 1); - } - } else if (virDomainDefHasVcpusOffline(def)) { - virBufferFreeAndReset(&buf); - /* FIXME - consider hot-unplugging cpus after boot for older qemu */ - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("setting current vcpu count less than maximum is " - "not supported with this QEMU binary")); - return -1; + if (virDomainDefHasVcpusOffline(def)) + virBufferAsprintf(&buf, ",maxcpus=%u", virDomainDefGetVcpusMax(def)); + /* sockets, cores, and threads are either all zero + * or all non-zero, thus checking one of them is enough */ + if (def->cpu && def->cpu->sockets) { + virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets); + virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores); + virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads); + } else { + virBufferAsprintf(&buf, ",sockets=%u", virDomainDefGetVcpusMax(def)); + virBufferAsprintf(&buf, ",cores=%u", 1); + virBufferAsprintf(&buf, ",threads=%u", 1); } if (virBufferCheckError(&buf) < 0) @@ -9183,7 +9171,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildMemCommandLine(cmd, cfg, def, qemuCaps) < 0) goto error; - if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0) + if (qemuBuildSmpCommandLine(cmd, def) < 0) goto error; if (qemuBuildIOThreadCommandLine(cmd, def, qemuCaps) < 0) diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml index c1d5212..c84f3de 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 3ac7bdd..c21fdd0 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 78628ee..6dc74ce 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index ba096b8..358ce3f 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 9b454b0..9e96dc0 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index db0d000..3b56444 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 964b6f0..19ac793 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 112ac95..b70933f 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 8157985..9c35290 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml index aa65733..a17896b 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml index 04d77f7..824fa08 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml index 120d249..35120af 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 1d503dd..99a7f75 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -9,7 +9,6 @@ <flag name='enable-kvm'/> <flag name='monitor-json'/> <flag name='sdl'/> - <flag name='smp-topology'/> <flag name='netdev'/> <flag name='rtc'/> <flag name='vhost-net'/> diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index d32a731..77ba06b 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -154,7 +154,6 @@ mymain(void) QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_SDL, QEMU_CAPS_CHARDEV, - QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_RTC, QEMU_CAPS_NO_HPET, QEMU_CAPS_BOOT_MENU, @@ -173,7 +172,6 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, - QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, QEMU_CAPS_VHOST_NET, @@ -214,7 +212,6 @@ mymain(void) QEMU_CAPS_MEM_PATH, QEMU_CAPS_SDL, QEMU_CAPS_CHARDEV, - QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_RTC, QEMU_CAPS_VHOST_NET, QEMU_CAPS_NO_HPET, @@ -239,7 +236,6 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, - QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, QEMU_CAPS_VHOST_NET, @@ -290,7 +286,6 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, - QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, QEMU_CAPS_VHOST_NET, @@ -339,7 +334,6 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, - QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, QEMU_CAPS_VHOST_NET, @@ -396,7 +390,6 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, - QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, QEMU_CAPS_VHOST_NET, @@ -469,7 +462,6 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_MONITOR_JSON, - QEMU_CAPS_SMP_TOPOLOGY, QEMU_CAPS_NETDEV, QEMU_CAPS_RTC, QEMU_CAPS_VHOST_NET, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args index 1de2ecf..bf4b2f7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args @@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \ -M virt \ -cpu cortex-a53 \ -m 1024 \ --smp 1 \ +-smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ -nographic \ -nodefconfig \ [... trimmed 6k lines (230KiB) of similar changes ...] diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6c526da..cca5247 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1288,7 +1288,7 @@ mymain(void) DO_TEST("qemu-ns", NONE); DO_TEST("qemu-ns-no-env", NONE); - DO_TEST("smp", QEMU_CAPS_SMP_TOPOLOGY); + DO_TEST("smp", NONE); DO_TEST("iothreads", QEMU_CAPS_OBJECT_IOTHREAD); DO_TEST("iothreads-ids", QEMU_CAPS_OBJECT_IOTHREAD); @@ -1304,8 +1304,8 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("cpu-topology1", QEMU_CAPS_SMP_TOPOLOGY); - DO_TEST("cpu-topology2", QEMU_CAPS_SMP_TOPOLOGY); + DO_TEST("cpu-topology1", NONE); + DO_TEST("cpu-topology2", NONE); DO_TEST("cpu-topology3", NONE); DO_TEST("cpu-minimum1", QEMU_CAPS_KVM); DO_TEST("cpu-minimum2", QEMU_CAPS_KVM); @@ -1316,14 +1316,13 @@ mymain(void) DO_TEST_FAILURE("cpu-nofallback", QEMU_CAPS_KVM); DO_TEST("cpu-strict1", QEMU_CAPS_KVM); DO_TEST("cpu-numa1", NONE); - DO_TEST("cpu-numa2", QEMU_CAPS_SMP_TOPOLOGY); - DO_TEST("cpu-numa-no-memory-element", QEMU_CAPS_SMP_TOPOLOGY); + DO_TEST("cpu-numa2", NONE); + DO_TEST("cpu-numa-no-memory-element", NONE); DO_TEST_PARSE_ERROR("cpu-numa3", NONE); DO_TEST_FAILURE("cpu-numa-disjoint", NONE); DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA); - DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_SMP_TOPOLOGY, - QEMU_CAPS_OBJECT_MEMORY_RAM); - DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_SMP_TOPOLOGY); + DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_OBJECT_MEMORY_RAM); + DO_TEST_FAILURE("cpu-numa-memshared", NONE); DO_TEST("cpu-host-model", NONE); DO_TEST("cpu-host-model-vendor", NONE); skipLegacyCPUs = true; @@ -1352,7 +1351,7 @@ mymain(void) DO_TEST("cputune-zero-shares", NONE); DO_TEST_PARSE_ERROR("cputune-iothreadsched-toomuch", NONE); DO_TEST_PARSE_ERROR("cputune-vcpusched-overlap", NONE); - DO_TEST("cputune-numatune", QEMU_CAPS_SMP_TOPOLOGY, + DO_TEST("cputune-numatune", QEMU_CAPS_KVM, QEMU_CAPS_OBJECT_IOTHREAD, QEMU_CAPS_OBJECT_MEMORY_RAM, -- 2.9.0

2 1

[libvirt] [PATCH] virDomainHostdevDefFree: Don't leak privateData
by Michal Privoznik 07 Jul '16

07 Jul '16

After 27726d8c21 a privateData is allocated in virDomainHostdevDefAlloc(). However, the counter part - freeing them in Free() is missing which leads to the following memory leak: ==6489== 24 bytes in 1 blocks are definitely lost in loss record 684 of 1,003 ==6489== at 0x4C2C070: calloc (vg_replace_malloc.c:623) ==6489== by 0x54B7C94: virAllocVar (viralloc.c:560) ==6489== by 0x5517BE6: virObjectNew (virobject.c:193) ==6489== by 0x1B400121: qemuDomainHostdevPrivateNew (qemu_domain.c:798) ==6489== by 0x5557B24: virDomainHostdevDefAlloc (domain_conf.c:2152) ==6489== by 0x5575578: virDomainHostdevDefParseXML (domain_conf.c:12709) ==6489== by 0x5582292: virDomainDefParseXML (domain_conf.c:16995) ==6489== by 0x5583C98: virDomainDefParseNode (domain_conf.c:17470) ==6489== by 0x5583B07: virDomainDefParse (domain_conf.c:17417) ==6489== by 0x5583B95: virDomainDefParseFile (domain_conf.c:17441) ==6489== by 0x55A3F24: virDomainObjListLoadConfig (virdomainobjlist.c:465) ==6489== by 0x55A43E6: virDomainObjListLoadAllConfigs (virdomainobjlist.c:596) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f7b906..7d2d726 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2214,6 +2214,9 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def) } break; } + + virObjectUnref(def->privateData); + def->privateData = NULL; } void virDomainTPMDefFree(virDomainTPMDefPtr def) -- 2.8.4

2 1

[libvirt] [PATCH] qemu: agent: Fix QEMU guest agent is not available due to an error
by Xiubo Li 07 Jul '16

07 Jul '16

These days, we experienced one qemu guest agent is not available error. Then the guest agent couldn't be used forever before rebooting the libvirtd daemon or reboot the qemu-guest-agent in the VM(you can also reboot the VM) to clear the priv->agentError. This is one bug for a long time in many verisons of libvirtd: https://bugzilla.redhat.com/show_bug.cgi?id=1090551 And there is one python script to reproduce this bug from the bugzilla: https://github.com/aspirer/study/blob/master/qemu-guest-agent/test2.py Just set the timeout to 0 at Line26, you can reproduce it very quickly: rsp = libvirt_qemu.qemuAgentCommand(dom, cmd, 1, 0) // 1 -> 0 The reason why this could happen is that: In case we received something like: {"return": {}} for example, it is likely that somebody: 1) Started GA which sent one "guest-ping" command with seconds equals to VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT(0), which makes this function return "immediately" without waiting, and sleeps in virCondWait(). 2) While in AgentIO thread the "guest-ping" command is sent successfully, and then waiting for reply. 3) Then the GA thread is woken up and the mon->msg is set to NULL and exit. 4) Now the AgentIO has received the reply for "guest-ping" command with the mon->msg == NULL. Before we just check the guest-sync case, and should also check for all the other GA commands. I have test many of the GA commands, which all can reporduce this bug. This patch will check if this is the case and don't report an error but return silently. Signed-off-by: Xiubo Li <lixiubo(a)cmss.chinamobile.com> Signed-off-by: Zhuoyu Zhang <zhangzhuoyu(a)cmss.chinamobile.com> Signed-off-by: Wei Tang <tangwei(a)cmss.chinamobile.com> Signed-off-by: Yaowei Bai <baiyaowei(a)cmss.chinamobile.com> Signed-off-by: Qide Chen <chenqide(a)cmss.chinamobile.com> --- src/qemu/qemu_agent.c | 30 +++++++++++++++++++++--------- src/util/virjson.h | 7 +++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index eeede6b..5f08ba0 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -308,7 +308,6 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, { virJSONValuePtr obj = NULL; int ret = -1; - unsigned long long id; VIR_DEBUG("Line [%s]", line); @@ -333,16 +332,29 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, obj = NULL; ret = 0; } else { - /* If we've received something like: - * {"return": 1234} - * it is likely that somebody started GA - * which is now processing our previous - * guest-sync commands. Check if this is - * the case and don't report an error but + /* In case we received something like: + * {"return": {}} for example, + * it is likely that somebody: + * + * 1) Started GA which sent one "guest-ping" command with + * seconds equals to VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT(0) + * makes this function return immediately without waiting, + * and sleeps in virCondWait(). + * + * 2) While in AgentIO thread the "guest-ping" command is sent + * successfully, and the waiting for reply. + * + * 3) Then the GA thread is woken up and the mon->msg is set + * to NULL and exit. + * + * 4) Now the AgentIO has received the reply for "guest-ping" + * command with the mon->msg == NULL. + * + * Check if this is the case and don't report an error but * return silently. */ - if (virJSONValueObjectGetNumberUlong(obj, "return", &id) == 0) { - VIR_DEBUG("Ignoring delayed reply to guest-sync: %llu", id); + if (virIsValidJSONType(obj)) { + VIR_DEBUG("Ignoring delayed command reply"); ret = 0; goto cleanup; } diff --git a/src/util/virjson.h b/src/util/virjson.h index 66ed48a..d36ce8e 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -80,6 +80,13 @@ struct _virJSONValue { } data; }; +static inline bool +virIsValidJSONType(virJSONValuePtr object) +{ + return ((object->type >= VIR_JSON_TYPE_OBJECT) + && (object->type <= VIR_JSON_TYPE_BOOLEAN)); +} + void virJSONValueFree(virJSONValuePtr value); int virJSONValueObjectCreate(virJSONValuePtr *obj, ...) -- 1.8.3.1

1 2

[libvirt] [PATCH 0/2] Introduce libvirt-libs.rpm
by Michal Privoznik 07 Jul '16

07 Jul '16

*** BLURB HERE *** Michal Privoznik (2): spec: Split libvirt-client spec: Move virt-admin into its own package libvirt.spec.in | 90 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 34 deletions(-) -- 2.8.4

4 8