1:57 p.m.
This completes the conversion to standarize on on|off for all boolean
options in QEMU.
Daniel P. Berrang=C3=A9 (5):
qemu: probe for -vnc supporting use of QemuOpts syntax
qemu: use on|off for -vnc boolean option values
qemu: use on|off instead of yes|no for -object boolean properties
qemu: use on|off instead of yes|no for -drive boolean properties
qemu: remove support for generating yes|no boolean options
src/qemu/qemu_capabilities.c | 2 +
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 18 +-
src/util/virqemu.c | 50 ++----
src/util/virqemu.h | 10 +-
.../caps_2.10.0.aarch64.xml | 1 +
.../caps_2.10.0.ppc64.xml | 1 +
.../caps_2.10.0.s390x.xml | 1 +
.../caps_2.10.0.x86_64.xml | 1 +
.../caps_2.11.0.s390x.xml | 1 +
.../caps_2.11.0.x86_64.xml | 1 +
.../caps_2.12.0.aarch64.xml | 1 +
.../caps_2.12.0.ppc64.xml | 1 +
.../caps_2.12.0.s390x.xml | 1 +
.../caps_2.12.0.x86_64.xml | 1 +
.../caps_2.4.0.x86_64.xml | 1 +
.../caps_2.5.0.x86_64.xml | 1 +
.../caps_2.6.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 +
.../caps_2.6.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 +
.../caps_2.7.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
.../caps_2.8.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 +
.../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 +
.../caps_2.9.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 +
.../caps_3.0.0.riscv32.xml | 1 +
.../caps_3.0.0.riscv64.xml | 1 +
.../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 +
.../caps_3.0.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 +
.../caps_3.1.0.x86_64.xml | 1 +
.../caps_4.0.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 +
.../caps_4.0.0.riscv32.xml | 1 +
.../caps_4.0.0.riscv64.xml | 1 +
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 +
.../caps_4.0.0.x86_64.xml | 1 +
.../caps_4.1.0.x86_64.xml | 1 +
.../caps_4.2.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 +
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 +
.../caps_4.2.0.x86_64.xml | 1 +
.../caps_5.0.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 +
.../caps_5.0.0.riscv64.xml | 1 +
.../caps_5.0.0.x86_64.xml | 1 +
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 +
.../caps_5.1.0.x86_64.xml | 1 +
.../caps_5.2.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 +
.../caps_5.2.0.riscv64.xml | 1 +
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 +
.../caps_5.2.0.x86_64.xml | 1 +
.../caps_6.0.0.x86_64.xml | 1 +
tests/qemucommandutiltest.c | 10 +-
.../aarch64-gic-default-both.args | 28 ++-
.../aarch64-gic-default-v2.args | 28 ++-
.../aarch64-gic-default-v3.args | 28 ++-
.../qemuxml2argvdata/aarch64-gic-default.args | 28 ++-
.../aarch64-gic-none-both.args | 28 ++-
.../qemuxml2argvdata/aarch64-gic-none-v2.args | 28 ++-
.../qemuxml2argvdata/aarch64-gic-none-v3.args | 28 ++-
tests/qemuxml2argvdata/aarch64-gic-none.args | 28 ++-
tests/qemuxml2argvdata/cpu-check-full.args | 30 +++-
tests/qemuxml2argvdata/cpu-check-partial.args | 30 +++-
.../qemuxml2argvdata/cpu-numa-memshared.args | 4 +-
...sk-backing-chains-index.x86_64-2.12.0.args | 62 ++++++-
...sk-backing-chains-index.x86_64-latest.args | 169 +++++++++++++++++-
...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 2 +-
...isk-network-tlsx509-nbd.x86_64-latest.args | 2 +-
...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 4 +-
...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 4 +-
.../disk-network-tlsx509.x86_64-2.12.0.args | 6 +-
.../disk-network-tlsx509.x86_64-latest.args | 6 +-
.../disk-vhostuser.x86_64-latest.args | 4 +-
.../fd-memory-numa-topology.args | 2 +-
.../fd-memory-numa-topology2.args | 4 +-
.../fd-memory-numa-topology3.args | 6 +-
...graphics-vnc-tls-secret.x86_64-latest.args | 4 +-
.../graphics-vnc-tls.x86_64-2.4.0.args | 2 +-
.../graphics-vnc-tls.x86_64-latest.args | 4 +-
.../qemuxml2argvdata/hugepages-memaccess.args | 10 +-
.../hugepages-memaccess2.args | 10 +-
.../hugepages-memaccess3.x86_64-latest.args | 4 +-
.../hugepages-numa-nodeset-part.args | 2 +-
.../hugepages-numa-nodeset.args | 8 +-
.../hugepages-nvdimm.x86_64-latest.args | 6 +-
tests/qemuxml2argvdata/hugepages-shared.args | 8 +-
.../mach-virt-console-native.args | 29 ++-
.../mach-virt-serial+console-native.args | 29 ++-
.../mach-virt-serial-compat.args | 29 ++-
...memory-default-hugepage.x86_64-latest.args | 4 +-
.../memfd-memory-numa.x86_64-latest.args | 4 +-
.../memory-hotplug-dimm-addr.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
...y-hotplug-nvdimm-access.x86_64-latest.args | 4 +-
...ry-hotplug-nvdimm-align.x86_64-latest.args | 4 +-
...ry-hotplug-nvdimm-label.x86_64-latest.args | 4 +-
...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 4 +-
...emory-hotplug-nvdimm-ppc64-abi-update.args | 2 +-
.../memory-hotplug-nvdimm-ppc64.args | 2 +-
...hotplug-nvdimm-readonly.x86_64-latest.args | 4 +-
.../memory-hotplug-nvdimm.x86_64-latest.args | 2 +-
...ory-hotplug-virtio-pmem.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/pages-dimm-discard.args | 4 +-
.../pci-rom-disabled-invalid.args | 30 +++-
.../pseries-console-native.args | 28 ++-
.../pseries-serial+console-native.args | 28 ++-
.../pseries-serial-compat.args | 28 ++-
.../serial-tcp-tlsx509-chardev-verify.args | 2 +-
.../serial-tcp-tlsx509-chardev.args | 2 +-
.../serial-tcp-tlsx509-secret-chardev.args | 2 +-
.../shmem-plain-doorbell.args | 6 +-
tests/qemuxml2argvdata/user-aliases.args | 8 +-
tests/qemuxml2argvdata/user-aliases2.args | 29 ++-
...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +-
...vhost-user-fs-hugepages.x86_64-latest.args | 2 +-
...host-user-gpu-secondary.x86_64-latest.args | 2 +-
.../vhost-user-vga.x86_64-latest.args | 2 +-
122 files changed, 906 insertions(+), 156 deletions(-)
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default-bo=
th.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default-v2=
.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default-v3=
.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default.ar=
gs
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none-both.=
args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none-v2.ar=
gs
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none-v3.ar=
gs
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/cpu-check-full.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/cpu-check-partial.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/disk-backing-chains-in=
dex.x86_64-2.12.0.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/disk-backing-chains-in=
dex.x86_64-latest.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/mach-virt-console-nati=
ve.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/mach-virt-serial+conso=
le-native.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/mach-virt-serial-compa=
t.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/pci-rom-disabled-inval=
id.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/pseries-console-native=
.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/pseries-serial+console=
-native.args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/pseries-serial-compat.=
args
mode change 120000 =3D> 100644 tests/qemuxml2argvdata/user-aliases2.args
--=20
2.29.2
1:57 p.m.
New subject: [libvirt PATCH 1/5] qemu: probe for -vnc supporting use of QemuOpts syntax
This was introduced in QEMU 2.2.0, and is visible by -vnc appearing in
the "query-command-line-options" data.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 2 ++
src/qemu/qemu_capabilities.h | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 +
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 +
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 +
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 +
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 +
54 files changed, 55 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 46b0109ca2..3f8593a9e5 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -616,6 +616,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"vhost-user-blk",
"cpu-max",
"memory-backend-file.x-use-canonical-path-for-ramblock-id",
+ "vnc-opts",
);
@@ -3295,6 +3296,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] =
{
{ "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
{ "fw_cfg", "file", QEMU_CAPS_FW_CFG },
{ "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have
also checked fsdev->dmode */
+ { "vnc", "display", QEMU_CAPS_VNC_OPTS },
};
static int
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 6fd7922926..38574eef16 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -596,6 +596,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */
QEMU_CAPS_CPU_MAX, /* -cpu max */
QEMU_CAPS_X_USE_CANONICAL_PATH_FOR_RAMBLOCK_ID, /* -object
memory-backend-file,x-use-canonical-path-for-ramblock-id= */
+ QEMU_CAPS_VNC_OPTS, /* -vnc uses QemuOpts parser instead of custom code */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 5b7df57b50..cce5233a14 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -149,6 +149,7 @@
<flag name='fsdev.createmode'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='vnc-opts'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700287</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index fcd375da3b..94ea063d05 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -149,6 +149,7 @@
<flag name='fsdev.createmode'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='vnc-opts'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900287</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index dd28959eab..42e77c7ef1 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -113,6 +113,7 @@
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='fsdev.createmode'/>
+ <flag name='vnc-opts'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100287</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 579b88c17f..8027baf181 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -194,6 +194,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='cpu-max'/>
+ <flag name='vnc-opts'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100287</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 137fff4dfc..23ccb98c2a 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -121,6 +121,7 @@
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>
<flag name='fsdev.createmode'/>
+ <flag name='vnc-opts'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100288</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 2c475d73bc..5e310a452b 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -201,6 +201,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='cpu-max'/>
+ <flag name='vnc-opts'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100288</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index d4dad8d8b2..93c768c633 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -168,6 +168,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
+ <flag name='vnc-opts'/>
<version>2012000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index f441354054..2b274dbbce 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -169,6 +169,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
+ <flag name='vnc-opts'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 63c7e38f40..f74a4a807a 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -134,6 +134,7 @@
<flag name='migration-param.xbzrle-cache-size'/>
<flag name='fsdev.createmode'/>
<flag name='vhost-user-blk'/>
+ <flag name='vnc-opts'/>
<version>2012000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index d54e305e2e..f160c7d16e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -212,6 +212,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
+ <flag name='vnc-opts'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100289</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index dc8c17c230..4c81108258 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -140,6 +140,7 @@
<flag name='fw_cfg'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='vnc-opts'/>
<version>2004000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index ff2f789ba3..ac365a695a 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -146,6 +146,7 @@
<flag name='fw_cfg'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='vnc-opts'/>
<version>2005000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index b43cc3aa4d..6e398921c0 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -129,6 +129,7 @@
<flag name='fw_cfg'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='vnc-opts'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index efad707714..597e1a6a21 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -125,6 +125,7 @@
<flag name='fw_cfg'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='vnc-opts'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 5c383c190a..b57e1f0d23 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -158,6 +158,7 @@
<flag name='fw_cfg'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='vnc-opts'/>
<version>2006000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index b46e16c0d8..5e5aef04f8 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -94,6 +94,7 @@
<flag name='storage.werror'/>
<flag name='tcg'/>
<flag name='fw_cfg'/>
+ <flag name='vnc-opts'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100245</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 95f38ca41d..5574c3b941 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -163,6 +163,7 @@
<flag name='fw_cfg'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='vnc-opts'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100245</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index cda8d08c4d..5525610a36 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -101,6 +101,7 @@
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
+ <flag name='vnc-opts'/>
<version>2007093</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100246</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index d24c3c71e0..d9a102886a 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -168,6 +168,7 @@
<flag name='migration-param.downtime'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='vnc-opts'/>
<version>2008000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100246</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 04fd9abfff..d5098c3dfb 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -140,6 +140,7 @@
<flag name='migration-param.downtime'/>
<flag name='dc390'/>
<flag name='am53c974'/>
+ <flag name='vnc-opts'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900247</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 9cdcb9988a..d985f4e9ec 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -106,6 +106,7 @@
<flag name='fw_cfg'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
+ <flag name='vnc-opts'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100247</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 37406cb4a9..8f41622c44 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -187,6 +187,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='cpu-max'/>
+ <flag name='vnc-opts'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100247</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 28cc662bfb..09291babd6 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -171,6 +171,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
+ <flag name='vnc-opts'/>
<version>2012050</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900239</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index cbc185fc3a..1c67d1b0a2 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -104,6 +104,7 @@
<flag name='migration-param.xbzrle-cache-size'/>
<flag name='fsdev.createmode'/>
<flag name='vhost-user-blk'/>
+ <flag name='vnc-opts'/>
<version>3000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index aa803ccbd6..018747e385 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -104,6 +104,7 @@
<flag name='migration-param.xbzrle-cache-size'/>
<flag name='fsdev.createmode'/>
<flag name='vhost-user-blk'/>
+ <flag name='vnc-opts'/>
<version>3000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index cdb767bbf7..fd5279987a 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -137,6 +137,7 @@
<flag name='migration-param.xbzrle-cache-size'/>
<flag name='fsdev.createmode'/>
<flag name='vhost-user-blk'/>
+ <flag name='vnc-opts'/>
<version>3000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100239</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 09bdbf7fc7..8bf6c831b1 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -218,6 +218,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
+ <flag name='vnc-opts'/>
<version>3000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100239</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 11d8d668de..0464a8e456 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -176,6 +176,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
+ <flag name='vnc-opts'/>
<version>3000091</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 7c7216826b..1a3177d561 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -221,6 +221,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
+ <flag name='vnc-opts'/>
<version>3000092</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 8bf4283e5b..915c84f66e 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -183,6 +183,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index f9bf0910a2..b096120ae3 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -191,6 +191,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index d56a19e6f9..53c35beba6 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -183,6 +183,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index d35cb7e2ca..d76ad4102b 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -183,6 +183,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 4e1fdb7eda..e61a9570b7 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -147,6 +147,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index df76bf3b46..17395394df 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -228,6 +228,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100240</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 026e5071a5..6bc2fea7b4 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -235,6 +235,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4001000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 57be989872..56922178ff 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -196,6 +196,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4001050</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 53a1b9ed18..080e3364d9 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -197,6 +197,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4001050</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 79a16221c1..2dfdc6f2ba 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -158,6 +158,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index afd0f2254f..ce6336d483 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -244,6 +244,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>4002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 964df1076b..7031031716 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -206,6 +206,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 7398751fd8..4f690108e0 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -215,6 +215,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 7a27dd75d9..6fb46102e7 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -201,6 +201,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index eb700b5415..8fd9afdf15 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -251,6 +251,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 704ca704e0..66b62ff387 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -116,6 +116,7 @@
<flag name='fsdev.createmode'/>
<flag name='ncr53c90'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5001000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index a7a9af5dc1..d1096c3cb7 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -253,6 +253,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5001000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index dec6fd250a..44cd217efb 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -210,6 +210,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>61700243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 479bd90e37..8fad127015 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -217,6 +217,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>42900243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 9eaccb2089..c939ed2db7 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -203,6 +203,7 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index cdcd5cac57..4c91abc6f1 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -165,6 +165,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 5643d3b713..853f73fa53 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -254,6 +254,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5002000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index ddfa701798..23fb5b7393 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -255,6 +255,7 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+ <flag name='vnc-opts'/>
<version>5002050</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100242</microcodeVersion>
--
2.29.2
2:33 p.m.
New subject: [libvirt PATCH 1/5] qemu: probe for -vnc supporting use of QemuOpts syntax
On a Tuesday in 2021, Daniel P. Berrangé wrote:
This was introduced in QEMU 2.2.0, and is visible by -vnc appearing
in
the "query-command-line-options" data.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 2 ++
src/qemu/qemu_capabilities.h | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 +
[...]
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 +
54 files changed, 55 insertions(+)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
1:57 p.m.
New subject: [libvirt PATCH 2/5] qemu: use on|off for -vnc boolean option values
The preferred syntax for boolean options is to set the value "on" or
"off". QEMU 7.1.0 will deprecate the short format we currently use.
The long format has been supported with -vnc since the change to use
QemuOpts in 2.2.0, so we check based on the new capability flag.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_command.c | 18 ++++++++++++++----
.../graphics-vnc-tls-secret.x86_64-latest.args | 2 +-
.../graphics-vnc-tls.x86_64-2.4.0.args | 2 +-
.../graphics-vnc-tls.x86_64-latest.args | 2 +-
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a8342ff7d5..d801018aa2 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7644,8 +7644,12 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
graphics->data.vnc.sharePolicy));
}
- if (graphics->data.vnc.auth.passwd || cfg->vncPassword)
- virBufferAddLit(&opt, ",password");
+ if (graphics->data.vnc.auth.passwd || cfg->vncPassword) {
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS))
+ virBufferAddLit(&opt, ",password=on");
+ else
+ virBufferAddLit(&opt, ",password");
+ }
if (cfg->vncTLS) {
qemuDomainGraphicsPrivatePtr gfxPriv = QEMU_DOMAIN_GRAPHICS_PRIVATE(graphics);
@@ -7670,7 +7674,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
virBufferAsprintf(&opt, ",tls-creds=%s",
gfxPriv->tlsAlias);
} else {
- virBufferAddLit(&opt, ",tls");
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS))
+ virBufferAddLit(&opt, ",tls=on");
+ else
+ virBufferAddLit(&opt, ",tls");
if (cfg->vncTLSx509verify) {
virBufferAddLit(&opt, ",x509verify=");
virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir);
@@ -7682,7 +7689,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
}
if (cfg->vncSASL) {
- virBufferAddLit(&opt, ",sasl");
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC_OPTS))
+ virBufferAddLit(&opt, ",sasl=on");
+ else
+ virBufferAddLit(&opt, ",sasl");
if (cfg->vncSASLdir)
virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
index 00119fcd3d..eb0df17eda 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -34,7 +34,7 @@ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=vnc-tls-creds0,dir=/etc/pki/libvirt-vnc,\
endpoint=server,verify-peer=yes,passwordid=vnc-tls-creds0-secret0 \
--vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl \
+-vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
index 471ff0dc77..78a47f1d30 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
@@ -26,6 +26,6 @@ server=on,wait=off \
-no-acpi \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
+-vnc 127.0.0.1:3,tls=on,x509verify=/etc/pki/libvirt-vnc,sasl=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
index b739a9b9c8..1c4b948b97 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
@@ -31,7 +31,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-object tls-creds-x509,id=vnc-tls-creds0,dir=/etc/pki/libvirt-vnc,\
endpoint=server,verify-peer=yes \
--vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl \
+-vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
--
2.29.2
2:33 p.m.
New subject: [libvirt PATCH 2/5] qemu: use on|off for -vnc boolean option values
On a Tuesday in 2021, Daniel P. Berrangé wrote:
The preferred syntax for boolean options is to set the value
"on" or
"off". QEMU 7.1.0 will deprecate the short format we currently use.
The long format has been supported with -vnc since the change to use
QemuOpts in 2.2.0, so we check based on the new capability flag.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/qemu/qemu_command.c | 18 ++++++++++++++----
.../graphics-vnc-tls-secret.x86_64-latest.args | 2 +-
.../graphics-vnc-tls.x86_64-2.4.0.args | 2 +-
.../graphics-vnc-tls.x86_64-latest.args | 2 +-
4 files changed, 17 insertions(+), 7 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
1:57 p.m.
New subject: [libvirt PATCH 3/5] qemu: use on|off instead of yes|no for -object boolean properties
QEMU has long accepted many different values for boolean properties, but
set accepted has been different depending on which QEMU parser you hit.
The on|off values were supported by all QEMU parsers. The yes|no, y|n,
true|false values were only partially supported:
https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg01012.html
Thus we should standardize on on|off everywhere since that is most
widely supported in QEMU.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/util/virqemu.c | 2 +-
.../aarch64-gic-default-both.args | 28 ++-
.../aarch64-gic-default-v2.args | 28 ++-
.../aarch64-gic-default-v3.args | 28 ++-
.../qemuxml2argvdata/aarch64-gic-default.args | 28 ++-
.../aarch64-gic-none-both.args | 28 ++-
.../qemuxml2argvdata/aarch64-gic-none-v2.args | 28 ++-
.../qemuxml2argvdata/aarch64-gic-none-v3.args | 28 ++-
tests/qemuxml2argvdata/aarch64-gic-none.args | 28 ++-
tests/qemuxml2argvdata/cpu-check-full.args | 30 +++-
tests/qemuxml2argvdata/cpu-check-partial.args | 30 +++-
.../qemuxml2argvdata/cpu-numa-memshared.args | 4 +-
...sk-backing-chains-index.x86_64-2.12.0.args | 62 ++++++-
...sk-backing-chains-index.x86_64-latest.args | 169 +++++++++++++++++-
...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 2 +-
...isk-network-tlsx509-nbd.x86_64-latest.args | 2 +-
...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 4 +-
...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 4 +-
.../disk-network-tlsx509.x86_64-2.12.0.args | 6 +-
.../disk-network-tlsx509.x86_64-latest.args | 6 +-
.../disk-vhostuser.x86_64-latest.args | 4 +-
.../fd-memory-numa-topology.args | 2 +-
.../fd-memory-numa-topology2.args | 4 +-
.../fd-memory-numa-topology3.args | 6 +-
...graphics-vnc-tls-secret.x86_64-latest.args | 2 +-
.../graphics-vnc-tls.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/hugepages-memaccess.args | 10 +-
.../hugepages-memaccess2.args | 10 +-
.../hugepages-memaccess3.x86_64-latest.args | 4 +-
.../hugepages-numa-nodeset-part.args | 2 +-
.../hugepages-numa-nodeset.args | 8 +-
.../hugepages-nvdimm.x86_64-latest.args | 6 +-
tests/qemuxml2argvdata/hugepages-shared.args | 8 +-
.../mach-virt-console-native.args | 29 ++-
.../mach-virt-serial+console-native.args | 29 ++-
.../mach-virt-serial-compat.args | 29 ++-
...memory-default-hugepage.x86_64-latest.args | 4 +-
.../memfd-memory-numa.x86_64-latest.args | 4 +-
.../memory-hotplug-dimm-addr.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
...y-hotplug-nvdimm-access.x86_64-latest.args | 4 +-
...ry-hotplug-nvdimm-align.x86_64-latest.args | 4 +-
...ry-hotplug-nvdimm-label.x86_64-latest.args | 4 +-
...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 4 +-
...emory-hotplug-nvdimm-ppc64-abi-update.args | 2 +-
.../memory-hotplug-nvdimm-ppc64.args | 2 +-
...hotplug-nvdimm-readonly.x86_64-latest.args | 4 +-
.../memory-hotplug-nvdimm.x86_64-latest.args | 2 +-
...ory-hotplug-virtio-pmem.x86_64-latest.args | 2 +-
.../qemuxml2argvdata/pages-dimm-discard.args | 4 +-
.../pci-rom-disabled-invalid.args | 30 +++-
.../pseries-console-native.args | 28 ++-
.../pseries-serial+console-native.args | 28 ++-
.../pseries-serial-compat.args | 28 ++-
.../serial-tcp-tlsx509-chardev-verify.args | 2 +-
.../serial-tcp-tlsx509-chardev.args | 2 +-
.../serial-tcp-tlsx509-secret-chardev.args | 2 +-
.../shmem-plain-doorbell.args | 6 +-
tests/qemuxml2argvdata/user-aliases.args | 8 +-
tests/qemuxml2argvdata/user-aliases2.args | 29 ++-
...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +-
...vhost-user-fs-hugepages.x86_64-latest.args | 2 +-
...host-user-gpu-secondary.x86_64-latest.args | 2 +-
.../vhost-user-vga.x86_64-latest.args | 2 +-
64 files changed, 810 insertions(+), 105 deletions(-)
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default-both.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default-v2.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default-v3.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-both.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-v2.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-v3.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none.args
mode change 120000 => 100644 tests/qemuxml2argvdata/cpu-check-full.args
mode change 120000 => 100644 tests/qemuxml2argvdata/cpu-check-partial.args
mode change 120000 => 100644
tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
mode change 120000 => 100644
tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
mode change 120000 => 100644 tests/qemuxml2argvdata/mach-virt-console-native.args
mode change 120000 => 100644
tests/qemuxml2argvdata/mach-virt-serial+console-native.args
mode change 120000 => 100644 tests/qemuxml2argvdata/mach-virt-serial-compat.args
mode change 120000 => 100644 tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-console-native.args
mode change 120000 => 100644
tests/qemuxml2argvdata/pseries-serial+console-native.args
mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-serial-compat.args
mode change 120000 => 100644 tests/qemuxml2argvdata/user-aliases2.args
diff --git a/src/util/virqemu.c b/src/util/virqemu.c
index c4b6e8b3db..4136012c70 100644
--- a/src/util/virqemu.c
+++ b/src/util/virqemu.c
@@ -336,7 +336,7 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
if (props) {
virBufferAddLit(buf, ",");
- if (virQEMUBuildCommandLineJSON(props, buf, NULL, false,
+ if (virQEMUBuildCommandLineJSON(props, buf, NULL, true,
virQEMUBuildCommandLineJSONArrayBitmap) < 0)
return -1;
}
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args
b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
deleted file mode 120000
index 6209eff4b0..0000000000
--- a/tests/qemuxml2argvdata/aarch64-gic-default-both.args
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-gic-v3.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args
b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
new file mode 100644
index 0000000000..7a3d9e33cf
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name aarch64test \
+-S \
+-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
+-cpu host \
+-m 1024 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,\
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
deleted file mode 120000
index 04ecd4ce76..0000000000
--- a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
new file mode 100644
index 0000000000..997c06fc7f
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name aarch64test \
+-S \
+-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
+-cpu host \
+-m 1024 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,\
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
deleted file mode 120000
index 6209eff4b0..0000000000
--- a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-gic-v3.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
new file mode 100644
index 0000000000..7a3d9e33cf
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name aarch64test \
+-S \
+-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
+-cpu host \
+-m 1024 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,\
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.args
b/tests/qemuxml2argvdata/aarch64-gic-default.args
deleted file mode 120000
index 04ecd4ce76..0000000000
--- a/tests/qemuxml2argvdata/aarch64-gic-default.args
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.args
b/tests/qemuxml2argvdata/aarch64-gic-default.args
new file mode 100644
index 0000000000..997c06fc7f
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name aarch64test \
+-S \
+-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
+-cpu host \
+-m 1024 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,\
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args
b/tests/qemuxml2argvdata/aarch64-gic-none-both.args
deleted file mode 120000
index 6209eff4b0..0000000000
--- a/tests/qemuxml2argvdata/aarch64-gic-none-both.args
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-gic-v3.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args
b/tests/qemuxml2argvdata/aarch64-gic-none-both.args
new file mode 100644
index 0000000000..7a3d9e33cf
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-both.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name aarch64test \
+-S \
+-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
+-cpu host \
+-m 1024 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,\
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
deleted file mode 120000
index 04ecd4ce76..0000000000
--- a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
new file mode 100644
index 0000000000..997c06fc7f
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name aarch64test \
+-S \
+-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
+-cpu host \
+-m 1024 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,\
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
deleted file mode 120000
index 6209eff4b0..0000000000
--- a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-gic-v3.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
new file mode 100644
index 0000000000..7a3d9e33cf
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name aarch64test \
+-S \
+-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
+-cpu host \
+-m 1024 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,\
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.args
b/tests/qemuxml2argvdata/aarch64-gic-none.args
deleted file mode 120000
index 04ecd4ce76..0000000000
--- a/tests/qemuxml2argvdata/aarch64-gic-none.args
+++ /dev/null
@@ -1 +0,0 @@
-aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.args
b/tests/qemuxml2argvdata/aarch64-gic-none.args
new file mode 100644
index 0000000000..997c06fc7f
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-none.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-aarch64test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name aarch64test \
+-S \
+-machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
+-cpu host \
+-m 1024 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,\
+path=/tmp/lib/domain--1-aarch64test/monitor.sock,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi
diff --git a/tests/qemuxml2argvdata/cpu-check-full.args
b/tests/qemuxml2argvdata/cpu-check-full.args
deleted file mode 120000
index e280ccb23d..0000000000
--- a/tests/qemuxml2argvdata/cpu-check-full.args
+++ /dev/null
@@ -1 +0,0 @@
-cpu-check-none.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/cpu-check-full.args
b/tests/qemuxml2argvdata/cpu-check-full.args
new file mode 100644
index 0000000000..835f8b619e
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-check-full.args
@@ -0,0 +1,29 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=kvm,usb=off,dump-guest-core=off \
+-cpu core2duo \
+-m 214 \
+-realtime mlock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/cpu-check-partial.args
b/tests/qemuxml2argvdata/cpu-check-partial.args
deleted file mode 120000
index e280ccb23d..0000000000
--- a/tests/qemuxml2argvdata/cpu-check-partial.args
+++ /dev/null
@@ -1 +0,0 @@
-cpu-check-none.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/cpu-check-partial.args
b/tests/qemuxml2argvdata/cpu-check-partial.args
new file mode 100644
index 0000000000..835f8b619e
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-check-partial.args
@@ -0,0 +1,29 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=kvm,usb=off,dump-guest-core=off \
+-cpu core2duo \
+-m 214 \
+-realtime mlock=off \
+-smp 6,sockets=6,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args
b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index fa029c9314..a0016ac0bd 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -15,11 +15,11 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 16,sockets=2,cores=4,threads=2 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=yes,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=on,\
size=112197632 \
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1,share=no,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1,share=off,\
size=112197632 \
-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
deleted file mode 120000
index 3f4cd9040d..0000000000
--- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
+++ /dev/null
@@ -1 +0,0 @@
-disk-backing-chains-noindex.x86_64-2.12.0.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
new file mode 100644
index 0000000000..0919eedd21
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
@@ -0,0 +1,61 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+-machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-drive 'file=gluster+unix:///Volume2/Image?socket=/path/to/sock,file.debug=4,\
+format=qcow2,if=none,id=drive-virtio-disk0' \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,\
+id=virtio-disk0,bootindex=1 \
+-drive file=nbd:unix:/var/run/nbdsock:exportname=bar,format=qcow2,if=none,\
+id=drive-virtio-disk1 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk1,\
+id=virtio-disk1 \
+-drive file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,\
+if=none,id=drive-virtio-disk2 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk2,\
+id=virtio-disk2 \
+-object secret,id=virtio-disk3-auth-secret0,\
+data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+-drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\
+mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\
+6322,file.password-secret=virtio-disk3-auth-secret0,format=qcow2,if=none,\
+id=drive-virtio-disk3' \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk3,\
+id=virtio-disk3 \
+-drive file=/dev/HostVG/QEMUGuest11,format=qcow2,if=none,id=drive-virtio-disk4 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk4,\
+id=virtio-disk4 \
+-drive file=/var/lib/libvirt/images/rhel7.1484071880,format=qcow2,if=none,\
+id=drive-virtio-disk5 \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk5,\
+id=virtio-disk5 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
deleted file mode 120000
index 549eb65512..0000000000
--- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
+++ /dev/null
@@ -1 +0,0 @@
-disk-backing-chains-noindex.x86_64-latest.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
new file mode 100644
index 0000000000..927b338380
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
@@ -0,0 +1,168 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-i386 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-cpu qemu64 \
+-m 214 \
+-object memory-backend-ram,id=pc.ram,size=224395264 \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-blockdev
'{"driver":"file","filename":"/tmp/missing-backing-store.qcow",\
+"node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-25-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-25-storage"}' \
+-blockdev
'{"driver":"gluster","volume":"Volume2","path":"Image",\
+"server":[{"type":"unix","path":"/path/to/sock"}],"debug":4,\
+"node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-24-format","read-only":false,"driver":"qcow2",\
+"file":"libvirt-24-storage","backing":"libvirt-25-format"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-24-format,\
+id=virtio-disk0,bootindex=1 \
+-blockdev
'{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-KDE.iso",\
+"node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-23-format","read-only":true,"driver":"raw",\
+"file":"libvirt-23-storage"}' \
+-blockdev
'{"driver":"file","filename":"/tmp/image5.qcow",\
+"node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-22-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-22-storage","backing":"libvirt-23-format"}'
\
+-blockdev
'{"driver":"file","filename":"/tmp/image4.qcow",\
+"node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-21-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-21-storage","backing":"libvirt-22-format"}'
\
+-blockdev
'{"driver":"file","filename":"/tmp/image3.qcow",\
+"node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-20-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-20-storage","backing":"libvirt-21-format"}'
\
+-blockdev
'{"driver":"file","filename":"/tmp/image2",\
+"node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-19-format","read-only":true,"driver":"vmdk",\
+"file":"libvirt-19-storage","backing":"libvirt-20-format"}'
\
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\
+"node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-18-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-18-storage","backing":"libvirt-19-format"}'
\
+-blockdev
'{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsock"},\
+"export":"bar","node-name":"libvirt-17-storage","auto-read-only":true,\
+"discard":"unmap"}' \
+-blockdev
'{"node-name":"libvirt-17-format","read-only":false,"driver":"qcow2",\
+"file":"libvirt-17-storage","backing":"libvirt-18-format"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-17-format,\
+id=virtio-disk1 \
+-blockdev
'{"driver":"gluster","volume":"Volume1","path":"Image",\
+"server":[{"type":"inet","host":"example.org","port":"6000"}],"debug":4,\
+"node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-16-format","read-only":false,"driver":"raw",\
+"file":"libvirt-16-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-16-format,\
+id=virtio-disk2 \
+-blockdev
'{"driver":"file","filename":"/tmp/image.qcow",\
+"node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-15-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-15-storage","backing":null}' \
+-object secret,id=libvirt-14-storage-auth-secret0,\
+data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+-blockdev
'{"driver":"rbd","pool":"pool","image":"image",\
+"server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.org",\
+"port":"6322"},{"host":"mon3.example.org","port":"6322"}],"user":"myname",\
+"auth-client-required":["cephx","none"],\
+"key-secret":"libvirt-14-storage-auth-secret0",\
+"node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-14-format","read-only":false,"driver":"qcow2",\
+"file":"libvirt-14-storage","backing":"libvirt-15-format"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-14-format,\
+id=virtio-disk3 \
+-blockdev
'{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest11",\
+"node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-13-format","read-only":false,"driver":"qcow2",\
+"file":"libvirt-13-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-13-format,\
+id=virtio-disk4 \
+-blockdev
'{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.qcow2",\
+"node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-12-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-12-storage","backing":null}' \
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1483536402",\
+"node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-11-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-11-storage","backing":"libvirt-12-format"}'
\
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1483545313",\
+"node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-10-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-10-storage","backing":"libvirt-11-format"}'
\
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1483545901",\
+"node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-9-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-9-storage","backing":"libvirt-10-format"}'
\
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1483546244",\
+"node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-8-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-8-storage","backing":"libvirt-9-format"}'
\
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1483605920",\
+"node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-7-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-7-storage","backing":"libvirt-8-format"}'
\
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1483605924",\
+"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-6-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-6-storage","backing":"libvirt-7-format"}'
\
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1483615252",\
+"node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-5-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-5-storage","backing":"libvirt-6-format"}'
\
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1484071872",\
+"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-4-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-4-storage","backing":"libvirt-5-format"}'
\
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1484071876",\
+"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-3-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-3-storage","backing":"libvirt-4-format"}'
\
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1484071877",\
+"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow2",\
+"file":"libvirt-2-storage","backing":"libvirt-3-format"}'
\
+-blockdev '{"driver":"file",\
+"filename":"/var/lib/libvirt/images/rhel7.1484071880",\
+"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'
\
+-blockdev
'{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\
+"file":"libvirt-1-storage","backing":"libvirt-2-format"}'
\
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-1-format,\
+id=virtio-disk5 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args
index a97c7398ce..e9cb35f64a 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-2.12.0.args
@@ -32,7 +32,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objvirtio-disk3_tls0,dir=/etc/pki/libvirt-nbd/dummy,,\
-path,endpoint=client,verify-peer=yes,passwordid=objvirtio-disk3_tls0-secret0 \
+path,endpoint=client,verify-peer=on,passwordid=objvirtio-disk3_tls0-secret0 \
-drive file.driver=nbd,file.server.type=inet,file.server.host=example.com,\
file.server.port=1234,file.tls-creds=objvirtio-disk3_tls0,format=raw,if=none,\
id=drive-virtio-disk3,cache=none \
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args
index 24cebfe6a4..008bb1093d 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args
@@ -33,7 +33,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objlibvirt-1-storage_tls0,\
-dir=/etc/pki/libvirt-nbd/dummy,,path,endpoint=client,verify-peer=yes,\
+dir=/etc/pki/libvirt-nbd/dummy,,path,endpoint=client,verify-peer=on,\
passwordid=objlibvirt-1-storage_tls0-secret0 \
-blockdev
'{"driver":"nbd","server":{"type":"inet","host":"example.com",\
"port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0",\
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args
index e703875e35..47000d2d4b 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-2.12.0.args
@@ -32,7 +32,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objvirtio-disk0_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\
-,path,endpoint=client,verify-peer=yes,passwordid=objvirtio-disk0_tls0-secret0 \
+,path,endpoint=client,verify-peer=on,passwordid=objvirtio-disk0_tls0-secret0 \
-drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\
file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\
file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\
@@ -44,7 +44,7 @@ serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\
-,path,endpoint=client,verify-peer=yes,passwordid=objvirtio-disk1_tls0-secret0 \
+,path,endpoint=client,verify-peer=on,passwordid=objvirtio-disk1_tls0-secret0 \
-drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\
file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,\
file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
index 7096aa935f..ec215c6904 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-5.0.0.args
@@ -32,7 +32,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objlibvirt-3-storage_tls0,\
-dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=yes,\
+dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=on,\
passwordid=objlibvirt-3-storage_tls0-secret0 \
-blockdev
'{"driver":"vxhs","tls-creds":"objlibvirt-3-storage_tls0",\
"vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc251",\
@@ -49,7 +49,7 @@ serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objlibvirt-2-storage_tls0,\
-dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=yes,\
+dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=on,\
passwordid=objlibvirt-2-storage_tls0-secret0 \
-blockdev
'{"driver":"vxhs","tls-creds":"objlibvirt-2-storage_tls0",\
"vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc252",\
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
index a31efccd00..259f9ba575 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
@@ -32,7 +32,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objvirtio-disk0_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\
-,path,endpoint=client,verify-peer=yes,passwordid=objvirtio-disk0_tls0-secret0 \
+,path,endpoint=client,verify-peer=on,passwordid=objvirtio-disk0_tls0-secret0 \
-drive file.driver=vxhs,file.tls-creds=objvirtio-disk0_tls0,\
file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\
file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,\
@@ -44,7 +44,7 @@ serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objvirtio-disk1_tls0,dir=/etc/pki/libvirt-vxhs/dummy,\
-,path,endpoint=client,verify-peer=yes,passwordid=objvirtio-disk1_tls0-secret0 \
+,path,endpoint=client,verify-peer=on,passwordid=objvirtio-disk1_tls0-secret0 \
-drive file.driver=vxhs,file.tls-creds=objvirtio-disk1_tls0,\
file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc252,\
file.server.host=192.168.0.2,file.server.port=9999,format=raw,if=none,\
@@ -60,7 +60,7 @@
id=virtio-disk2,write-cache=on,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objvirtio-disk3_tls0,dir=/etc/pki/libvirt-nbd/dummy,,\
-path,endpoint=client,verify-peer=yes,passwordid=objvirtio-disk3_tls0-secret0 \
+path,endpoint=client,verify-peer=on,passwordid=objvirtio-disk3_tls0-secret0 \
-drive file.driver=nbd,file.server.type=inet,file.server.host=example.com,\
file.server.port=1234,file.tls-creds=objvirtio-disk3_tls0,format=raw,if=none,\
id=drive-virtio-disk3,cache=none \
diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
index 6dc82878e8..4ac7e270d4 100644
--- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
@@ -32,7 +32,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objlibvirt-4-storage_tls0,\
-dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=yes,\
+dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=on,\
passwordid=objlibvirt-4-storage_tls0-secret0 \
-blockdev
'{"driver":"vxhs","tls-creds":"objlibvirt-4-storage_tls0",\
"vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc251",\
@@ -49,7 +49,7 @@ serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objlibvirt-3-storage_tls0,\
-dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=yes,\
+dir=/etc/pki/libvirt-vxhs/dummy,,path,endpoint=client,verify-peer=on,\
passwordid=objlibvirt-3-storage_tls0-secret0 \
-blockdev
'{"driver":"vxhs","tls-creds":"objlibvirt-3-storage_tls0",\
"vdisk-id":"eb90327c-8302-4725-9e1b-4e85ed4dc252",\
@@ -74,7 +74,7 @@
id=virtio-disk2,write-cache=on,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252 \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objlibvirt-1-storage_tls0,\
-dir=/etc/pki/libvirt-nbd/dummy,,path,endpoint=client,verify-peer=yes,\
+dir=/etc/pki/libvirt-nbd/dummy,,path,endpoint=client,verify-peer=on,\
passwordid=objlibvirt-1-storage_tls0-secret0 \
-blockdev
'{"driver":"nbd","server":{"type":"inet","host":"example.com",\
"port":"1234"},"tls-creds":"objlibvirt-1-storage_tls0",\
diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
index 6432632d03..7918e38bc3 100644
--- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
@@ -15,8 +15,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \
-cpu qemu64 \
-m 214 \
--object memory-backend-memfd,id=pc.ram,share=yes,\
-x-use-canonical-path-for-ramblock-id=no,size=224395264 \
+-object memory-backend-memfd,id=pc.ram,share=on,\
+x-use-canonical-path-for-ramblock-id=off,size=224395264 \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index c9699d75c4..5bc00e36ff 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 8,sockets=1,cores=8,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=yes,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=on,\
size=15032385536 \
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index 2ec070c5a5..7b77e3d528 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -16,11 +16,11 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 20,sockets=1,cores=8,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=no,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=off,\
size=15032385536 \
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=yes,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=on,\
size=15032385536 \
-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index a62dcbcc60..0ee7b2e33a 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -16,15 +16,15 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 32,sockets=1,cores=24,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=yes,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=on,\
size=15032385536 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=yes,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=on,\
size=15032385536 \
-numa node,nodeid=1,cpus=2-3,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node2,share=no,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node2,share=off,\
size=15032385536 \
-numa node,nodeid=2,cpus=4-5,memdev=ram-node2 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
index eb0df17eda..c16e3e3ef4 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -33,7 +33,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=vnc-tls-creds0,dir=/etc/pki/libvirt-vnc,\
-endpoint=server,verify-peer=yes,passwordid=vnc-tls-creds0-secret0 \
+endpoint=server,verify-peer=on,passwordid=vnc-tls-creds0-secret0 \
-vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
index 1c4b948b97..31112ce85d 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
@@ -30,7 +30,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-object tls-creds-x509,id=vnc-tls-creds0,dir=/etc/pki/libvirt-vnc,\
-endpoint=server,verify-peer=yes \
+endpoint=server,verify-peer=on \
-vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args
b/tests/qemuxml2argvdata/hugepages-memaccess.args
index 3b062640e6..76ccf6b026 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -15,23 +15,23 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,\
size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,\
size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,\
size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
-object memory-backend-file,id=ram-node3,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,\
size=1073741824,host-nodes=3,policy=bind \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-object memory-backend-file,id=memdimm0,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,\
size=536870912,host-nodes=0-3,policy=bind \
-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args
b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index 6f71c26f6c..9622b2dbc5 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -15,23 +15,23 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=no,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=off,\
size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,\
size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2,share=no,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node2,share=off,\
size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
-object memory-backend-file,id=ram-node3,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=no,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node3,share=off,\
size=1073741824,host-nodes=3,policy=bind \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-object memory-backend-file,id=memdimm0,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,\
size=536870912,host-nodes=0-3,policy=bind \
-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
index d78b2185a8..1372612e27 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args
@@ -19,8 +19,8 @@
arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,\
rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \
-m 4096 \
-object memory-backend-file,id=pc.ram,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-fedora,share=yes,\
-x-use-canonical-path-for-ramblock-id=no,prealloc=yes,size=4294967296 \
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-fedora,share=on,\
+x-use-canonical-path-for-ramblock-id=off,prealloc=on,size=4294967296 \
-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
index 916d6361a0..1c7a8cc803 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-object memory-backend-ram,id=ram-node0,size=268435456 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,prealloc=yes,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-SomeDummyHugepagesGu,prealloc=on,\
size=805306368 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
index b20469828d..6c8fd30c4c 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
@@ -15,19 +15,19 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,\
size=1073741824 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,\
size=1073741824 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,\
size=1073741824 \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
-object memory-backend-file,id=ram-node3,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,\
size=1073741824 \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
index a7d1ed9d4e..0b0a99cfd7 100644
--- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
@@ -18,11 +18,11 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-overcommit mem-lock=off \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,\
size=1073741824 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
--object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=yes,\
-prealloc=yes,size=536870912 \
+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=on,\
+prealloc=on,size=536870912 \
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args
b/tests/qemuxml2argvdata/hugepages-shared.args
index 3cffa37dad..b5dcde82e3 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -15,19 +15,19 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,\
size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,\
size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,\
size=1073741824,host-nodes=0-3,policy=bind \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
-object memory-backend-file,id=ram-node3,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,\
size=1073741824,host-nodes=3,policy=bind \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args
b/tests/qemuxml2argvdata/mach-virt-console-native.args
deleted file mode 120000
index c7abf01bd6..0000000000
--- a/tests/qemuxml2argvdata/mach-virt-console-native.args
+++ /dev/null
@@ -1 +0,0 @@
-mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args
b/tests/qemuxml2argvdata/mach-virt-console-native.args
new file mode 100644
index 0000000000..89b82ab32d
--- /dev/null
+++ b/tests/qemuxml2argvdata/mach-virt-console-native.args
@@ -0,0 +1,28 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name guest \
+-S \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-m 512 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-chardev pty,id=charserial0 \
+-serial chardev:charserial0
diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
deleted file mode 120000
index c7abf01bd6..0000000000
--- a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
+++ /dev/null
@@ -1 +0,0 @@
-mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
new file mode 100644
index 0000000000..89b82ab32d
--- /dev/null
+++ b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
@@ -0,0 +1,28 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name guest \
+-S \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-m 512 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-chardev pty,id=charserial0 \
+-serial chardev:charserial0
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args
b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
deleted file mode 120000
index c7abf01bd6..0000000000
--- a/tests/qemuxml2argvdata/mach-virt-serial-compat.args
+++ /dev/null
@@ -1 +0,0 @@
-mach-virt-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args
b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
new file mode 100644
index 0000000000..89b82ab32d
--- /dev/null
+++ b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
@@ -0,0 +1,28 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name guest \
+-S \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off \
+-m 512 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-chardev pty,id=charserial0 \
+-serial chardev:charserial0
diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
index 6a57f31d79..77a5ac0788 100644
--- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
@@ -17,8 +17,8 @@ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
-m 14336 \
-overcommit mem-lock=off \
-smp 8,sockets=1,dies=1,cores=8,threads=1 \
--object memory-backend-memfd,id=ram-node0,hugetlb=yes,hugetlbsize=2097152,\
-share=yes,prealloc=yes,size=15032385536,host-nodes=3,policy=preferred \
+-object memory-backend-memfd,id=ram-node0,hugetlb=on,hugetlbsize=2097152,\
+share=on,prealloc=on,size=15032385536,host-nodes=3,policy=preferred \
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
-display none \
diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
index 6a57f31d79..77a5ac0788 100644
--- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
@@ -17,8 +17,8 @@ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
-m 14336 \
-overcommit mem-lock=off \
-smp 8,sockets=1,dies=1,cores=8,threads=1 \
--object memory-backend-memfd,id=ram-node0,hugetlb=yes,hugetlbsize=2097152,\
-share=yes,prealloc=yes,size=15032385536,host-nodes=3,policy=preferred \
+-object memory-backend-memfd,id=ram-node0,hugetlb=on,hugetlbsize=2097152,\
+share=on,prealloc=on,size=15032385536,host-nodes=3,policy=preferred \
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
-display none \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index f52518a4f0..09bb346a38 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=214 \
-object memory-backend-file,id=memdimm0,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,\
size=536870912,host-nodes=1-3,policy=bind \
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
-object memory-backend-ram,id=memdimm2,size=536870912 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index ccd80845d8..aa17026079 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DRV=none \
-object memory-backend-ram,id=memdimm0,size=536870912 \
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
-object memory-backend-file,id=memdimm1,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=yes,\
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,\
size=536870912,host-nodes=1-3,policy=bind \
-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
index 63fec07e9d..b4be9f77e5 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
@@ -19,8 +19,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=224395264 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
--object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\
-prealloc=yes,size=536870912 \
+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,\
+prealloc=on,size=536870912 \
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
index f088f65735..1094d2ffec 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
@@ -19,8 +19,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=224395264 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
--object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\
-prealloc=yes,size=536870912,align=2097152 \
+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,\
+prealloc=on,size=536870912,align=2097152 \
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
index 6309953812..35cbd0e4dc 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
@@ -19,8 +19,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=224395264 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
--object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\
-prealloc=yes,size=536870912 \
+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,\
+prealloc=on,size=536870912 \
-device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
index 35895914b2..c1b38fc466 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
@@ -19,8 +19,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=224395264 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
--object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\
-size=536870912,pmem=yes \
+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,\
+size=536870912,pmem=on \
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
index e059194fac..1df12e21d6 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=1024 \
--object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=yes,\
+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,\
size=537001984 \
-device nvdimm,node=0,label-size=131072,\
uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
index e059194fac..1df12e21d6 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-realtime mlock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=1024 \
--object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=yes,\
+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,\
size=537001984 \
-device nvdimm,node=0,label-size=131072,\
uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
index be88fb6007..490d4c4b1c 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
@@ -19,8 +19,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=224395264 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
--object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\
-prealloc=yes,size=536870912 \
+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=off,\
+prealloc=on,size=536870912 \
-device nvdimm,node=0,unarmed=on,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
index 571e0b3d50..2cc62be1fa 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
@@ -19,7 +19,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-smp 2,sockets=2,dies=1,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=1073741824 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
--object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=yes,\
+-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,\
size=536870912 \
-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
index 3c4aff806f..066371d6d7 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
@@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-object memory-backend-ram,id=ram-node0,size=2145386496 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-object memory-backend-file,id=memvirtiopmem0,mem-path=/tmp/virtio_pmem,\
-share=yes,size=536870912 \
+share=on,size=536870912 \
-device virtio-pmem-pci,memdev=memvirtiopmem0,id=virtiopmem0,bus=pci.0,\
addr=0x5 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args
b/tests/qemuxml2argvdata/pages-dimm-discard.args
index c1c00fe2ed..6465ba1cb6 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -16,11 +16,11 @@ QEMU_AUDIO_DRV=none \
-smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=1024 \
-object memory-backend-file,id=memdimm0,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=yes,size=1073741824,\
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,prealloc=on,size=1073741824,\
host-nodes=1-3,policy=bind \
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
-object memory-backend-file,id=memdimm1,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=yes,share=no,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=on,share=off,\
size=536870912 \
-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
deleted file mode 120000
index 0dffe3c624..0000000000
--- a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
+++ /dev/null
@@ -1 +0,0 @@
-pci-rom-disabled.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
new file mode 100644
index 0000000000..4eb57617fb
--- /dev/null
+++ b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
@@ -0,0 +1,29 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-x86_64 \
+-name guest \
+-S \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-netdev user,id=hostnet0 \
+-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,\
+addr=0x3,romfile=
diff --git a/tests/qemuxml2argvdata/pseries-console-native.args
b/tests/qemuxml2argvdata/pseries-console-native.args
deleted file mode 120000
index 1c09cf2102..0000000000
--- a/tests/qemuxml2argvdata/pseries-console-native.args
+++ /dev/null
@@ -1 +0,0 @@
-pseries-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/pseries-console-native.args
b/tests/qemuxml2argvdata/pseries-console-native.args
new file mode 100644
index 0000000000..04c4753697
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-console-native.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-ppc64 \
+-name guest \
+-S \
+-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
+-m 512 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-chardev pty,id=charserial0 \
+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000
diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.args
b/tests/qemuxml2argvdata/pseries-serial+console-native.args
deleted file mode 120000
index 1c09cf2102..0000000000
--- a/tests/qemuxml2argvdata/pseries-serial+console-native.args
+++ /dev/null
@@ -1 +0,0 @@
-pseries-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.args
b/tests/qemuxml2argvdata/pseries-serial+console-native.args
new file mode 100644
index 0000000000..04c4753697
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-serial+console-native.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-ppc64 \
+-name guest \
+-S \
+-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
+-m 512 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-chardev pty,id=charserial0 \
+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000
diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.args
b/tests/qemuxml2argvdata/pseries-serial-compat.args
deleted file mode 120000
index 1c09cf2102..0000000000
--- a/tests/qemuxml2argvdata/pseries-serial-compat.args
+++ /dev/null
@@ -1 +0,0 @@
-pseries-serial-native.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.args
b/tests/qemuxml2argvdata/pseries-serial-compat.args
new file mode 100644
index 0000000000..04c4753697
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-serial-compat.args
@@ -0,0 +1,27 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-guest \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-ppc64 \
+-name guest \
+-S \
+-machine pseries,accel=tcg,usb=off,dump-guest-core=off \
+-m 512 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-chardev pty,id=charserial0 \
+-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index 486d1ace09..4536a63f9b 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -31,7 +31,7 @@ server=on,wait=off \
localport=1111 \
-device isa-serial,chardev=charserial0,id=serial0 \
-object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
-endpoint=client,verify-peer=yes \
+endpoint=client,verify-peer=on \
-chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
tls-creds=objcharserial1_tls0 \
-device isa-serial,chardev=charserial1,id=serial1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index 486d1ace09..4536a63f9b 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -31,7 +31,7 @@ server=on,wait=off \
localport=1111 \
-device isa-serial,chardev=charserial0,id=serial0 \
-object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
-endpoint=client,verify-peer=yes \
+endpoint=client,verify-peer=on \
-chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
tls-creds=objcharserial1_tls0 \
-device isa-serial,chardev=charserial1,id=serial1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
index 9d199240a2..72073f1fac 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
@@ -36,7 +36,7 @@ localport=1111 \
data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
-endpoint=client,verify-peer=yes,passwordid=charserial1-secret0 \
+endpoint=client,verify-peer=on,passwordid=charserial1-secret0 \
-chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
tls-creds=objcharserial1_tls0 \
-device isa-serial,chardev=charserial1,id=serial1 \
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index a5d8626617..433992c143 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -26,14 +26,14 @@ server=on,wait=off \
-no-acpi \
-usb \
-object memory-backend-file,id=shmmem-shmem0,mem-path=/dev/shm/shmem0,\
-size=4194304,share=yes \
+size=4194304,share=on \
-device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x3 \
-object memory-backend-file,id=shmmem-shmem1,mem-path=/dev/shm/shmem1,\
-size=134217728,share=yes \
+size=134217728,share=on \
-device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,master=off,bus=pci.0,\
addr=0x5 \
-object memory-backend-file,id=shmmem-shmem2,mem-path=/dev/shm/shmem2,\
-size=268435456,share=yes \
+size=268435456,share=on \
-device ivshmem-plain,id=shmem2,memdev=shmmem-shmem2,master=on,bus=pci.0,\
addr=0x4 \
-device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,\
diff --git a/tests/qemuxml2argvdata/user-aliases.args
b/tests/qemuxml2argvdata/user-aliases.args
index 9b574d9a30..d3570e5485 100644
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -17,16 +17,16 @@ file=/tmp/lib/domain--1-gentoo/master-key.aes \
-realtime mlock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=yes,size=1073741824 \
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=on,size=1073741824 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-object memory-backend-file,id=ram-node1,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=yes,size=1073741824 \
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=on,size=1073741824 \
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
-object memory-backend-file,id=ram-node2,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=yes,size=1073741824 \
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=on,size=1073741824 \
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
-object memory-backend-file,id=ram-node3,\
-mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=yes,size=1073741824 \
+mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=on,size=1073741824 \
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
-uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/user-aliases2.args
b/tests/qemuxml2argvdata/user-aliases2.args
deleted file mode 120000
index d63573a9a5..0000000000
--- a/tests/qemuxml2argvdata/user-aliases2.args
+++ /dev/null
@@ -1 +0,0 @@
-boot-floppy-q35.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/user-aliases2.args
b/tests/qemuxml2argvdata/user-aliases2.args
new file mode 100644
index 0000000000..4d975e4e39
--- /dev/null
+++ b/tests/qemuxml2argvdata/user-aliases2.args
@@ -0,0 +1,28 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest1 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-x86_64 \
+-name QEMUGuest1 \
+-S \
+-machine pc-q35-2.4,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \
+-device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1
diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
index bf44d34cae..3ff0d5a96b 100644
--- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
@@ -18,7 +18,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/var/lib/libvirt/qemu/ram/-1-guest/ram-node0,share=yes,\
+mem-path=/var/lib/libvirt/qemu/ram/-1-guest/ram-node0,share=on,\
size=15032385536 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
index fb086f00aa..77d712c378 100644
--- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
@@ -18,7 +18,7 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-object memory-backend-file,id=ram-node0,\
-mem-path=/dev/hugepages2M/libvirt/qemu/-1-guest,share=yes,prealloc=yes,\
+mem-path=/dev/hugepages2M/libvirt/qemu/-1-guest,share=on,prealloc=on,\
size=2147483648 \
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
index 49298aaccc..2fe44aae49 100644
--- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
@@ -17,7 +17,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-m 214 \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
--object memory-backend-memfd,id=ram-node0,share=yes,size=224395264 \
+-object memory-backend-memfd,id=ram-node0,share=on,size=224395264 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
index 2899fcb86d..9911c345c1 100644
--- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
@@ -17,7 +17,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-m 214 \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
--object memory-backend-memfd,id=ram-node0,share=yes,size=224395264 \
+-object memory-backend-memfd,id=ram-node0,share=on,size=224395264 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
--
2.29.2
2:21 p.m.
New subject: [libvirt PATCH 3/5] qemu: use on|off instead of yes|no for -object boolean properties
On Tue, Feb 16, 2021 at 12:57:03 +0000, Daniel Berrange wrote:
QEMU has long accepted many different values for boolean properties,
but
set accepted has been different depending on which QEMU parser you hit.
The on|off values were supported by all QEMU parsers. The yes|no, y|n,
true|false values were only partially supported:
https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg01012.html
Thus we should standardize on on|off everywhere since that is most
widely supported in QEMU.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
[...]
mode change 120000 => 100644
tests/qemuxml2argvdata/aarch64-gic-default-both.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default-v2.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default-v3.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-both.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-v2.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-v3.args
mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none.args
mode change 120000 => 100644 tests/qemuxml2argvdata/cpu-check-full.args
mode change 120000 => 100644 tests/qemuxml2argvdata/cpu-check-partial.args
mode change 120000 => 100644
tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
mode change 120000 => 100644
tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
mode change 120000 => 100644 tests/qemuxml2argvdata/mach-virt-console-native.args
mode change 120000 => 100644
tests/qemuxml2argvdata/mach-virt-serial+console-native.args
mode change 120000 => 100644 tests/qemuxml2argvdata/mach-virt-serial-compat.args
mode change 120000 => 100644 tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-console-native.args
mode change 120000 => 100644
tests/qemuxml2argvdata/pseries-serial+console-native.args
mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-serial-compat.args
mode change 120000 => 100644 tests/qemuxml2argvdata/user-aliases2.args
Any particular reason why these are converted from symlink to full file?
2:26 p.m.
New subject: [libvirt PATCH 3/5] qemu: use on|off instead of yes|no for -object boolean properties
On Tue, Feb 16, 2021 at 02:21:56PM +0100, Peter Krempa wrote:
On Tue, Feb 16, 2021 at 12:57:03 +0000, Daniel Berrange wrote:
> QEMU has long accepted many different values for boolean properties, but
> set accepted has been different depending on which QEMU parser you hit.
>
> The on|off values were supported by all QEMU parsers. The yes|no, y|n,
> true|false values were only partially supported:
>
> https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg01012.html
>
> Thus we should standardize on on|off everywhere since that is most
> widely supported in QEMU.
>
> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> ---
[...]
> mode change 120000 => 100644
tests/qemuxml2argvdata/aarch64-gic-default-both.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default-v2.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default-v3.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-both.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-v2.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-v3.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/cpu-check-full.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/cpu-check-partial.args
> mode change 120000 => 100644
tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
> mode change 120000 => 100644
tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
> mode change 120000 => 100644
tests/qemuxml2argvdata/mach-virt-console-native.args
> mode change 120000 => 100644
tests/qemuxml2argvdata/mach-virt-serial+console-native.args
> mode change 120000 => 100644
tests/qemuxml2argvdata/mach-virt-serial-compat.args
> mode change 120000 => 100644
tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-console-native.args
> mode change 120000 => 100644
tests/qemuxml2argvdata/pseries-serial+console-native.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/pseries-serial-compat.args
> mode change 120000 => 100644 tests/qemuxml2argvdata/user-aliases2.args
Any particular reason why these are converted from symlink to full file?
Urgh, yet again. I hate these symlinks :=(
It happens whenever you do a in-place search-replace with sed/perl/etc
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
2:29 p.m.
New subject: [libvirt PATCH 3/5] qemu: use on|off instead of yes|no for -object boolean properties
On Tue, Feb 16, 2021 at 13:26:38 +0000, Daniel Berrange wrote:
On Tue, Feb 16, 2021 at 02:21:56PM +0100, Peter Krempa wrote:
> On Tue, Feb 16, 2021 at 12:57:03 +0000, Daniel Berrange wrote:
> > QEMU has long accepted many different values for boolean properties, but
> > set accepted has been different depending on which QEMU parser you hit.
> >
> > The on|off values were supported by all QEMU parsers. The yes|no, y|n,
> > true|false values were only partially supported:
> >
> > https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg01012.html
> >
> > Thus we should standardize on on|off everywhere since that is most
> > widely supported in QEMU.
> >
> > Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
> > ---
>
> [...]
>
> > mode change 120000 => 100644
tests/qemuxml2argvdata/aarch64-gic-default-both.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/aarch64-gic-default-v2.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/aarch64-gic-default-v3.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/aarch64-gic-default.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/aarch64-gic-none-both.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/aarch64-gic-none-v2.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/aarch64-gic-none-v3.args
> > mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none.args
> > mode change 120000 => 100644 tests/qemuxml2argvdata/cpu-check-full.args
> > mode change 120000 => 100644 tests/qemuxml2argvdata/cpu-check-partial.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/mach-virt-console-native.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/mach-virt-serial+console-native.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/mach-virt-serial-compat.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/pseries-console-native.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/pseries-serial+console-native.args
> > mode change 120000 => 100644
tests/qemuxml2argvdata/pseries-serial-compat.args
> > mode change 120000 => 100644 tests/qemuxml2argvdata/user-aliases2.args
>
> Any particular reason why these are converted from symlink to full file?
Urgh, yet again. I hate these symlinks :=(
It happens whenever you do a in-place search-replace with sed/perl/etc
Yup. in this case VIR_TEST_REGENERATE_OUTPUT=1 does the right thing
actually.
1:57 p.m.
New subject: [libvirt PATCH 4/5] qemu: use on|off instead of yes|no for -drive boolean properties
QEMU has long accepted many different values for boolean properties, but
set accepted has been different depending on which QEMU parser you hit.
The on|off values were supported by all QEMU parsers. The yes|no, y|n,
true|false values were only partially supported:
https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg01012.html
Thus we should standardize on on|off everywhere since that is most
widely supported in QEMU.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/util/virqemu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virqemu.c b/src/util/virqemu.c
index 4136012c70..5b0dc25bc1 100644
--- a/src/util/virqemu.c
+++ b/src/util/virqemu.c
@@ -362,7 +362,7 @@ virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr srcdef)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
- if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL, false,
+ if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL, true,
virQEMUBuildCommandLineJSONArrayNumbered) < 0)
return NULL;
--
2.29.2
1:57 p.m.
New subject: [libvirt PATCH 5/5] qemu: remove support for generating yes|no boolean options
All callers are now using the on|off syntax, so yes|no is a unreachable
code path.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/util/virqemu.c | 50 +++++++++++++------------------------
src/util/virqemu.h | 10 +++-----
tests/qemucommandutiltest.c | 10 ++++----
3 files changed, 25 insertions(+), 45 deletions(-)
diff --git a/src/util/virqemu.c b/src/util/virqemu.c
index 5b0dc25bc1..57ee42dd16 100644
--- a/src/util/virqemu.c
+++ b/src/util/virqemu.c
@@ -37,7 +37,6 @@ struct virQEMUCommandLineJSONIteratorData {
const char *prefix;
virBufferPtr buf;
const char *skipKey;
- bool onOff;
virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc;
};
@@ -47,7 +46,6 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
virJSONValuePtr value,
virBufferPtr buf,
const char *skipKey,
- bool onOff,
virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc,
bool nested);
@@ -57,8 +55,7 @@ int
virQEMUBuildCommandLineJSONArrayBitmap(const char *key,
virJSONValuePtr array,
virBufferPtr buf,
- const char *skipKey G_GNUC_UNUSED,
- bool onOff G_GNUC_UNUSED)
+ const char *skipKey G_GNUC_UNUSED)
{
ssize_t pos = -1;
ssize_t end;
@@ -87,8 +84,7 @@ int
virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
virJSONValuePtr array,
virBufferPtr buf,
- const char *skipKey,
- bool onOff)
+ const char *skipKey)
{
virJSONValuePtr member;
size_t i;
@@ -99,7 +95,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
member = virJSONValueArrayGet((virJSONValuePtr) array, i);
prefix = g_strdup_printf("%s.%zu", key, i);
- if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKey, onOff,
+ if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKey,
virQEMUBuildCommandLineJSONArrayNumbered,
true) < 0)
return 0;
@@ -125,8 +121,7 @@ static int
virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key,
virJSONValuePtr array,
virBufferPtr buf,
- const char *skipKey G_GNUC_UNUSED,
- bool onOff G_GNUC_UNUSED)
+ const char *skipKey G_GNUC_UNUSED)
{
g_auto(virBuffer) tmp = VIR_BUFFER_INITIALIZER;
size_t i;
@@ -163,11 +158,11 @@ virQEMUBuildCommandLineJSONIterate(const char *key,
tmpkey = g_strdup_printf("%s.%s", data->prefix, key);
return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf,
- data->skipKey, data->onOff,
+ data->skipKey,
data->arrayFunc, false);
} else {
return virQEMUBuildCommandLineJSONRecurse(key, value, data->buf,
- data->skipKey, data->onOff,
+ data->skipKey,
data->arrayFunc, false);
}
}
@@ -178,11 +173,10 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
virJSONValuePtr value,
virBufferPtr buf,
const char *skipKey,
- bool onOff,
virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc,
bool nested)
{
- struct virQEMUCommandLineJSONIteratorData data = { key, buf, skipKey, onOff,
arrayFunc };
+ struct virQEMUCommandLineJSONIteratorData data = { key, buf, skipKey, arrayFunc };
virJSONType type = virJSONValueGetType(value);
virJSONValuePtr elem;
bool tmp;
@@ -207,18 +201,10 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
case VIR_JSON_TYPE_BOOLEAN:
virJSONValueGetBoolean(value, &tmp);
- if (onOff) {
- if (tmp)
- virBufferAsprintf(buf, "%s=on,", key);
- else
- virBufferAsprintf(buf, "%s=off,", key);
- } else {
- if (tmp)
- virBufferAsprintf(buf, "%s=yes,", key);
- else
- virBufferAsprintf(buf, "%s=no,", key);
- }
-
+ if (tmp)
+ virBufferAsprintf(buf, "%s=on,", key);
+ else
+ virBufferAsprintf(buf, "%s=off,", key);
break;
case VIR_JSON_TYPE_ARRAY:
@@ -229,7 +215,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
return -1;
}
- if (!arrayFunc || arrayFunc(key, value, buf, skipKey, onOff) < 0) {
+ if (!arrayFunc || arrayFunc(key, value, buf, skipKey) < 0) {
/* fallback, treat the array as a non-bitmap, adding the key
* for each member */
for (i = 0; i < virJSONValueArraySize(value); i++) {
@@ -237,7 +223,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
/* recurse to avoid duplicating code */
if (virQEMUBuildCommandLineJSONRecurse(key, elem, buf, skipKey,
- onOff, arrayFunc, true) < 0)
+ arrayFunc, true) < 0)
return -1;
}
}
@@ -265,7 +251,6 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
* @value: json object containing the value
* @buf: otuput buffer
* @skipKey: name of key that will be handled separately by caller
- * @onOff: Use 'on' and 'off' for boolean values rather than
'yes' and 'no'
* @arrayFunc: array formatter function to allow for different syntax
*
* Formats JSON value object into command line parameters suitable for use with
@@ -277,10 +262,9 @@ int
virQEMUBuildCommandLineJSON(virJSONValuePtr value,
virBufferPtr buf,
const char *skipKey,
- bool onOff,
virQEMUBuildCommandLineJSONArrayFormatFunc array)
{
- if (virQEMUBuildCommandLineJSONRecurse(NULL, value, buf, skipKey, onOff, array,
false) < 0)
+ if (virQEMUBuildCommandLineJSONRecurse(NULL, value, buf, skipKey, array, false) <
0)
return -1;
virBufferTrim(buf, ",");
@@ -311,7 +295,7 @@ virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props,
virBufferAsprintf(&buf, "%s,", type);
- if (virQEMUBuildCommandLineJSON(props, &buf, "type", true,
+ if (virQEMUBuildCommandLineJSON(props, &buf, "type",
virQEMUBuildCommandLineJSONArrayObjectsStr) < 0)
return NULL;
@@ -336,7 +320,7 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
if (props) {
virBufferAddLit(buf, ",");
- if (virQEMUBuildCommandLineJSON(props, buf, NULL, true,
+ if (virQEMUBuildCommandLineJSON(props, buf, NULL,
virQEMUBuildCommandLineJSONArrayBitmap) < 0)
return -1;
}
@@ -362,7 +346,7 @@ virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr srcdef)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
- if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL, true,
+ if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL,
virQEMUBuildCommandLineJSONArrayNumbered) < 0)
return NULL;
diff --git a/src/util/virqemu.h b/src/util/virqemu.h
index b81efc765f..849b7df0c2 100644
--- a/src/util/virqemu.h
+++ b/src/util/virqemu.h
@@ -29,23 +29,19 @@
typedef int (*virQEMUBuildCommandLineJSONArrayFormatFunc)(const char *key,
virJSONValuePtr array,
virBufferPtr buf,
- const char *skipKey,
- bool onOff);
+ const char *skipKey);
int virQEMUBuildCommandLineJSONArrayBitmap(const char *key,
virJSONValuePtr array,
virBufferPtr buf,
- const char *skipKey,
- bool onOff);
+ const char *skipKey);
int virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
virJSONValuePtr array,
virBufferPtr buf,
- const char *skipKey,
- bool onOff);
+ const char *skipKey);
int virQEMUBuildCommandLineJSON(virJSONValuePtr value,
virBufferPtr buf,
const char *skipKey,
- bool onOff,
virQEMUBuildCommandLineJSONArrayFormatFunc array);
char *
diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c
index 305f59e76b..6291c3b787 100644
--- a/tests/qemucommandutiltest.c
+++ b/tests/qemucommandutiltest.c
@@ -47,7 +47,7 @@ testQemuCommandBuildFromJSON(const void *opaque)
return -1;
}
- if (virQEMUBuildCommandLineJSON(val, &buf, NULL, false, data->arrayfunc) <
0) {
+ if (virQEMUBuildCommandLineJSON(val, &buf, NULL, data->arrayfunc) < 0) {
fprintf(stderr,
"\nvirQEMUBuildCommandlineJSON failed process JSON:\n%s\n",
data->props);
@@ -99,8 +99,8 @@ mymain(void)
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"string\":\"qwer\"}",
"string=qwer");
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"string\":\"qw,e,r\"}",
"string=qw,,e,,r");
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"number\":1234}",
"number=1234");
- DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true}",
"boolean=yes");
- DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":false}",
"boolean=no");
+ DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true}",
"boolean=on");
+ DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":false}",
"boolean=off");
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[]}", NULL);
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[0]}",
"bitmap=0");
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"bitmap\":[1,3,5]}",
@@ -113,14 +113,14 @@ mymain(void)
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"array\":[\"bleah\",\"qwerty\",1]}",
"array=bleah,array=qwerty,array=1");
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"boolean\":true,\"hyphen-name\":1234,\"some_string\":\"bleah\"}",
-
"boolean=yes,hyphen-name=1234,some_string=bleah");
+
"boolean=on,hyphen-name=1234,some_string=bleah");
DO_TEST_COMMAND_OBJECT_FROM_JSON("{\"nest\":
{\"boolean\":true,"
"\"hyphen-name\":1234,"
"\"some_string\":\"bleah\","
"\"bleah\":\"bl,eah\""
"}"
"}",
- "nest.boolean=yes,nest.hyphen-name=1234,"
+ "nest.boolean=on,nest.hyphen-name=1234,"
"nest.some_string=bleah,nest.bleah=bl,,eah");
DO_TEST_COMMAND_DRIVE_FROM_JSON("{\"driver\":\"gluster\","
"\"volume\":\"test\","
--
2.29.2
2:31 p.m.
On Tue, Feb 16, 2021 at 12:57:00 +0000, Daniel Berrange wrote:
This completes the conversion to standarize on on|off for all
boolean
options in QEMU.
Daniel P. Berrang=C3=A9 (5):
qemu: probe for -vnc supporting use of QemuOpts syntax
qemu: use on|off for -vnc boolean option values
qemu: use on|off instead of yes|no for -object boolean properties
qemu: use on|off instead of yes|no for -drive boolean properties
qemu: remove support for generating yes|no boolean options
Series:
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
if you don't expand output files unnecessarily in 3/5
1311
days inactive
1311
days old
11 comments
3 participants
participants (3)
-
Daniel P. Berrangé -
Ján Tomko -
Peter Krempa