- Devel - libvirt List Archives

[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

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

06 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

1 4

[libvirt] [PATCH v3 00/10] Add support for LUKS encrypted devices
by John Ferlan 05 Jul '16

05 Jul '16

v2: http://www.redhat.com/archives/libvir-list/2016-June/msg01691.html Changes since v2 (all as a result of code review) Patch 1: New as a result of review comment regarding virSecretDefFormatUsage Patch 2: Change "id" to "name", fixed the html.in, remove whitespice, generated patch 1 due to virSecretDefFormatUsage comment Patch 3: Altered the html.in, don't believe the review comment for wrong type in qemuProcessGetVolumeQcowPassphrase is right, also modified the testdata output file to follow suggestion for changes made in patch 5 & 6 Patch 4: Was essentially ACK'd, but requires previous patches. Took care of the testdata output file. Patch 5: Adjusted html.in, modified virStorageEncryptionInfoDef to have both cipher_* and ivgen_* params in it - affected other places (and fixed those), Patch 6: Essentially ACK'd (the chmod was removed) Patch 7: NEW - going to need this for hot unplug... Patch 8: Adjusted per review of this series and the other 3 patch series for rbd disk hot plug/unplug Patch 9: NEW - Need to generate a different alias for LUKS Patch 10: Mostly unchanged except to utilze the luks specific alias generation... also moved the unplug to right place. John Ferlan (10): conf: No need to check for usage fields during Format conf: Add new secret type "passphrase" util: Add 'usage' for encryption encryption: Add luks parsing for storageencryption encryption: Add <cipher> and <ivgen> to encryption storage: Add support to create a luks volume qemu: Introduce helper qemuDomainSecretDiskCapable qemu: Add secinfo for hotplug virtio disk qemu: Alter the qemuDomainGetSecretAESAlias to add new arg qemu: Add luks support for domain disk docs/aclpolkit.html.in | 4 + docs/formatsecret.html.in | 62 ++++- docs/formatstorageencryption.html.in | 115 ++++++++- docs/schemas/secret.rng | 10 + docs/schemas/storagecommon.rng | 57 ++++- include/libvirt/libvirt-secret.h | 3 +- src/access/viraccessdriverpolkit.c | 13 ++ src/conf/domain_conf.c | 11 + src/conf/secret_conf.c | 36 ++- src/conf/secret_conf.h | 1 + src/conf/virsecretobj.c | 5 + src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_alias.h | 3 +- src/qemu/qemu_command.c | 9 + src/qemu/qemu_domain.c | 58 +++-- src/qemu/qemu_domain.h | 3 + src/qemu/qemu_hotplug.c | 123 +++++++++- src/qemu/qemu_process.c | 19 +- src/storage/storage_backend.c | 260 +++++++++++++++++++-- src/storage/storage_backend.h | 3 +- src/storage/storage_backend_fs.c | 10 +- src/storage/storage_backend_gluster.c | 2 + src/util/virqemu.c | 23 ++ src/util/virqemu.h | 6 + src/util/virstorageencryption.c | 166 +++++++++++-- src/util/virstorageencryption.h | 18 +- .../qemuxml2argv-encrypted-disk-usage.args | 24 ++ .../qemuxml2argv-encrypted-disk-usage.xml | 36 +++ .../qemuxml2argv-luks-disk-cipher.args | 36 +++ .../qemuxml2argv-luks-disk-cipher.xml | 45 ++++ .../qemuxml2argvdata/qemuxml2argv-luks-disks.args | 36 +++ tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml | 45 ++++ tests/qemuxml2argvtest.c | 12 +- .../qemuxml2xmlout-encrypted-disk-usage.xml | 1 + .../qemuxml2xmlout-luks-disk-cipher.xml | 1 + .../qemuxml2xmlout-luks-disks.xml | 1 + tests/qemuxml2xmltest.c | 3 + tests/secretxml2xmlin/usage-passphrase.xml | 7 + tests/secretxml2xmltest.c | 1 + tests/storagevolxml2argvtest.c | 3 +- tests/storagevolxml2xmlin/vol-luks-cipher.xml | 23 ++ tests/storagevolxml2xmlin/vol-luks.xml | 21 ++ tests/storagevolxml2xmlout/vol-luks-cipher.xml | 23 ++ tests/storagevolxml2xmlout/vol-luks.xml | 21 ++ tests/storagevolxml2xmltest.c | 2 + 46 files changed, 1267 insertions(+), 105 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk-usage.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disk-cipher.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml create mode 100644 tests/secretxml2xmlin/usage-passphrase.xml create mode 100644 tests/storagevolxml2xmlin/vol-luks-cipher.xml create mode 100644 tests/storagevolxml2xmlin/vol-luks.xml create mode 100644 tests/storagevolxml2xmlout/vol-luks-cipher.xml create mode 100644 tests/storagevolxml2xmlout/vol-luks.xml -- 2.5.5

3 36

[libvirt] [PATCH v6 0/5] qemu: expand domain memory statistics
by Derbyshev Dmitriy 05 Jul '16

05 Jul '16

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> QEMU reports timestamp and available along with other memory statistics. This information was not saved into domain statistics. Also, to collect all balloon statistics for all guests it was necessary to make several libvirt requests (one per VE). Last patch allows doing this via qemuConnectGetAllDomainStats in one request. Changes since v1: * Enum numeration fixed * Macro getting "usage" field fixed Changes since v2: * Previous patches were on wrong branch * qemu's stat name was "stat-available-memory" Changes since v3: * domstats patch added Changes since v4: * Formatted and rephrased commit messages * Fixed libvirt crash, caused by simultaneous incorrect QUERY job execution Changes since v5: * Updated virsh.pod * Splitted patch about domstats into 2 patches * Do not report balloon.current as balloon.actual Derbyshev Dmitry (5): virsh: Add balloon stats description to .pod qemu: expand domain memory statistics with 'usable' qemu: expand domain memory statistics with 'last-update' timestamp qemu: split qemuDomainMemoryStats into internal and external functions qemu: return balloon statistics when all domain statistics reported include/libvirt/libvirt-domain.h | 11 ++++- src/libvirt-domain.c | 5 +++ src/qemu/qemu_driver.c | 94 ++++++++++++++++++++++++++++++---------- src/qemu/qemu_monitor_json.c | 24 ++++++---- tools/virsh-domain-monitor.c | 4 ++ tools/virsh.pod | 29 ++++++++++++- 6 files changed, 133 insertions(+), 34 deletions(-) -- 1.9.5.msysgit.0

1 5

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

05 Jul '16

Differences to v3: functional changes: - Throw an error when there is no bhyverun command (bhyve_argv == NULL) - Parse the memory size in the same way bhyve does it, and adapt the relevant code (vm_parse_memsize) from the FreeBSD source tree. Here I'm a bit unsure about attribution; the original function comes from a BSD 2-Clause Licenced file, and I'm not sure if I also have to include the BSD disclaimer to the header. - Removed capability check for clock offset - Fix a mixup of NMDM master and slave - Fixed numbering of disks. When >25 disks are given, disks after vdz/sdz no longer get added. - Fail completely should parsing fail. bugfixes: - Fix a possible Null-Pointer dereference in bhyveParseCommandLineString when no loader command is given. - Fix an off-by-one in the string allocation (bhyve_parse_command.c:60) style: - Fix some indentation - Move else-clauses on the same line as the closing bracket from the if 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 | 1 + src/Makefile.am | 2 + src/bhyve/bhyve_driver.c | 42 + src/bhyve/bhyve_parse_command.c | 892 +++++++++++++++++++++ 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 | 28 + .../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, 2174 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 10

[libvirt] [PATCH v2 0/2] virsh expand virsh list command options
by Chen Hanxiao 05 Jul '16

05 Jul '16

Chen Hanxiao (2): virsh: allow both --uuid and --name at same cmd virsh: enable --table with --name or --uuid tools/virsh-domain-monitor.c | 56 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 9 deletions(-) -- 2.5.0

2 6