- Devel - libvirt List Archives

[PATCH] test-wrap-argv.py: Actually print filename of offending script
by Peter Krempa 13 Jan '21

13 Jan '21

The error message doesn't actually print the filename of the offending file: Incorrect line wrapping in %file Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- scripts/test-wrap-argv.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/test-wrap-argv.py b/scripts/test-wrap-argv.py index 6b0d3511f3..9ec572b479 100755 --- a/scripts/test-wrap-argv.py +++ b/scripts/test-wrap-argv.py @@ -137,8 +137,8 @@ def rewrap(filename, in_place, check): stdin=subprocess.PIPE) diff.communicate(input=new.encode('utf-8')) - print("Incorrect line wrapping in $file", - file=sys.stderr) + print("Incorrect line wrapping in '%s'" % + filename, file=sys.stderr) print("Use test-wrap-argv.py to wrap test data files", file=sys.stderr) return False -- 2.29.2

2 2

[RFC v4 4/4] qemu: suppor dirty ring feature
by huangy81＠chinatelecom.cn 13 Jan '21

13 Jan '21

From: Hyman <huangy81(a)chinatelecom.cn> QEMU introduced a dirty ring feature, this patch add a new KVM feature 'dirty-ring' to set this feature for kvm guests. To enable the feature, libvirt add "-accel dirty-gfn-count=xxx" to QEMU command line, the following XML needs to be added to the guest's domain description: <features> <kvm> <dirty-ring state='on' size='xxx'> </kvm> </features> Signed-off-by: Hyman <huangy81(a)chinatelecom.cn> --- docs/formatdomain.rst | 16 +++++++++------- docs/schemas/domaincommon.rng | 10 ++++++++++ src/conf/domain_conf.c | 34 ++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_command.c | 13 ++++++++++--- 5 files changed, 67 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 6100b88e99..5bf8517cda 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1767,6 +1767,7 @@ Hypervisors may allow certain CPU / machine features to be toggled on/off. <hidden state='on'/> <hint-dedicated state='on'/> <poll-control='on'/> + <dirty-ring state='on' size='4096'/> </kvm> <xen> <e820_host state='on'/> @@ -1849,13 +1850,14 @@ are: ``kvm`` Various features to change the behavior of the KVM hypervisor. - ============== ============================================================================ ======= ============================ - Feature Description Value Since - ============== ============================================================================ ======= ============================ - hidden Hide the KVM hypervisor from standard MSR based discovery on, off :since:`1.2.8 (QEMU 2.1.0)` - hint-dedicated Allows a guest to enable optimizations when running on dedicated vCPUs on, off :since:`5.7.0 (QEMU 2.12.0)` - poll-control Decrease IO completion latency by introducing a grace period of busy waiting on, off :since:`6.10.0 (QEMU 4.2)` - ============== ============================================================================ ======= ============================ + ============== ============================================================================ ================================== ============================ + Feature Description Value Since + ============== ============================================================================ ================================== ============================ + hidden Hide the KVM hypervisor from standard MSR based discovery on, off :since:`1.2.8 (QEMU 2.1.0)` + hint-dedicated Allows a guest to enable optimizations when running on dedicated vCPUs on, off :since:`5.7.0 (QEMU 2.12.0)` + poll-control Decrease IO completion latency by introducing a grace period of busy waiting on, off :since:`6.10.0 (QEMU 4.2)` + dirty-ring Enable dirty ring feature on, off; size - must be power of 2 :since:`7.0.0 (QEMU 5.2.1)` + ============== ============================================================================ ================================== ============================ ``xen`` Various features to change the behavior of the Xen hypervisor. diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 7dc419bcc3..5af4bbeee6 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -6569,6 +6569,16 @@ <ref name="featurestate"/> </element> </optional> + <optional> + <element name="dirty-ring"> + <ref name="featurestate"/> + <optional> + <attribute name="size"> + <data type="unsignedInt"/> + </attribute> + </optional> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 349fc28c2a..e617b952db 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -186,6 +186,7 @@ VIR_ENUM_IMPL(virDomainKVM, "hidden", "hint-dedicated", "poll-control", + "dirty-ring", ); VIR_ENUM_IMPL(virDomainXen, @@ -18379,6 +18380,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def, if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON) { int feature; int value; + node = ctxt->node; if ((n = virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) < 0) return -1; @@ -18395,6 +18397,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def, case VIR_DOMAIN_KVM_HIDDEN: case VIR_DOMAIN_KVM_DEDICATED: case VIR_DOMAIN_KVM_POLLCONTROL: + case VIR_DOMAIN_KVM_DIRTY_RING: if (!(tmp = virXMLPropString(nodes[i], "state"))) { virReportError(VIR_ERR_XML_ERROR, _("missing 'state' attribute for " @@ -18413,6 +18416,26 @@ virDomainFeaturesDefParse(virDomainDefPtr def, VIR_FREE(tmp); def->kvm_features[feature] = value; + + /* only for dirty ring case */ + if (((virDomainKVM) feature) == VIR_DOMAIN_KVM_DIRTY_RING && + value == VIR_TRISTATE_SWITCH_ON) { + ctxt->node = nodes[i]; + if (virXPathUInt("string(./@size)", ctxt, + &def->dirty_gfn_count) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid number of dirty GFNs")); + return -1; + } + + if ((def->dirty_gfn_count & (def->dirty_gfn_count - 1)) || + def->dirty_gfn_count > 65536) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("max number of dirty GFNs is 65536 " + "and must be power of 2")); + return -1; + } + } break; /* coverity[dead_error_begin] */ @@ -18421,6 +18444,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def, } } VIR_FREE(nodes); + ctxt->node = node; } if (def->features[VIR_DOMAIN_FEATURE_XEN] == VIR_TRISTATE_SWITCH_ON) { @@ -22521,6 +22545,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src, case VIR_DOMAIN_KVM_HIDDEN: case VIR_DOMAIN_KVM_DEDICATED: case VIR_DOMAIN_KVM_POLLCONTROL: + case VIR_DOMAIN_KVM_DIRTY_RING: if (src->kvm_features[i] != dst->kvm_features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("State of KVM feature '%s' differs: " @@ -28271,6 +28296,15 @@ virDomainDefFormatFeatures(virBufferPtr buf, def->kvm_features[j])); break; + case VIR_DOMAIN_KVM_DIRTY_RING: + if (def->kvm_features[j]) + virBufferAsprintf(&childBuf, "<%s state='%s' size='%d'/>\n", + virDomainKVMTypeToString(j), + virTristateSwitchTypeToString( + def->kvm_features[j]), + def->dirty_gfn_count); + break; + /* coverity[dead_error_begin] */ case VIR_DOMAIN_KVM_LAST: break; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ec43bbe186..120d490ce7 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1917,6 +1917,7 @@ typedef enum { VIR_DOMAIN_KVM_HIDDEN = 0, VIR_DOMAIN_KVM_DEDICATED, VIR_DOMAIN_KVM_POLLCONTROL, + VIR_DOMAIN_KVM_DIRTY_RING, VIR_DOMAIN_KVM_LAST } virDomainKVM; @@ -2728,6 +2729,9 @@ struct _virDomainDef { callbacks failed for a non-critical reason (was not able to fill in some data) and thus should be re-run before starting */ + + /* Number of dirty GFNs per ring */ + unsigned int dirty_gfn_count; }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0f660aaec3..31829baeea 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6525,6 +6525,9 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, virBufferAddLit(&buf, ",kvm-poll-control=on"); break; + case VIR_DOMAIN_KVM_DIRTY_RING: + break; + /* coverity[dead_error_begin] */ case VIR_DOMAIN_KVM_LAST: break; @@ -6959,9 +6962,13 @@ qemuBuildAccelCommandLineTcgOptions(void) static void -qemuBuildAccelCommandLineKvmOptions(void) +qemuBuildAccelCommandLineKvmOptions(virBuffer *buf, + const virDomainDef *def) { - /* implemented in the next patch */ + if (def->features[VIR_DOMAIN_FEATURE_KVM] == VIR_TRISTATE_SWITCH_ON && + def->kvm_features[VIR_DOMAIN_KVM_DIRTY_RING] == VIR_TRISTATE_SWITCH_ON) { + virBufferAsprintf(buf, ",dirty-gfn-count=%d", def->dirty_gfn_count); + } } @@ -6982,7 +6989,7 @@ qemuBuildAccelCommandLine(virCommandPtr cmd, case VIR_DOMAIN_VIRT_KVM: virBufferAddLit(&buf, "kvm"); - qemuBuildAccelCommandLineKvmOptions(); + qemuBuildAccelCommandLineKvmOptions(&buf, def); break; case VIR_DOMAIN_VIRT_KQEMU: -- 2.24.3

1 0

[RFC v4 3/4] qemu: use "-accel" option to specify accelerator instead of "-machine"
by huangy81＠chinatelecom.cn 13 Jan '21

13 Jan '21

From: Hyman <huangy81(a)chinatelecom.cn> The "-machine" options for accelerators are legacy, the "-accel" options is a better mechanism. The following are the details: https://lore.kernel.org/qemu-devel/3aa73987-40e8-3619-0723-9f17f73850bd@red… This patch switch the option "-machine accel" to "-accel" when specifying accelerator type once libvirt build QEMU command line. Since this patch involves qemuxml2argvtest, we only modify the test cases which machine type supported by QEMU with version >= 2.9.0. Signed-off-by: Hyman <huangy81(a)chinatelecom.cn> --- src/qemu/qemu_command.c | 131 ++++++++++++++---- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 3 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 3 +- .../aarch64-features-sve.aarch64-latest.args | 3 +- ...arch64-os-firmware-efi.aarch64-latest.args | 3 +- .../aarch64-virt-graphics.aarch64-latest.args | 3 +- .../aarch64-virt-headless.aarch64-latest.args | 3 +- .../blkdeviotune-group-num.x86_64-4.1.0.args | 3 +- .../blkdeviotune-group-num.x86_64-latest.args | 3 +- .../blkdeviotune-max-length.x86_64-4.1.0.args | 3 +- ...blkdeviotune-max-length.x86_64-latest.args | 3 +- .../blkdeviotune-max.x86_64-4.1.0.args | 3 +- .../blkdeviotune-max.x86_64-latest.args | 3 +- .../channel-unix-guestfwd.x86_64-latest.args | 3 +- .../clock-timer-armvtimer.aarch64-latest.args | 3 +- .../console-virtio-unix.x86_64-latest.args | 3 +- .../controller-virtio-scsi.x86_64-latest.args | 3 +- ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 3 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 3 +- .../cpu-host-model-cmt.x86_64-4.0.0.args | 3 +- .../cpu-translation.x86_64-4.0.0.args | 3 +- .../cpu-translation.x86_64-latest.args | 3 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 3 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 3 +- .../cputune-cpuset-big-id.x86_64-latest.args | 3 +- ...ult-video-type-aarch64.aarch64-latest.args | 3 +- ...default-video-type-ppc64.ppc64-latest.args | 3 +- ...ult-video-type-riscv64.riscv64-latest.args | 3 +- ...default-video-type-s390x.s390x-latest.args | 3 +- .../disk-aio-io_uring.x86_64-latest.args | 3 +- .../disk-aio.x86_64-2.12.0.args | 3 +- .../disk-aio.x86_64-latest.args | 3 +- .../disk-arm-virtio-sd.aarch64-4.0.0.args | 3 +- .../disk-arm-virtio-sd.aarch64-latest.args | 3 +- ...sk-backing-chains-index.x86_64-latest.args | 3 +- ...-backing-chains-noindex.x86_64-2.12.0.args | 3 +- ...-backing-chains-noindex.x86_64-latest.args | 3 +- .../disk-cache.x86_64-2.12.0.args | 3 +- .../disk-cache.x86_64-latest.args | 3 +- .../disk-cdrom-bus-other.x86_64-latest.args | 3 +- ...m-empty-network-invalid.x86_64-latest.args | 3 +- .../disk-cdrom-network.x86_64-2.12.0.args | 3 +- .../disk-cdrom-network.x86_64-latest.args | 3 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 3 +- .../disk-cdrom-tray.x86_64-latest.args | 3 +- .../disk-cdrom.x86_64-2.12.0.args | 3 +- .../disk-cdrom.x86_64-latest.args | 3 +- .../disk-copy_on_read.x86_64-2.12.0.args | 3 +- .../disk-copy_on_read.x86_64-latest.args | 3 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 3 +- .../disk-detect-zeroes.x86_64-latest.args | 3 +- .../disk-discard.x86_64-4.1.0.args | 3 +- .../disk-discard.x86_64-latest.args | 3 +- .../disk-error-policy-s390x.s390x-2.12.0.args | 3 +- .../disk-error-policy-s390x.s390x-latest.args | 3 +- .../disk-error-policy.x86_64-2.12.0.args | 3 +- .../disk-error-policy.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_11.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 3 +- .../disk-floppy.x86_64-2.12.0.args | 3 +- .../disk-floppy.x86_64-latest.args | 3 +- .../disk-metadata-cache.x86_64-latest.args | 3 +- .../disk-network-gluster.x86_64-2.12.0.args | 3 +- .../disk-network-gluster.x86_64-latest.args | 3 +- .../disk-network-http.x86_64-latest.args | 3 +- .../disk-network-iscsi.x86_64-2.12.0.args | 3 +- .../disk-network-iscsi.x86_64-latest.args | 3 +- .../disk-network-nbd.x86_64-2.12.0.args | 3 +- .../disk-network-nbd.x86_64-latest.args | 3 +- .../disk-network-nfs.x86_64-latest.args | 3 +- .../disk-network-rbd.x86_64-2.12.0.args | 3 +- .../disk-network-rbd.x86_64-latest.args | 3 +- .../disk-network-sheepdog.x86_64-2.12.0.args | 3 +- .../disk-network-sheepdog.x86_64-latest.args | 3 +- ...isk-network-source-auth.x86_64-2.12.0.args | 3 +- ...isk-network-source-auth.x86_64-latest.args | 3 +- ...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 3 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 3 +- ...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 3 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 3 +- .../disk-network-tlsx509.x86_64-2.12.0.args | 3 +- .../disk-network-tlsx509.x86_64-latest.args | 3 +- .../disk-nvme.x86_64-latest.args | 3 +- .../disk-readonly-disk.x86_64-2.12.0.args | 3 +- .../disk-readonly-disk.x86_64-latest.args | 3 +- .../disk-scsi-device-auto.x86_64-latest.args | 3 +- .../disk-scsi.x86_64-latest.args | 3 +- .../disk-shared.x86_64-2.12.0.args | 3 +- .../disk-shared.x86_64-latest.args | 3 +- .../disk-slices.x86_64-latest.args | 3 +- .../disk-transient.x86_64-latest.args | 3 +- ...irtio-scsi-reservations.x86_64-2.12.0.args | 3 +- ...irtio-scsi-reservations.x86_64-latest.args | 3 +- .../eoi-disabled.x86_64-4.0.0.args | 3 +- .../eoi-disabled.x86_64-latest.args | 3 +- .../eoi-enabled.x86_64-4.0.0.args | 3 +- .../eoi-enabled.x86_64-latest.args | 3 +- .../fips-enabled.x86_64-5.1.0.args | 3 +- .../fips-enabled.x86_64-latest.args | 3 +- .../floppy-drive-fat.x86_64-2.12.0.args | 3 +- .../floppy-drive-fat.x86_64-latest.args | 3 +- .../fs9p-ccw.s390x-latest.args | 3 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 3 +- .../genid-auto.x86_64-latest.args | 3 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 3 +- ...egl-headless-rendernode.x86_64-latest.args | 3 +- .../graphics-egl-headless.x86_64-latest.args | 3 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 3 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 3 +- .../graphics-vnc-tls.x86_64-latest.args | 3 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 3 +- ...play-spice-egl-headless.x86_64-latest.args | 3 +- ...ev-display-spice-opengl.x86_64-latest.args | 3 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 3 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 3 +- .../hostdev-scsi-lsi.x86_64-4.1.0.args | 3 +- .../hostdev-scsi-lsi.x86_64-latest.args | 3 +- ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 3 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 3 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 3 +- .../hugepages-memaccess3.x86_64-latest.args | 3 +- .../hugepages-nvdimm.x86_64-latest.args | 3 +- .../hyperv-off.x86_64-4.0.0.args | 3 +- .../hyperv-off.x86_64-latest.args | 3 +- .../hyperv-panic.x86_64-4.0.0.args | 3 +- .../hyperv-panic.x86_64-latest.args | 3 +- .../hyperv-stimer-direct.x86_64-latest.args | 3 +- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 3 +- .../hyperv.x86_64-latest.args | 3 +- .../intel-iommu-aw-bits.x86_64-latest.args | 3 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 3 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 3 +- .../intel-iommu-eim.x86_64-latest.args | 3 +- .../intel-iommu.x86_64-latest.args | 3 +- .../iommu-smmuv3.aarch64-latest.args | 3 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 3 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 3 +- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 3 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 3 +- ...v-missing-platform-info.x86_64-2.12.0.args | 3 +- .../launch-security-sev.x86_64-2.12.0.args | 3 +- ...luks-disks-source-qcow2.x86_64-latest.args | 3 +- ...memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 3 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 3 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 3 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 3 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 3 +- .../mlock-off.x86_64-3.0.0.args | 3 +- .../mlock-off.x86_64-latest.args | 3 +- .../mlock-on.x86_64-3.0.0.args | 3 +- .../mlock-on.x86_64-latest.args | 3 +- .../net-user.x86_64-4.0.0.args | 3 +- .../net-vdpa.x86_64-latest.args | 3 +- .../net-vhostuser.x86_64-latest.args | 3 +- .../numatune-hmat.x86_64-latest.args | 3 +- .../os-firmware-bios.x86_64-latest.args | 3 +- ...os-firmware-efi-secboot.x86_64-latest.args | 3 +- .../os-firmware-efi.x86_64-latest.args | 3 +- .../parallel-unix-chardev.x86_64-latest.args | 3 +- ...cie-root-port-nohotplug.x86_64-latest.args | 3 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 3 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 3 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 3 +- .../ppc64-pseries-graphics.ppc64-latest.args | 3 +- .../ppc64-pseries-headless.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 3 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-disabled.x86_64-latest.args | 3 +- .../pv-spinlock-enabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-enabled.x86_64-latest.args | 3 +- .../qemu-ns.x86_64-4.0.0.args | 3 +- .../qemu-ns.x86_64-latest.args | 3 +- .../riscv64-virt-graphics.riscv64-latest.args | 3 +- .../riscv64-virt-headless.riscv64-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 3 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 3 +- .../s390x-ccw-graphics.s390x-latest.args | 3 +- .../s390x-ccw-headless.s390x-latest.args | 3 +- .../serial-unix-chardev.x86_64-latest.args | 3 +- ...rtcard-passthrough-unix.x86_64-latest.args | 3 +- .../tpm-emulator-spapr.ppc64-latest.args | 3 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 3 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 3 +- .../tpm-emulator-tpm2.x86_64-latest.args | 3 +- .../tpm-emulator.x86_64-latest.args | 3 +- .../tpm-passthrough-crb.x86_64-latest.args | 3 +- .../tpm-passthrough.x86_64-latest.args | 3 +- .../tseg-explicit-size.x86_64-latest.args | 3 +- .../usb-redir-unix.x86_64-latest.args | 3 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 3 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 3 +- ...host-user-gpu-secondary.x86_64-latest.args | 3 +- .../vhost-user-vga.x86_64-latest.args | 3 +- .../vhost-vsock-auto.x86_64-latest.args | 3 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 3 +- .../vhost-vsock-ccw.s390x-latest.args | 3 +- .../vhost-vsock.x86_64-latest.args | 3 +- ...eo-bochs-display-device.x86_64-latest.args | 3 +- ...video-qxl-device-vram64.x86_64-latest.args | 3 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 3 +- ...eo-ramfb-display-device.x86_64-latest.args | 3 +- .../virtio-9p-createmode.x86_64-latest.args | 3 +- .../virtio-9p-multidevs.x86_64-latest.args | 3 +- .../virtio-non-transitional.x86_64-3.1.0.args | 3 +- ...virtio-non-transitional.x86_64-latest.args | 3 +- ...-options-controller-ats.x86_64-latest.args | 3 +- ...ptions-controller-iommu.x86_64-latest.args | 3 +- ...tions-controller-packed.x86_64-latest.args | 3 +- ...virtio-options-disk-ats.x86_64-latest.args | 3 +- ...rtio-options-disk-iommu.x86_64-latest.args | 3 +- ...tio-options-disk-packed.x86_64-latest.args | 3 +- .../virtio-options-fs-ats.x86_64-latest.args | 3 +- ...virtio-options-fs-iommu.x86_64-latest.args | 3 +- ...irtio-options-fs-packed.x86_64-latest.args | 3 +- ...irtio-options-input-ats.x86_64-latest.args | 3 +- ...tio-options-input-iommu.x86_64-latest.args | 3 +- ...io-options-input-packed.x86_64-latest.args | 3 +- ...-options-memballoon-ats.x86_64-latest.args | 3 +- ...loon-freepage-reporting.x86_64-latest.args | 3 +- ...ptions-memballoon-iommu.x86_64-latest.args | 3 +- ...tions-memballoon-packed.x86_64-latest.args | 3 +- .../virtio-options-net-ats.x86_64-latest.args | 3 +- ...irtio-options-net-iommu.x86_64-latest.args | 3 +- ...rtio-options-net-packed.x86_64-latest.args | 3 +- .../virtio-options-rng-ats.x86_64-latest.args | 3 +- ...irtio-options-rng-iommu.x86_64-latest.args | 3 +- ...rtio-options-rng-packed.x86_64-latest.args | 3 +- ...irtio-options-video-ats.x86_64-latest.args | 3 +- ...tio-options-video-iommu.x86_64-latest.args | 3 +- ...io-options-video-packed.x86_64-latest.args | 3 +- .../virtio-options.x86_64-latest.args | 3 +- .../virtio-rng-builtin.x86_64-latest.args | 3 +- .../virtio-rng-egd-unix.x86_64-latest.args | 3 +- .../virtio-transitional.x86_64-3.1.0.args | 3 +- .../virtio-transitional.x86_64-latest.args | 3 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 3 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 3 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 3 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 3 +- .../x86_64-pc-graphics.x86_64-latest.args | 3 +- .../x86_64-pc-headless.x86_64-latest.args | 3 +- .../x86_64-q35-graphics.x86_64-latest.args | 3 +- .../x86_64-q35-headless.x86_64-latest.args | 3 +- 255 files changed, 610 insertions(+), 283 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6f970a3128..0f660aaec3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6711,38 +6711,42 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-machine"); virBufferAdd(&buf, def->os.machine, -1); - switch ((virDomainVirtType)def->virtType) { - case VIR_DOMAIN_VIRT_QEMU: - virBufferAddLit(&buf, ",accel=tcg"); - break; + /* QEMU lower than 2.9.0 do not support '-accel' + * fallback to '-machine accel' */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_ACCEL)) { + switch ((virDomainVirtType)def->virtType) { + case VIR_DOMAIN_VIRT_QEMU: + virBufferAddLit(&buf, ",accel=tcg"); + break; - case VIR_DOMAIN_VIRT_KVM: - virBufferAddLit(&buf, ",accel=kvm"); - break; + case VIR_DOMAIN_VIRT_KVM: + virBufferAddLit(&buf, ",accel=kvm"); + break; - case VIR_DOMAIN_VIRT_KQEMU: - case VIR_DOMAIN_VIRT_XEN: - case VIR_DOMAIN_VIRT_LXC: - case VIR_DOMAIN_VIRT_UML: - case VIR_DOMAIN_VIRT_OPENVZ: - case VIR_DOMAIN_VIRT_TEST: - case VIR_DOMAIN_VIRT_VMWARE: - case VIR_DOMAIN_VIRT_HYPERV: - case VIR_DOMAIN_VIRT_VBOX: - case VIR_DOMAIN_VIRT_PHYP: - case VIR_DOMAIN_VIRT_PARALLELS: - case VIR_DOMAIN_VIRT_BHYVE: - case VIR_DOMAIN_VIRT_VZ: - case VIR_DOMAIN_VIRT_NONE: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("the QEMU binary does not support %s"), - virDomainVirtTypeToString(def->virtType)); - return -1; + case VIR_DOMAIN_VIRT_KQEMU: + case VIR_DOMAIN_VIRT_XEN: + case VIR_DOMAIN_VIRT_LXC: + case VIR_DOMAIN_VIRT_UML: + case VIR_DOMAIN_VIRT_OPENVZ: + case VIR_DOMAIN_VIRT_TEST: + case VIR_DOMAIN_VIRT_VMWARE: + case VIR_DOMAIN_VIRT_HYPERV: + case VIR_DOMAIN_VIRT_VBOX: + case VIR_DOMAIN_VIRT_PHYP: + case VIR_DOMAIN_VIRT_PARALLELS: + case VIR_DOMAIN_VIRT_BHYVE: + case VIR_DOMAIN_VIRT_VZ: + case VIR_DOMAIN_VIRT_NONE: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("the QEMU binary does not support %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; - case VIR_DOMAIN_VIRT_LAST: - default: - virReportEnumRangeError(virDomainVirtType, def->virtType); - return -1; + case VIR_DOMAIN_VIRT_LAST: + default: + virReportEnumRangeError(virDomainVirtType, def->virtType); + return -1; + } } /* To avoid the collision of creating USB controllers when calling @@ -6946,6 +6950,70 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, } +static void +qemuBuildAccelCommandLineTcgOptions(void) +{ + /* TODO: build command line tcg accelerator + * property like tb-size */ +} + + +static void +qemuBuildAccelCommandLineKvmOptions(void) +{ + /* implemented in the next patch */ +} + + +static int +qemuBuildAccelCommandLine(virCommandPtr cmd, + const virDomainDef *def) +{ + /* the '-machine' options for accelerator are legacy, + * using the '-accel' options by default */ + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + virCommandAddArg(cmd, "-accel"); + + switch ((virDomainVirtType)def->virtType) { + case VIR_DOMAIN_VIRT_QEMU: + virBufferAddLit(&buf, "tcg"); + qemuBuildAccelCommandLineTcgOptions(); + break; + + case VIR_DOMAIN_VIRT_KVM: + virBufferAddLit(&buf, "kvm"); + qemuBuildAccelCommandLineKvmOptions(); + break; + + case VIR_DOMAIN_VIRT_KQEMU: + case VIR_DOMAIN_VIRT_XEN: + case VIR_DOMAIN_VIRT_LXC: + case VIR_DOMAIN_VIRT_UML: + case VIR_DOMAIN_VIRT_OPENVZ: + case VIR_DOMAIN_VIRT_TEST: + case VIR_DOMAIN_VIRT_VMWARE: + case VIR_DOMAIN_VIRT_HYPERV: + case VIR_DOMAIN_VIRT_VBOX: + case VIR_DOMAIN_VIRT_PHYP: + case VIR_DOMAIN_VIRT_PARALLELS: + case VIR_DOMAIN_VIRT_BHYVE: + case VIR_DOMAIN_VIRT_VZ: + case VIR_DOMAIN_VIRT_NONE: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("the QEMU binary does not support %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + + case VIR_DOMAIN_VIRT_LAST: + default: + virReportEnumRangeError(virDomainVirtType, def->virtType); + return -1; + } + + virCommandAddArgBuffer(cmd, &buf); + return 0; +} + static void qemuBuildTSEGCommandLine(virCommandPtr cmd, const virDomainDef *def) @@ -9840,6 +9908,11 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildMachineCommandLine(cmd, cfg, def, qemuCaps, priv) < 0) return NULL; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ACCEL)) { + if (qemuBuildAccelCommandLine(cmd, def) < 0) + return NULL; + } + qemuBuildTSEGCommandLine(cmd, def); if (qemuBuildCpuCommandLine(cmd, driver, def, qemuCaps) < 0) diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args index 0c1fe71619..85d0dd4de5 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt-4.2,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt-4.2,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args index 858eadc257..60b0026564 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt-4.2,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt-4.2,usb=off,dump-guest-core=off,gic-version=2,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args index ba79804707..0b412a9972 100644 --- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -cpu host,sve512=on,sve384=off,sve256=on,sve128=on,sve=on \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args index 1ff234cc89..7cca330825 100644 --- a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-aarch64test/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt-4.0,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt-4.0,usb=off,dump-guest-core=off,gic-version=2,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a53 \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 70be61bb33..de80515779 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=2,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index d4b4f05f95..365e95fde0 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=2,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args index 8aa4c2be7d..fcfee22474 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args index 79012e5b60..cd483c6635 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args index b8416ef3b0..c0e091e6b3 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args index 79012e5b60..cd483c6635 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args index b03fe20d30..45a5ba9dff 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args index 79012e5b60..cd483c6635 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args index f500bfe2ae..588ddd8e03 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args index fd6098b8e1..44170056ac 100644 --- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args +++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -cpu host,kvm-no-adjvtime=on \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args index 5e64598959..7050fb5c32 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 1d7583b981..42f889c83c 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args index 96d4306238..9235d35fe2 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-3.1,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.1,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Icelake-Server,pconfig=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args index a512623af6..33a4b49938 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu Icelake-Server \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args index 017e7a6c06..2079080ae8 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,\ clwb=on,pku=on,la57=on,3dnowext=on,3dnow=on,npt=on,vme=off,fma=off,avx=off,\ f16c=off,rdrand=off,avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,\ diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args index f8e19fca24..4e30fed044 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu Haswell,pclmuldq=on,ds_cpl=on,tsc_adjust=on,fxsr_opt=on,lahf_lm=on,\ cmp_legacy=on,nodeid_msr=on,perfctr_core=on,perfctr_nb=on,kvm_pv_eoi=on,\ kvm_pv_unhalt=on \ diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args index 84c0d05b34..d2fafd6110 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,\ cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,\ kvm-pv-unhalt=on \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args index b0e6d05b6c..c10e5eb361 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc_adjust=on,\ clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on,invtsc=on,\ tsc-frequency=3504000000 \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args index 16a4282ab1..b36d2acdfe 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,\ 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,invtsc=on,\ diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args index 0ec8ba038d..26759ecfb9 100644 --- a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args index 8a27403f92..0a70e08187 100644 --- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-a/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args index 7a491a6bd1..57e727fcea 100644 --- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-p/master-key.aes \ --machine pseries,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu host \ -m 1024 \ -object memory-backend-ram,id=ppc_spapr.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args index c4acaaff0f..345710e795 100644 --- a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-r/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index 9eef70cf72..02fd29e536 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-s/master-key.aes \ --machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel kvm \ -cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,csske=on,mepoch=on,msa9=on,\ msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\ edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\ diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args index 69c8742e95..1644898f3e 100644 --- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args index f8a89493f6..dd88aabf7c 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args index 6f9b81071a..629f781e96 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args index 3c2a7cf240..0706f19d05 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-armtest/master-key.aes \ --machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \ +-machine vexpress-a9,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args index c3007e147e..54ede20d4f 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-armtest/master-key.aes \ --machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off,\ +-machine vexpress-a9,usb=off,dump-guest-core=off,\ memory-backend=vexpress.highmem \ +-accel tcg \ -cpu cortex-a9 \ -m 1024 \ -object memory-backend-ram,id=vexpress.highmem,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args index 0f6d70a855..1ab1dddcb6 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args index 47691339d6..bd87945e66 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args index 0f6d70a855..1ab1dddcb6 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args index aa7a230583..bf009d22bf 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args index e66abd9d4f..e1ca977691 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-1.5,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index a77a851941..9d2a2cee3c 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args index 94ffa9f9e4..314b6ff3e0 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args index fa5c0ba087..8c7ad9bb5b 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-1.2,usb=off,dump-guest-core=off \ +-accel kvm \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args index 3c4f3993f6..c15bd2dd21 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc-1.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args index 7952c42d07..58e1c7b8cd 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args index 4e4e0aa62a..a787e08255 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args index 0621746a3b..a42df874d7 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args index beac75ec1d..4fafdac369 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args index 00d5f45def..d294483a50 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args index 493b478cf8..126f7940a9 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args index 090cccdb5c..ee75aa5ff3 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args index 97cc49225f..ac28b0716d 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args b/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args index 4437922eee..9181005c92 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args index 1aa06c7469..ade6e8dd4a 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args index 6b93b74ec1..7c3bb65826 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args index d75d7aca31..fee803f3db 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args index 26e8f56e58..16195e49b9 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args index c0079efc0a..d5ae5a4a64 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args index b221718e29..18d7b68b78 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.11,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-2.11,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args index 7e35f6a6cd..6d7e66ea23 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.11,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-q35-2.11,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args index 51be45465e..8bdca7b28a 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.9,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-2.9,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args index 47ef5db354..b567432ab5 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.9,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-q35-2.9,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args index d4f11f8ca0..566591cdee 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args index 96756502df..fa83112989 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args index 3e520664ab..b80cb48db6 100644 --- a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args index 2721147b3a..d77ec1a5d2 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 1e992fb6d0..a6d38fe749 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index 954f1824dd..f119c4d0f5 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args index 930d8d5db2..38d94f1b36 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index ab60fc5f4a..8c38a8830e 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args index 1742f01e25..2af0a90df0 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 5e5c23656a..e92ccfce55 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args index b0bc83bfc0..36d480d6b6 100644 --- a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args index 21d1c2deba..383cfcbfa8 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args index e91f009d35..6ad57f5ab2 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args index 653fa1af40..adff0abba6 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args index 4418906dc7..1dba55bba0 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args index 0ccf3df106..458c803339 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args index 879a52123c..322dbc0497 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ 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 afe84fef32..d88d39fcbd 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32 \ -m 214 \ -realtime mlock=off \ 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 8ec4a8ab22..37345a27bf 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ 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 d778d3d704..8b023ad6e2 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32 \ -m 214 \ -realtime mlock=off \ 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 a21f322dfb..4a000feaa2 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-5.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-5.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ 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 2a30ad02c9..fd59d83a05 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32 \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args index ec4c28e161..3c63929dea 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args index 3146ad1251..0104094ef0 100644 --- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args index 34ef204632..ae56287059 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args index 7a83ac4afe..76535e8f85 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args index 354686c5fa..21149ff13f 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args index da4ef333c0..7149a1961e 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args index d35e7a5f6e..906be277bc 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args index 4cae79c005..8b0936cf57 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args index a24b3395e2..cace89313d 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args index eea8560699..6decf5eee5 100644 --- a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args index 21b267f176..a7e19f5214 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object pr-manager-helper,id=pr-helper0,\ path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 8,sockets=8,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args index a6e6c12d65..aa273fd6c3 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object pr-manager-helper,id=pr-helper0,\ path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args index b0a004f316..f3334fff5d 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_eoi=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args index a2593d155a..7305a5a4ce 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-eoi=off \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args index b008c779fa..35d25d449c 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_eoi=on \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args index d0befba30f..fe04dd162f 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-eoi=on \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args index e0e416d391..4598948798 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -enable-fips \ --machine pc-i440fx-5.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-5.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args index 4740e52499..16e0e4ccb0 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args index 90ab4214d9..b0d590b6f5 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args index 12f0b9cb64..15f928683d 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args index 07d2a2dc3d..ebc6758f20 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args index e340218e1a..f6af18c394 100644 --- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args index 8f08342a0b..1649e11c26 100644 --- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxml2argvdata/genid.x86_64-latest.args index 7dd7d1f616..4e46393c32 100644 --- a/tests/qemuxml2argvdata/genid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args index e6025557da..3b3d4e6c36 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args @@ -11,7 +11,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args index e6025557da..3b3d4e6c36 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args @@ -11,7 +11,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args index 9329e56b12..ccc85338c5 100644 --- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ 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 b3251fbed4..301348c6a5 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index cea42c4d1b..c625aaab2a 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args index f1a3026474..e291f98dc6 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args index 580cbd9489..48b178ed5b 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args index 345bddfc43..e1a1b9911a 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args index cef437a228..fe0cfe6e31 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args index 68c28fc41e..d4bc505bd5 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args index cee891199d..b121778990 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 89e83e3a2f..80fd0bcc73 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index 973ae5677a..487f53a312 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index c00ef41bf2..a7ec67cf08 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args index a6cf270d0c..64604bee92 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 512 \ -object memory-backend-ram,id=s390.ram,size=536870912 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args index be550aa7d5..2907799dbc 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 512 \ -object memory-backend-ram,id=s390.ram,size=536870912 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index 6033950eab..f7437214ca 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-fedora/master-key.aes \ --machine pc-i440fx-2.9,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.9,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,\ 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 \ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index 969bb713b5..2d04b4fda0 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args index 6909b71d52..2d7b9e1699 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args index ce7af1bd3a..8c587382ad 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args index 55e5099717..5671a9bea0 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,hv-crash \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args index 870fa38d82..a388726580 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,hv-crash \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args index f64bad579d..156053f8c6 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,hv-vpindex,hv-synic,hv-stimer,hv-stimer-direct \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args index b9d9542892..fc4051d6b9 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu 'qemu32,hv_relaxed,hv_vapic,hv-spinlocks=0x2fff,hv_vpindex,hv_runtime,\ hv_synic,hv_stimer,hv_reset,hv-vendor-id=KVM Hv,hv_frequencies,\ hv_reenlightenment,hv_tlbflush,hv_ipi,hv_evmcs' \ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args index c6cba06981..d312485de0 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu 'qemu64,hv-relaxed,hv-vapic,hv-spinlocks=0x2fff,hv-vpindex,hv-runtime,\ hv-synic,hv-stimer,hv-reset,hv-vendor-id=KVM Hv,hv-frequencies,\ hv-reenlightenment,hv-tlbflush,hv-ipi,hv-evmcs' \ diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args index 211ea3d572..f305b37a99 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args index cea414a7f5..a258b64372 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args index ef2fa61db8..7e832b92e1 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args index 43e666d14f..1bb877eb93 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args index 5fe3ed0c26..2fc32760b2 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args index 6ee610849f..868f376879 100644 --- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args +++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index f8a5aaaef4..ab5dbb1af5 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index a2f4d5e609..ae6fe5c7dd 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args index c67e253746..2b4244c9bb 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvmclock=off,kvm_pv_eoi=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args index 8842d2a448..7ad6f0afa6 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvmclock=off,kvm-pv-eoi=off \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args index 378c3b681c..325b081eba 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.0,accel=kvm,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-machine pc-1.0,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args index 378c3b681c..325b081eba 100644 --- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.0,accel=kvm,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-machine pc-1.0,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args index 6e469d1953..2119eb28c3 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \ --machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.1,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ 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 ef15e2e97e..a431ca0c8c 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index ef15e2e97e..a431ca0c8c 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=off \ 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 8d3fa2e867..9367b2b0d3 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 4f22f78277..9d7a04c5d1 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 53dda234a2..75a3d7046b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 fb4ae4b518..ae550f16ce 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 5e44496e39..26f224cc37 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 94f8444d95..4148e0ae6f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args index 8f3725ebd5..3314c4d94e 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-3.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args index 2772c82ff6..6ec5d12b3f 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args index 46e63a287f..191ace725e 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-3.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=on \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args index f77d866055..515b8de264 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args index 190b068191..b8f011a0d7 100644 --- a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args index 002ec498a0..bef606b632 100644 --- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args index d889d34168..64385a3693 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index c52015caa8..453d35012e 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,hmat=on \ +-machine pc,usb=off,dump-guest-core=off,hmat=on \ +-accel tcg \ -cpu qemu64 \ -m 12288 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args index ab94f309df..493a4ceca9 100644 --- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-fedora/master-key.aes \ --machine pc-q35-4.0,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-q35-4.0,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ -m 8 \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args index 1eb5aad17b..a6284d0122 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-fedora/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,accel=kvm,usb=off,smm=on,dump-guest-core=off,\ +-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -global driver=cfi.pflash01,property=secure,value=on \ -m 8 \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args index 9b8cbc45b9..6e26d44121 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-fedora/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,accel=kvm,usb=off,smm=on,dump-guest-core=off,\ +-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 8 \ -object memory-backend-ram,id=pc.ram,size=8388608 \ diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args index ea333ef5f8..97bc1b602b 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args index 619b03a3eb..6696300875 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args index c72b0de2ef..801806e9b4 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-2.7,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries-2.7,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args index ce6b9b0cad..2a22ef8ff4 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-3.1,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries-3.1,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args index 18e7488633..2776d6b26e 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries-4.2,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args index 5679ba419d..1792d83490 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-2.7,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-2.7,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER7 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args index 252023784b..63b4371c69 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-3.1,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-3.1,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER8 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args index deeeb8b043..b3377fc867 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-4.2,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args index 4b6d90c3a2..c0d6531163 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args index 67357696c6..128e6d2098 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args index 6190b82cb5..f9b2e381b8 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 256 \ -object memory-backend-ram,id=ppc_spapr.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args index cac8c2736d..87ac273715 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 256 \ -object memory-backend-ram,id=ppc_spapr.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args index 76e439c2b4..4bb2b4381f 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_unhalt=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args index 30f45b8a04..f104e6508f 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-unhalt=off \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args index e19ebfda0b..637865519d 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_unhalt=on \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args index beb0e5f2ef..bb09fc9c65 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-unhalt=on \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args index 0f3253f831..b2ee2314ed 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args @@ -14,7 +14,8 @@ BAR='' \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args index aefe486298..e46fb7ad93 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -14,7 +14,8 @@ BAR='' \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args index 612e1ce049..2e9058b900 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 4096 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args index 8485e3d0f8..f95437ad6e 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 4096 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args index a8be43af55..730086a2c5 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-2.7,accel=kvm,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel kvm \ -cpu host \ -m 256 \ -object memory-backend-ram,id=s390.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args index 62ffe279c4..70592c7ce8 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel kvm \ -cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,csske=on,mepoch=on,msa9=on,\ msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\ edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args index f57880ce17..de63431e63 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-2.7,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 256 \ -object memory-backend-ram,id=s390.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args index 155e9b3183..6f021d99e8 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 256 \ -object memory-backend-ram,id=s390.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 8c8667065c..17a9751803 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 4096 \ -object memory-backend-ram,id=s390.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index c44c4dd8d9..f1d257b7d5 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 4096 \ -object memory-backend-ram,id=s390.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args index 07b7aba42f..a41dc11b58 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args index 3e0262e49c..a5454b772c 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args index 96bf940b76..b8429eeed0 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pseries-5.0,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-5.0,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 2048 \ -object memory-backend-ram,id=ppc_spapr.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args index 90505c7a76..057690f236 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args index 90505c7a76..057690f236 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args index 90505c7a76..057690f236 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args index 90505c7a76..057690f236 100644 --- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args index 911d0c660c..3f5880ee18 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args index 5da7d13a3d..436fff0551 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args index 2e931dfe9a..fe6eaf6948 100644 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.10,accel=tcg,usb=off,smm=on,dump-guest-core=off,\ +-machine pc-q35-2.10,usb=off,smm=on,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -global mch.extended-tseg-mbytes=48 \ -cpu qemu64 \ -m 214 \ diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args index 1d247b0337..60b739a3cc 100644 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ 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 dd5f68abc5..f1d10589a4 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=off \ 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 e4f5db7a63..7cf6f05b5d 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -overcommit mem-lock=off \ 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 e99a5342dc..d758318421 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index 277bf8c646..f39b9004ae 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args index bc9102eab3..0acef705a3 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.9,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.9,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args index c70f0519a9..99847d09b1 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args index e1b17eba66..ccc034f454 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args index a461d4d242..984bf85b5b 100644 --- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args index 094c96aad6..c4914d6076 100644 --- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args index 6f38fae69c..8889752bce 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args index e79c21eaf0..87d74672ef 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args index 5e4d4db341..0a0f2b42ec 100644 --- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args index 601d4d272e..36ebcff583 100644 --- a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args index 4e453a2b05..4d91a3cc25 100644 --- a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args index 82a977b731..d2bbac8e2e 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-3.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-3.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index 8674a4b99d..8c3cf590ad 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args index 6552ee68f0..7657f1f8de 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args index 15eb4b5c49..a182cbd10c 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args index ae605a6ef0..ba36cea043 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args index 908b5724d4..9dd9411f3e 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args index 3a030d8efb..52546a1133 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args index 0cc82a2e46..f374e629df 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args index 92b8e248eb..99663ca4c2 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args index 62c2d347f3..42457277ec 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args index 79aa5ca1a0..3eda7eff47 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args index 27375c96ba..e4a2ce2d50 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args index b38a8f3f9b..79044a7d53 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args index 38a402ef5a..1550de3b14 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args index 9b4ef3711c..0ec0ead352 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args index 6ebc45d931..659498f46e 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args index ead878573d..af48807499 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args index 3c32335896..1a46428bb1 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args index 12c0764d56..a86028f163 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args index f2d626a35f..3cfdfa41f3 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args index e6453534d4..9ed9870c58 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args index cd4807b6c4..ad85b4a23d 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args index 66fb11bf7a..4ed20c4ecf 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args index 3feff0eb58..5e4e23b6ac 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args index 3ec61dab11..fb3fa6791b 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args index cfd3024e02..958c89b56a 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args index c5719bb1e6..f6b53037ba 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args index e230e926a4..036ee91307 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args index f8e37ce7f8..53f6c3c5a6 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args index 192d84413f..14db22d72a 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args index ed810d5890..16125995f5 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-3.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-3.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index c526d7aec5..ff2f33a297 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args index ad770d204f..5b2659798b 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-i440fx-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args index 81df0cb959..1002c52e17 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-q35-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-q35-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args index ffc52d85b0..f2f5b55a33 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-i440fx-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args index eda728f1f8..e85c4d9051 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-q35-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-q35-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args index 5458fc6e10..734043c239 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args index d2246d0a02..0efe66fd3f 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index e9d4e2c320..3beafee5ba 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args index 8bec37539f..ca5b2863e0 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ -- 2.24.3

1 0

[RFC v4 2/4] qemu_capabilities: Introduce QEMU_CAPS_ACCEL
by huangy81＠chinatelecom.cn 13 Jan '21

13 Jan '21

From: Hyman <huangy81(a)chinatelecom.cn> The "-machine" options for accelerators are legacy, the "-accel" options is a better mechanism. The following are the details: https://lore.kernel.org/qemu-devel/3aa73987-40e8-3619-0723-9f17f73850bd@red… This patch introduce QEMU_CAPS_ACCEL capability to tell if we're dealing new enough QEMU so that we can replace '-machine accel' with '-accel'. There were two phases of -accel support in QEMU: - 2.9 to 4.2: only one -accel option supported; specifying a fallback couldn't be done with -accel and required the older "-machine accel=tcg:kvm" instead - 5.0 or newer: multiple -accel options supported, e.g. "-accel tcg -accel kvm" and it would be possible to distinguish them, for example using QOM properties. However Libvirt only ever specifies one accelerator so it makes no difference. Modify capability test cases with QEMU version >= 2.9.0 carefully. Signed-off-by: Hyman <huangy81(a)chinatelecom.cn> --- 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.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 + 44 files changed, 45 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4d132defbd..7672e36a79 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -609,6 +609,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "ncr53c90", "dc390", "am53c974", + "accel", ); @@ -3220,6 +3221,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 */ + { "accel", NULL, QEMU_CAPS_ACCEL }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0f90efa459..041ba26bb3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -589,6 +589,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_SCSI_NCR53C90, /* built-in SCSI */ QEMU_CAPS_SCSI_DC390, /* -device dc-390 */ QEMU_CAPS_SCSI_AM53C974, /* -device am53c974 */ + QEMU_CAPS_ACCEL, /* -accel */ 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..f3a529801d 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='accel'/> <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..dbfd5c6565 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='accel'/> <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..05576ff164 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='accel'/> <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 2fe1888535..bcb2d2f720 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -193,6 +193,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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..1a2065af77 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='accel'/> <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 56024cfa5d..c14472f3b3 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -200,6 +200,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 a4574f70f6..03cc28aca1 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -166,6 +166,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 ab5ab06084..db5fc0b3f4 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -167,6 +167,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 588ccc58e4..ec117f0302 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -133,6 +133,7 @@ <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> <flag name='fsdev.createmode'/> + <flag name='accel'/> <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 13b61fcfe5..8c0c2df332 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -210,6 +210,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 04fd9abfff..663292270b 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='accel'/> <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..2153200c81 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='accel'/> <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 d984ad3066..29dc807507 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -186,6 +186,7 @@ <flag name='migration-param.downtime'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 c92bb5f6a3..c261367726 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -169,6 +169,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 d68c785583..cb5ed43f54 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml @@ -103,6 +103,7 @@ <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> <flag name='fsdev.createmode'/> + <flag name='accel'/> <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 3dd3ec87e5..3226689e17 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml @@ -103,6 +103,7 @@ <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> <flag name='fsdev.createmode'/> + <flag name='accel'/> <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 649104ccbd..de68315967 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml @@ -136,6 +136,7 @@ <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> <flag name='fsdev.createmode'/> + <flag name='accel'/> <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 d7f1d6cd84..3d680e9959 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -216,6 +216,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 f4b4566ea8..e09413498b 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -174,6 +174,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 b8391f1353..3334536258 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -219,6 +219,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 4722557eaf..e06ebaef46 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -180,6 +180,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 6f549902ca..a16f6b76db 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -188,6 +188,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 b1dc08eb4d..d2a4fd2f07 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -181,6 +181,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 babb8fb8ab..4f2a3ac699 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -181,6 +181,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 5a15848f88..d07676f9c4 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -144,6 +144,7 @@ <flag name='migration-param.downtime'/> <flag name='migration-param.xbzrle-cache-size'/> <flag name='fsdev.createmode'/> + <flag name='accel'/> <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 43b70ccc94..9928b0a933 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -225,6 +225,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 58774fddcc..f3f7dae90e 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -231,6 +231,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 77fdc73415..5dafacd45a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -193,6 +193,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 15eaac77a6..3d6469c46d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -194,6 +194,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 42a7cca50a..14a199da27 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -155,6 +155,7 @@ <flag name='migration-param.xbzrle-cache-size'/> <flag name='blockdev-hostdev-scsi'/> <flag name='fsdev.createmode'/> + <flag name='accel'/> <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 1ba8c09374..110e9bcf51 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -240,6 +240,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 d584642bff..fc796c88c1 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -203,6 +203,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 596bccd70a..e4c9c06f71 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -212,6 +212,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 eb760f2911..67568245c5 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -199,6 +199,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 849727eb40..355a93d4bf 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -247,6 +247,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 a293437850..dee63e0645 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -115,6 +115,7 @@ <flag name='netdev.vhost-vdpa'/> <flag name='fsdev.createmode'/> <flag name='ncr53c90'/> + <flag name='accel'/> <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 ff5f42a563..f958038a06 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -249,6 +249,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 cac9b40528..5e3e319f79 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -207,6 +207,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 e92201ad43..97b48a2d98 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -214,6 +214,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 bee7f547c7..cf70406da5 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -201,6 +201,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <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 15e7ee84c6..4594055c49 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -162,6 +162,7 @@ <flag name='block-export-add'/> <flag name='netdev.vhost-vdpa'/> <flag name='fsdev.createmode'/> + <flag name='accel'/> <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 cebacc249d..0061121051 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -250,6 +250,7 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> + <flag name='accel'/> <version>5002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> -- 2.24.3

1 0

[RFC v4 0/4] Dirty Ring support (Libvirt)
by huangy81＠chinatelecom.cn 13 Jan '21

13 Jan '21

From: Hyman <huangy81(a)chinatelecom.cn> The v4 of Dirty Ring just fix args file in testsuite which has 'No-newline-at-end-of-file' and mak it a stand-alone patch. The following is detail: https://www.redhat.com/archives/libvir-list/2021-January/msg00626.html The v3 of Dirty Ring do some modification based on the following discussion: https://www.redhat.com/archives/libvir-list/2021-January/msg00531.html https://www.redhat.com/archives/libvir-list/2021-January/msg00520.html modification 1: introducing the QEMU_CAPS_ACCEL so that we can use it to choose the right option cause -accel option only supported by QEMU with version >= 2.9.0. modification 2: splitting the qemuBuildAccelCommandLine function separation from the actual functional changes to make it easier to see what's going on. modification 3: update the libvirt version to 7.0.0 in docs The v2 of Dirty ring support of Libvirt just and an empty function of 'qemuBuildAccelCommandLineTcgOptions' and do some code clen, if things go smoothly, the tcg accelerator property may be support in the future, this empty function give a hint to do that. This is v1 of Dirty ring support of Libvirt. It is merely the same as v0, but fix the parameter dirty-gfn-count passed to QEMU command line. A previous implementation was patched by me mistakenly. This series of patches is a supplement of dirty ring implementation for Libvirt: https://lore.kernel.org/qemu-devel/20210108165050.406906-10-peterx@redhat.c… Since QEMU enable the dirty ring feature by specifying the "-accel" sub-parameter. Libvirt use "-machine accel=xxx" option to specify the type of accelerator by default, which is conflict with QEMU. Either the Libvirt or QEMU may compromise, According to the Paolo Bonzini's patient and prompt explanation: https://lore.kernel.org/qemu-devel/3aa73987-40e8-3619-0723-9f17f73850bd@red… We'd like to have Libvirt switch to "-accel xxx" instead, cause the "-machine" options for accelerator are legacy and now there is a better mechanism. The 4 patches do the following thing: 1. just fix args file in testsuite which has 'No newline at end of file'. Adding 'end-of-file' character to the file in case of unexpected behaviour. 2. introduce QEMU_CAPS_ACCEL so the the next patch can use it to choose the right option when specifying the accelerator type. 3. switch the option "-machine accel=xxx" to "-accel xxx" when specifying accelerator type once libvirt build QEMU command line, so that the next patch can build QEMU command line for accelerator type using "-accel xxx" directly. 4. introduce a dirty ring size, which is bonding to the kvm feature. Though the dirty ring is per-cpu logically, the number of GFNs per ring is registered by 'struct kvm' in QEMU. So We'd like to place the dirty ring size as a property of vm in Libvirt like the QEMU do. The dirty ring feature is disabled by default Like the QEMU. The key point of this patches i think is the placement of dirty ring size, whether there is a better placement for dirty ring size may be discussable. Since we have Libvirt change the way to specify the type of accelerator, more property of accelerator can be specified by Libvirt which has not been implemented yet, like the "kvm-shadow-mem", "tb-size", etc, whether to perfect that implementation is also a topic. Please review, Thanks! Best Regards ! Hyman (4): tests: Add 'end-of-file' character to args file in qemuxml2argvdata qemu_capabilities: Introduce QEMU_CAPS_ACCEL qemu: use "-accel" option to specify accelerator instead of "-machine" qemu: suppor dirty ring feature docs/formatdomain.rst | 16 +- docs/schemas/domaincommon.rng | 10 ++ src/conf/domain_conf.c | 34 ++++ src/conf/domain_conf.h | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 138 +++++++++++--- .../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 + .../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 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 3 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 3 +- .../aarch64-features-sve.aarch64-latest.args | 3 +- ...arch64-os-firmware-efi.aarch64-latest.args | 3 +- .../aarch64-virt-graphics.aarch64-latest.args | 3 +- .../aarch64-virt-headless.aarch64-latest.args | 3 +- .../blkdeviotune-group-num.x86_64-4.1.0.args | 3 +- .../blkdeviotune-group-num.x86_64-latest.args | 3 +- .../blkdeviotune-max-length.x86_64-4.1.0.args | 3 +- ...blkdeviotune-max-length.x86_64-latest.args | 3 +- .../blkdeviotune-max.x86_64-4.1.0.args | 3 +- .../blkdeviotune-max.x86_64-latest.args | 3 +- .../channel-unix-guestfwd.x86_64-latest.args | 3 +- .../clock-timer-armvtimer.aarch64-latest.args | 3 +- .../console-virtio-unix.x86_64-latest.args | 3 +- .../controller-virtio-scsi.x86_64-latest.args | 3 +- ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 3 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 3 +- .../cpu-host-model-cmt.x86_64-4.0.0.args | 3 +- .../cpu-translation.x86_64-4.0.0.args | 3 +- .../cpu-translation.x86_64-latest.args | 3 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 3 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 3 +- .../cputune-cpuset-big-id.x86_64-latest.args | 3 +- ...ult-video-type-aarch64.aarch64-latest.args | 3 +- ...default-video-type-ppc64.ppc64-latest.args | 3 +- ...ult-video-type-riscv64.riscv64-latest.args | 3 +- ...default-video-type-s390x.s390x-latest.args | 3 +- .../disk-aio-io_uring.x86_64-latest.args | 3 +- .../disk-aio.x86_64-2.12.0.args | 3 +- .../disk-aio.x86_64-latest.args | 3 +- .../disk-arm-virtio-sd.aarch64-4.0.0.args | 3 +- .../disk-arm-virtio-sd.aarch64-latest.args | 3 +- ...sk-backing-chains-index.x86_64-latest.args | 170 +++++++++++++++++- ...-backing-chains-noindex.x86_64-2.12.0.args | 3 +- ...-backing-chains-noindex.x86_64-latest.args | 3 +- .../disk-cache.x86_64-2.12.0.args | 3 +- .../disk-cache.x86_64-latest.args | 3 +- .../disk-cdrom-bus-other.x86_64-latest.args | 3 +- ...m-empty-network-invalid.x86_64-latest.args | 3 +- .../disk-cdrom-network.x86_64-2.12.0.args | 3 +- .../disk-cdrom-network.x86_64-latest.args | 3 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 3 +- .../disk-cdrom-tray.x86_64-latest.args | 3 +- .../disk-cdrom.x86_64-2.12.0.args | 3 +- .../disk-cdrom.x86_64-latest.args | 3 +- .../disk-copy_on_read.x86_64-2.12.0.args | 3 +- .../disk-copy_on_read.x86_64-latest.args | 3 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 3 +- .../disk-detect-zeroes.x86_64-latest.args | 3 +- .../disk-discard.x86_64-4.1.0.args | 3 +- .../disk-discard.x86_64-latest.args | 3 +- .../disk-error-policy-s390x.s390x-2.12.0.args | 3 +- .../disk-error-policy-s390x.s390x-latest.args | 3 +- .../disk-error-policy.x86_64-2.12.0.args | 3 +- .../disk-error-policy.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_11.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 3 +- .../disk-floppy.x86_64-2.12.0.args | 3 +- .../disk-floppy.x86_64-latest.args | 3 +- .../disk-metadata-cache.x86_64-latest.args | 3 +- .../disk-network-gluster.x86_64-2.12.0.args | 3 +- .../disk-network-gluster.x86_64-latest.args | 3 +- .../disk-network-http.x86_64-latest.args | 3 +- .../disk-network-iscsi.x86_64-2.12.0.args | 3 +- .../disk-network-iscsi.x86_64-latest.args | 3 +- .../disk-network-nbd.x86_64-2.12.0.args | 3 +- .../disk-network-nbd.x86_64-latest.args | 3 +- .../disk-network-nfs.x86_64-latest.args | 3 +- .../disk-network-rbd.x86_64-2.12.0.args | 3 +- .../disk-network-rbd.x86_64-latest.args | 3 +- .../disk-network-sheepdog.x86_64-2.12.0.args | 3 +- .../disk-network-sheepdog.x86_64-latest.args | 3 +- ...isk-network-source-auth.x86_64-2.12.0.args | 3 +- ...isk-network-source-auth.x86_64-latest.args | 3 +- ...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 3 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 3 +- ...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 3 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 3 +- .../disk-network-tlsx509.x86_64-2.12.0.args | 3 +- .../disk-network-tlsx509.x86_64-latest.args | 3 +- .../disk-nvme.x86_64-latest.args | 3 +- .../disk-readonly-disk.x86_64-2.12.0.args | 3 +- .../disk-readonly-disk.x86_64-latest.args | 3 +- .../disk-scsi-device-auto.x86_64-latest.args | 3 +- .../disk-scsi.x86_64-latest.args | 3 +- .../disk-shared.x86_64-2.12.0.args | 3 +- .../disk-shared.x86_64-latest.args | 3 +- .../disk-slices.x86_64-latest.args | 3 +- .../disk-transient.x86_64-latest.args | 3 +- ...irtio-scsi-reservations.x86_64-2.12.0.args | 3 +- ...irtio-scsi-reservations.x86_64-latest.args | 3 +- .../eoi-disabled.x86_64-4.0.0.args | 3 +- .../eoi-disabled.x86_64-latest.args | 3 +- .../eoi-enabled.x86_64-4.0.0.args | 3 +- .../eoi-enabled.x86_64-latest.args | 3 +- .../fips-enabled.x86_64-5.1.0.args | 3 +- .../fips-enabled.x86_64-latest.args | 3 +- .../floppy-drive-fat.x86_64-2.12.0.args | 3 +- .../floppy-drive-fat.x86_64-latest.args | 3 +- .../fs9p-ccw.s390x-latest.args | 3 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 3 +- .../genid-auto.x86_64-latest.args | 3 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 3 +- ...egl-headless-rendernode.x86_64-latest.args | 3 +- .../graphics-egl-headless.x86_64-latest.args | 3 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 3 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 3 +- .../graphics-vnc-tls.x86_64-latest.args | 3 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 3 +- ...play-spice-egl-headless.x86_64-latest.args | 3 +- ...ev-display-spice-opengl.x86_64-latest.args | 3 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 3 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 3 +- .../hostdev-scsi-lsi.x86_64-4.1.0.args | 3 +- .../hostdev-scsi-lsi.x86_64-latest.args | 3 +- ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 3 +- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 3 +- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args | 3 +- .../hugepages-memaccess3.x86_64-latest.args | 3 +- .../hugepages-nvdimm.x86_64-latest.args | 3 +- .../hyperv-off.x86_64-4.0.0.args | 3 +- .../hyperv-off.x86_64-latest.args | 3 +- .../hyperv-panic.x86_64-4.0.0.args | 3 +- .../hyperv-panic.x86_64-latest.args | 3 +- .../hyperv-stimer-direct.x86_64-latest.args | 3 +- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 3 +- .../hyperv.x86_64-latest.args | 3 +- .../intel-iommu-aw-bits.x86_64-latest.args | 3 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 3 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 3 +- .../intel-iommu-eim.x86_64-latest.args | 3 +- .../intel-iommu.x86_64-latest.args | 3 +- .../iommu-smmuv3.aarch64-latest.args | 3 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 3 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 3 +- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 3 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 3 +- ...v-missing-platform-info.x86_64-2.12.0.args | 3 +- .../launch-security-sev.x86_64-2.12.0.args | 3 +- ...luks-disks-source-qcow2.x86_64-latest.args | 3 +- ...memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 3 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 3 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 3 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 3 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 3 +- .../mlock-off.x86_64-3.0.0.args | 3 +- .../mlock-off.x86_64-latest.args | 3 +- .../mlock-on.x86_64-3.0.0.args | 3 +- .../mlock-on.x86_64-latest.args | 3 +- .../net-user.x86_64-4.0.0.args | 3 +- .../net-vdpa.x86_64-latest.args | 3 +- .../net-vhostuser.x86_64-latest.args | 3 +- .../numatune-hmat.x86_64-latest.args | 3 +- .../os-firmware-bios.x86_64-latest.args | 3 +- ...os-firmware-efi-secboot.x86_64-latest.args | 3 +- .../os-firmware-efi.x86_64-latest.args | 3 +- .../parallel-unix-chardev.x86_64-latest.args | 3 +- ...cie-root-port-nohotplug.x86_64-latest.args | 3 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 3 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 3 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 3 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 3 +- .../ppc64-pseries-graphics.ppc64-latest.args | 3 +- .../ppc64-pseries-headless.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 3 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-disabled.x86_64-latest.args | 3 +- .../pv-spinlock-enabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-enabled.x86_64-latest.args | 3 +- .../qemu-ns.x86_64-4.0.0.args | 3 +- .../qemu-ns.x86_64-latest.args | 3 +- .../riscv64-virt-graphics.riscv64-latest.args | 3 +- .../riscv64-virt-headless.riscv64-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 3 +- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 3 +- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 3 +- .../s390x-ccw-graphics.s390x-latest.args | 3 +- .../s390x-ccw-headless.s390x-latest.args | 3 +- .../serial-unix-chardev.x86_64-latest.args | 3 +- ...rtcard-passthrough-unix.x86_64-latest.args | 3 +- .../tpm-emulator-spapr.ppc64-latest.args | 3 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 3 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 3 +- .../tpm-emulator-tpm2.x86_64-latest.args | 3 +- .../tpm-emulator.x86_64-latest.args | 3 +- .../tpm-passthrough-crb.x86_64-latest.args | 3 +- .../tpm-passthrough.x86_64-latest.args | 3 +- .../tseg-explicit-size.x86_64-latest.args | 3 +- .../usb-redir-unix.x86_64-latest.args | 3 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 3 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 3 +- ...host-user-gpu-secondary.x86_64-latest.args | 3 +- .../vhost-user-vga.x86_64-latest.args | 3 +- .../vhost-vsock-auto.x86_64-latest.args | 3 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 3 +- .../vhost-vsock-ccw.s390x-latest.args | 3 +- .../vhost-vsock.x86_64-latest.args | 3 +- ...eo-bochs-display-device.x86_64-latest.args | 3 +- ...video-qxl-device-vram64.x86_64-latest.args | 3 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 3 +- ...eo-ramfb-display-device.x86_64-latest.args | 3 +- .../virtio-9p-createmode.x86_64-latest.args | 3 +- .../virtio-9p-multidevs.x86_64-latest.args | 3 +- .../virtio-non-transitional.x86_64-3.1.0.args | 3 +- ...virtio-non-transitional.x86_64-latest.args | 3 +- ...-options-controller-ats.x86_64-latest.args | 3 +- ...ptions-controller-iommu.x86_64-latest.args | 3 +- ...tions-controller-packed.x86_64-latest.args | 3 +- ...virtio-options-disk-ats.x86_64-latest.args | 3 +- ...rtio-options-disk-iommu.x86_64-latest.args | 3 +- ...tio-options-disk-packed.x86_64-latest.args | 3 +- .../virtio-options-fs-ats.x86_64-latest.args | 3 +- ...virtio-options-fs-iommu.x86_64-latest.args | 3 +- ...irtio-options-fs-packed.x86_64-latest.args | 3 +- ...irtio-options-input-ats.x86_64-latest.args | 3 +- ...tio-options-input-iommu.x86_64-latest.args | 3 +- ...io-options-input-packed.x86_64-latest.args | 3 +- ...-options-memballoon-ats.x86_64-latest.args | 3 +- ...loon-freepage-reporting.x86_64-latest.args | 3 +- ...ptions-memballoon-iommu.x86_64-latest.args | 3 +- ...tions-memballoon-packed.x86_64-latest.args | 3 +- .../virtio-options-net-ats.x86_64-latest.args | 3 +- ...irtio-options-net-iommu.x86_64-latest.args | 3 +- ...rtio-options-net-packed.x86_64-latest.args | 3 +- .../virtio-options-rng-ats.x86_64-latest.args | 3 +- ...irtio-options-rng-iommu.x86_64-latest.args | 3 +- ...rtio-options-rng-packed.x86_64-latest.args | 3 +- ...irtio-options-video-ats.x86_64-latest.args | 3 +- ...tio-options-video-iommu.x86_64-latest.args | 3 +- ...io-options-video-packed.x86_64-latest.args | 3 +- .../virtio-options.x86_64-latest.args | 3 +- .../virtio-rng-builtin.x86_64-latest.args | 3 +- .../virtio-rng-egd-unix.x86_64-latest.args | 3 +- .../virtio-transitional.x86_64-3.1.0.args | 3 +- .../virtio-transitional.x86_64-latest.args | 3 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 3 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 3 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 3 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 3 +- .../x86_64-pc-graphics.x86_64-latest.args | 3 +- .../x86_64-pc-headless.x86_64-latest.args | 3 +- .../x86_64-q35-graphics.x86_64-latest.args | 3 +- .../x86_64-q35-headless.x86_64-latest.args | 3 +- 303 files changed, 886 insertions(+), 290 deletions(-) mode change 120000 => 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args -- 2.24.3

1 0

Entering freeze for libvirt-7.0.0
by Jiri Denemark 13 Jan '21

13 Jan '21

I have just tagged v$version-$rc in the repository and pushed signed tarballs to https://libvirt.org/sources/. The source RPM is missing because it is broken for some reason, I will investigate, fix it and upload later. Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 2

[PATCH] qemu: don't set interface MTU when managed='no'
by Laine Stump 13 Jan '21

13 Jan '21

managed='no' on an <interface> allows an unprivileged libvirt to use a pre-created tap/macvtap device that libvirt has permission to open/read/write, but no permission to modify (i.e. set the MTU or MAC address). But when the XML had an <mtu size='blah'/> setting (which was put there in order to tell the *guest* OS what MTU to set for the emulated device at the other end of the tap) We were attempting to set the MTU of the tap device on the host, paying no attention to the setting of 'managed'. That would of course end in failure. This patch only sets the MTU if managed='no' is *not* set (so, if it is 'yes', or just not set at all). Note that MTU of the tap is also set when connecting the tap to a bridge device, but managed='no' is only allowed for <interface type='ethernet', which would never attach to a bridge anyway, so we don't need the check there. Resolves: https://bugzilla.redhat.com/1905929 Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6f970a3128..3eff09a9d3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8149,7 +8149,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, } } - if (net->mtu && + if (net->mtu && net->managed_tap != VIR_TRISTATE_BOOL_NO && virNetDevSetMTU(net->ifname, net->mtu) < 0) goto cleanup; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f336a90c8e..95f2bd0aca 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1387,7 +1387,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } } - if (net->mtu && + if (net->mtu && net->managed_tap != VIR_TRISTATE_BOOL_NO && virNetDevSetMTU(net->ifname, net->mtu) < 0) goto cleanup; -- 2.29.2

2 1

[PATCH v3 2/3] qemu: use "-accel" option to specify accelerator instead of "-machine"
by huangy81＠chinatelecom.cn 12 Jan '21

12 Jan '21

From: Hyman <huangy81(a)chinatelecom.cn> The "-machine" options for accelerators are legacy, the "-accel" options is a better mechanism. The following are the details: https://lore.kernel.org/qemu-devel/3aa73987-40e8-3619-0723-9f17f73850bd@red… This patch switch the option "-machine accel" to "-accel" when specifying accelerator type once libvirt build QEMU command line. Since this patch involves qemuxml2argvtest, we only modify the test cases which machine type supported by QEMU with version >= 2.9.0. In addition, the test file disk-backing-chains-noindex.x86_64-latest.args has 'No newline at end of file', this patch rewrite it in case unexpected behavior. Signed-off-by: Hyman <huangy81(a)chinatelecom.cn> --- src/qemu/qemu_command.c | 131 ++++++++++++---- ...64-default-cpu-kvm-virt-4.2.aarch64-latest.args | 3 +- ...64-default-cpu-tcg-virt-4.2.aarch64-latest.args | 3 +- .../aarch64-features-sve.aarch64-latest.args | 3 +- .../aarch64-os-firmware-efi.aarch64-latest.args | 3 +- .../aarch64-virt-graphics.aarch64-latest.args | 3 +- .../aarch64-virt-headless.aarch64-latest.args | 3 +- .../blkdeviotune-group-num.x86_64-4.1.0.args | 3 +- .../blkdeviotune-group-num.x86_64-latest.args | 3 +- .../blkdeviotune-max-length.x86_64-4.1.0.args | 3 +- .../blkdeviotune-max-length.x86_64-latest.args | 3 +- .../blkdeviotune-max.x86_64-4.1.0.args | 3 +- .../blkdeviotune-max.x86_64-latest.args | 3 +- .../channel-unix-guestfwd.x86_64-latest.args | 3 +- .../clock-timer-armvtimer.aarch64-latest.args | 3 +- .../console-virtio-unix.x86_64-latest.args | 3 +- .../controller-virtio-scsi.x86_64-latest.args | 3 +- .../cpu-Icelake-Server-pconfig.x86_64-3.1.0.args | 3 +- .../cpu-Icelake-Server-pconfig.x86_64-latest.args | 3 +- .../cpu-host-model-cmt.x86_64-4.0.0.args | 3 +- .../cpu-translation.x86_64-4.0.0.args | 3 +- .../cpu-translation.x86_64-latest.args | 3 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 3 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 3 +- .../cputune-cpuset-big-id.x86_64-latest.args | 3 +- .../default-video-type-aarch64.aarch64-latest.args | 3 +- .../default-video-type-ppc64.ppc64-latest.args | 3 +- .../default-video-type-riscv64.riscv64-latest.args | 3 +- .../default-video-type-s390x.s390x-latest.args | 3 +- .../disk-aio-io_uring.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args | 3 +- tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 3 +- .../disk-arm-virtio-sd.aarch64-4.0.0.args | 3 +- .../disk-arm-virtio-sd.aarch64-latest.args | 3 +- .../disk-backing-chains-index.x86_64-latest.args | 170 ++++++++++++++++++++- .../disk-backing-chains-noindex.x86_64-2.12.0.args | 3 +- .../disk-backing-chains-noindex.x86_64-latest.args | 3 +- .../qemuxml2argvdata/disk-cache.x86_64-2.12.0.args | 3 +- .../qemuxml2argvdata/disk-cache.x86_64-latest.args | 3 +- .../disk-cdrom-bus-other.x86_64-latest.args | 3 +- ...-cdrom-empty-network-invalid.x86_64-latest.args | 3 +- .../disk-cdrom-network.x86_64-2.12.0.args | 3 +- .../disk-cdrom-network.x86_64-latest.args | 3 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 3 +- .../disk-cdrom-tray.x86_64-latest.args | 3 +- .../qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args | 3 +- .../qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 3 +- .../disk-copy_on_read.x86_64-2.12.0.args | 3 +- .../disk-copy_on_read.x86_64-latest.args | 3 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 3 +- .../disk-detect-zeroes.x86_64-latest.args | 3 +- .../disk-discard.x86_64-4.1.0.args | 3 +- .../disk-discard.x86_64-latest.args | 3 +- .../disk-error-policy-s390x.s390x-2.12.0.args | 3 +- .../disk-error-policy-s390x.s390x-latest.args | 3 +- .../disk-error-policy.x86_64-2.12.0.args | 3 +- .../disk-error-policy.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_11.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 3 +- .../disk-floppy.x86_64-2.12.0.args | 3 +- .../disk-floppy.x86_64-latest.args | 3 +- .../disk-metadata-cache.x86_64-latest.args | 3 +- .../disk-network-gluster.x86_64-2.12.0.args | 3 +- .../disk-network-gluster.x86_64-latest.args | 3 +- .../disk-network-http.x86_64-latest.args | 3 +- .../disk-network-iscsi.x86_64-2.12.0.args | 3 +- .../disk-network-iscsi.x86_64-latest.args | 3 +- .../disk-network-nbd.x86_64-2.12.0.args | 3 +- .../disk-network-nbd.x86_64-latest.args | 3 +- .../disk-network-nfs.x86_64-latest.args | 3 +- .../disk-network-rbd.x86_64-2.12.0.args | 3 +- .../disk-network-rbd.x86_64-latest.args | 3 +- .../disk-network-sheepdog.x86_64-2.12.0.args | 3 +- .../disk-network-sheepdog.x86_64-latest.args | 3 +- .../disk-network-source-auth.x86_64-2.12.0.args | 3 +- .../disk-network-source-auth.x86_64-latest.args | 3 +- .../disk-network-tlsx509-nbd.x86_64-2.12.0.args | 3 +- .../disk-network-tlsx509-nbd.x86_64-latest.args | 3 +- .../disk-network-tlsx509-vxhs.x86_64-2.12.0.args | 3 +- .../disk-network-tlsx509-vxhs.x86_64-5.0.0.args | 3 +- .../disk-network-tlsx509.x86_64-2.12.0.args | 3 +- .../disk-network-tlsx509.x86_64-latest.args | 3 +- .../qemuxml2argvdata/disk-nvme.x86_64-latest.args | 3 +- .../disk-readonly-disk.x86_64-2.12.0.args | 3 +- .../disk-readonly-disk.x86_64-latest.args | 3 +- .../disk-scsi-device-auto.x86_64-latest.args | 3 +- .../qemuxml2argvdata/disk-scsi.x86_64-latest.args | 3 +- .../disk-shared.x86_64-2.12.0.args | 3 +- .../disk-shared.x86_64-latest.args | 3 +- .../disk-slices.x86_64-latest.args | 3 +- .../disk-transient.x86_64-latest.args | 3 +- ...isk-virtio-scsi-reservations.x86_64-2.12.0.args | 3 +- ...isk-virtio-scsi-reservations.x86_64-latest.args | 3 +- .../eoi-disabled.x86_64-4.0.0.args | 3 +- .../eoi-disabled.x86_64-latest.args | 3 +- .../qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args | 3 +- .../eoi-enabled.x86_64-latest.args | 3 +- .../fips-enabled.x86_64-5.1.0.args | 3 +- .../fips-enabled.x86_64-latest.args | 3 +- .../floppy-drive-fat.x86_64-2.12.0.args | 3 +- .../floppy-drive-fat.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args | 3 +- tests/qemuxml2argvdata/fs9p.x86_64-latest.args | 3 +- .../qemuxml2argvdata/genid-auto.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/genid.x86_64-latest.args | 3 +- ...hics-egl-headless-rendernode.x86_64-latest.args | 3 +- .../graphics-egl-headless.x86_64-latest.args | 3 +- ...ics-spice-gl-auto-rendernode.x86_64-latest.args | 3 +- .../graphics-vnc-tls-secret.x86_64-latest.args | 3 +- .../graphics-vnc-tls.x86_64-latest.args | 3 +- .../hostdev-mdev-display-ramfb.x86_64-latest.args | 3 +- ...v-display-spice-egl-headless.x86_64-latest.args | 3 +- ...ev-mdev-display-spice-opengl.x86_64-latest.args | 3 +- ...dev-display-vnc-egl-headless.x86_64-latest.args | 3 +- .../hostdev-mdev-display-vnc.x86_64-latest.args | 3 +- .../hostdev-scsi-lsi.x86_64-4.1.0.args | 3 +- .../hostdev-scsi-lsi.x86_64-latest.args | 3 +- .../hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 +- .../hostdev-scsi-virtio-scsi.x86_64-latest.args | 3 +- .../hostdev-subsys-mdev-vfio-ap.s390x-latest.args | 3 +- ...dev-subsys-mdev-vfio-ccw-boot.s390x-latest.args | 3 +- .../hugepages-memaccess3.x86_64-latest.args | 3 +- .../hugepages-nvdimm.x86_64-latest.args | 3 +- .../qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args | 3 +- .../qemuxml2argvdata/hyperv-off.x86_64-latest.args | 3 +- .../hyperv-panic.x86_64-4.0.0.args | 3 +- .../hyperv-panic.x86_64-latest.args | 3 +- .../hyperv-stimer-direct.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 3 +- tests/qemuxml2argvdata/hyperv.x86_64-latest.args | 3 +- .../intel-iommu-aw-bits.x86_64-latest.args | 3 +- .../intel-iommu-caching-mode.x86_64-latest.args | 3 +- .../intel-iommu-device-iotlb.x86_64-latest.args | 3 +- .../intel-iommu-eim.x86_64-latest.args | 3 +- .../intel-iommu.x86_64-latest.args | 3 +- .../iommu-smmuv3.aarch64-latest.args | 3 +- .../iothreads-virtio-scsi-ccw.s390x-latest.args | 3 +- .../iothreads-virtio-scsi-pci.x86_64-latest.args | 3 +- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 3 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 3 +- ...ty-sev-missing-platform-info.x86_64-2.12.0.args | 3 +- .../launch-security-sev.x86_64-2.12.0.args | 3 +- .../luks-disks-source-qcow2.x86_64-latest.args | 3 +- ...emfd-memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- ...memory-hotplug-nvdimm-access.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm-align.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm-label.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 3 +- ...mory-hotplug-nvdimm-readonly.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args | 3 +- .../qemuxml2argvdata/mlock-off.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args | 3 +- tests/qemuxml2argvdata/mlock-on.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args | 3 +- tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args | 3 +- .../net-vhostuser.x86_64-latest.args | 3 +- .../numatune-hmat.x86_64-latest.args | 3 +- .../os-firmware-bios.x86_64-latest.args | 3 +- .../os-firmware-efi-secboot.x86_64-latest.args | 3 +- .../os-firmware-efi.x86_64-latest.args | 3 +- .../parallel-unix-chardev.x86_64-latest.args | 3 +- .../pcie-root-port-nohotplug.x86_64-latest.args | 3 +- ...4-default-cpu-kvm-pseries-2.7.ppc64-latest.args | 3 +- ...4-default-cpu-kvm-pseries-3.1.ppc64-latest.args | 3 +- ...4-default-cpu-kvm-pseries-4.2.ppc64-latest.args | 3 +- ...4-default-cpu-tcg-pseries-2.7.ppc64-latest.args | 3 +- ...4-default-cpu-tcg-pseries-3.1.ppc64-latest.args | 3 +- ...4-default-cpu-tcg-pseries-4.2.ppc64-latest.args | 3 +- .../ppc64-pseries-graphics.ppc64-latest.args | 3 +- .../ppc64-pseries-headless.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 3 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-disabled.x86_64-latest.args | 3 +- .../pv-spinlock-enabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-enabled.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args | 3 +- tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args | 3 +- .../riscv64-virt-graphics.riscv64-latest.args | 3 +- .../riscv64-virt-headless.riscv64-latest.args | 3 +- ...efault-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 3 +- ...efault-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 3 +- ...efault-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 3 +- ...efault-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 3 +- .../s390x-ccw-graphics.s390x-latest.args | 3 +- .../s390x-ccw-headless.s390x-latest.args | 3 +- .../serial-unix-chardev.x86_64-latest.args | 3 +- .../smartcard-passthrough-unix.x86_64-latest.args | 3 +- .../tpm-emulator-spapr.ppc64-latest.args | 3 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 3 +- .../tpm-emulator-tpm2-pstate.x86_64-latest.args | 3 +- .../tpm-emulator-tpm2.x86_64-latest.args | 3 +- .../tpm-emulator.x86_64-latest.args | 3 +- .../tpm-passthrough-crb.x86_64-latest.args | 3 +- .../tpm-passthrough.x86_64-latest.args | 3 +- .../tseg-explicit-size.x86_64-latest.args | 3 +- .../usb-redir-unix.x86_64-latest.args | 3 +- .../vhost-user-fs-fd-memory.x86_64-latest.args | 3 +- .../vhost-user-fs-hugepages.x86_64-latest.args | 3 +- .../vhost-user-gpu-secondary.x86_64-latest.args | 3 +- .../vhost-user-vga.x86_64-latest.args | 3 +- .../vhost-vsock-auto.x86_64-latest.args | 3 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 3 +- .../vhost-vsock-ccw.s390x-latest.args | 3 +- .../vhost-vsock.x86_64-latest.args | 3 +- .../video-bochs-display-device.x86_64-latest.args | 3 +- .../video-qxl-device-vram64.x86_64-latest.args | 3 +- .../video-qxl-sec-device-vram64.x86_64-latest.args | 3 +- .../video-ramfb-display-device.x86_64-latest.args | 3 +- .../virtio-9p-createmode.x86_64-latest.args | 3 +- .../virtio-9p-multidevs.x86_64-latest.args | 3 +- .../virtio-non-transitional.x86_64-3.1.0.args | 3 +- .../virtio-non-transitional.x86_64-latest.args | 3 +- ...irtio-options-controller-ats.x86_64-latest.args | 3 +- ...tio-options-controller-iommu.x86_64-latest.args | 3 +- ...io-options-controller-packed.x86_64-latest.args | 3 +- .../virtio-options-disk-ats.x86_64-latest.args | 3 +- .../virtio-options-disk-iommu.x86_64-latest.args | 3 +- .../virtio-options-disk-packed.x86_64-latest.args | 3 +- .../virtio-options-fs-ats.x86_64-latest.args | 3 +- .../virtio-options-fs-iommu.x86_64-latest.args | 3 +- .../virtio-options-fs-packed.x86_64-latest.args | 3 +- .../virtio-options-input-ats.x86_64-latest.args | 3 +- .../virtio-options-input-iommu.x86_64-latest.args | 3 +- .../virtio-options-input-packed.x86_64-latest.args | 3 +- ...irtio-options-memballoon-ats.x86_64-latest.args | 3 +- ...emballoon-freepage-reporting.x86_64-latest.args | 3 +- ...tio-options-memballoon-iommu.x86_64-latest.args | 3 +- ...io-options-memballoon-packed.x86_64-latest.args | 3 +- .../virtio-options-net-ats.x86_64-latest.args | 3 +- .../virtio-options-net-iommu.x86_64-latest.args | 3 +- .../virtio-options-net-packed.x86_64-latest.args | 3 +- .../virtio-options-rng-ats.x86_64-latest.args | 3 +- .../virtio-options-rng-iommu.x86_64-latest.args | 3 +- .../virtio-options-rng-packed.x86_64-latest.args | 3 +- .../virtio-options-video-ats.x86_64-latest.args | 3 +- .../virtio-options-video-iommu.x86_64-latest.args | 3 +- .../virtio-options-video-packed.x86_64-latest.args | 3 +- .../virtio-options.x86_64-latest.args | 3 +- .../virtio-rng-builtin.x86_64-latest.args | 3 +- .../virtio-rng-egd-unix.x86_64-latest.args | 3 +- .../virtio-transitional.x86_64-3.1.0.args | 3 +- .../virtio-transitional.x86_64-latest.args | 3 +- ...86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args | 3 +- ...6_64-default-cpu-kvm-q35-4.2.x86_64-latest.args | 3 +- ...86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args | 3 +- ...6_64-default-cpu-tcg-q35-4.2.x86_64-latest.args | 3 +- .../x86_64-pc-graphics.x86_64-latest.args | 3 +- .../x86_64-pc-headless.x86_64-latest.args | 3 +- .../x86_64-q35-graphics.x86_64-latest.args | 3 +- .../x86_64-q35-headless.x86_64-latest.args | 3 +- 255 files changed, 777 insertions(+), 283 deletions(-) mode change 120000 => 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6f970a3..0f660aa 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6711,38 +6711,42 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-machine"); virBufferAdd(&buf, def->os.machine, -1); - switch ((virDomainVirtType)def->virtType) { - case VIR_DOMAIN_VIRT_QEMU: - virBufferAddLit(&buf, ",accel=tcg"); - break; + /* QEMU lower than 2.9.0 do not support '-accel' + * fallback to '-machine accel' */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_ACCEL)) { + switch ((virDomainVirtType)def->virtType) { + case VIR_DOMAIN_VIRT_QEMU: + virBufferAddLit(&buf, ",accel=tcg"); + break; - case VIR_DOMAIN_VIRT_KVM: - virBufferAddLit(&buf, ",accel=kvm"); - break; + case VIR_DOMAIN_VIRT_KVM: + virBufferAddLit(&buf, ",accel=kvm"); + break; - case VIR_DOMAIN_VIRT_KQEMU: - case VIR_DOMAIN_VIRT_XEN: - case VIR_DOMAIN_VIRT_LXC: - case VIR_DOMAIN_VIRT_UML: - case VIR_DOMAIN_VIRT_OPENVZ: - case VIR_DOMAIN_VIRT_TEST: - case VIR_DOMAIN_VIRT_VMWARE: - case VIR_DOMAIN_VIRT_HYPERV: - case VIR_DOMAIN_VIRT_VBOX: - case VIR_DOMAIN_VIRT_PHYP: - case VIR_DOMAIN_VIRT_PARALLELS: - case VIR_DOMAIN_VIRT_BHYVE: - case VIR_DOMAIN_VIRT_VZ: - case VIR_DOMAIN_VIRT_NONE: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("the QEMU binary does not support %s"), - virDomainVirtTypeToString(def->virtType)); - return -1; + case VIR_DOMAIN_VIRT_KQEMU: + case VIR_DOMAIN_VIRT_XEN: + case VIR_DOMAIN_VIRT_LXC: + case VIR_DOMAIN_VIRT_UML: + case VIR_DOMAIN_VIRT_OPENVZ: + case VIR_DOMAIN_VIRT_TEST: + case VIR_DOMAIN_VIRT_VMWARE: + case VIR_DOMAIN_VIRT_HYPERV: + case VIR_DOMAIN_VIRT_VBOX: + case VIR_DOMAIN_VIRT_PHYP: + case VIR_DOMAIN_VIRT_PARALLELS: + case VIR_DOMAIN_VIRT_BHYVE: + case VIR_DOMAIN_VIRT_VZ: + case VIR_DOMAIN_VIRT_NONE: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("the QEMU binary does not support %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; - case VIR_DOMAIN_VIRT_LAST: - default: - virReportEnumRangeError(virDomainVirtType, def->virtType); - return -1; + case VIR_DOMAIN_VIRT_LAST: + default: + virReportEnumRangeError(virDomainVirtType, def->virtType); + return -1; + } } /* To avoid the collision of creating USB controllers when calling @@ -6947,6 +6951,70 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, static void +qemuBuildAccelCommandLineTcgOptions(void) +{ + /* TODO: build command line tcg accelerator + * property like tb-size */ +} + + +static void +qemuBuildAccelCommandLineKvmOptions(void) +{ + /* implemented in the next patch */ +} + + +static int +qemuBuildAccelCommandLine(virCommandPtr cmd, + const virDomainDef *def) +{ + /* the '-machine' options for accelerator are legacy, + * using the '-accel' options by default */ + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + virCommandAddArg(cmd, "-accel"); + + switch ((virDomainVirtType)def->virtType) { + case VIR_DOMAIN_VIRT_QEMU: + virBufferAddLit(&buf, "tcg"); + qemuBuildAccelCommandLineTcgOptions(); + break; + + case VIR_DOMAIN_VIRT_KVM: + virBufferAddLit(&buf, "kvm"); + qemuBuildAccelCommandLineKvmOptions(); + break; + + case VIR_DOMAIN_VIRT_KQEMU: + case VIR_DOMAIN_VIRT_XEN: + case VIR_DOMAIN_VIRT_LXC: + case VIR_DOMAIN_VIRT_UML: + case VIR_DOMAIN_VIRT_OPENVZ: + case VIR_DOMAIN_VIRT_TEST: + case VIR_DOMAIN_VIRT_VMWARE: + case VIR_DOMAIN_VIRT_HYPERV: + case VIR_DOMAIN_VIRT_VBOX: + case VIR_DOMAIN_VIRT_PHYP: + case VIR_DOMAIN_VIRT_PARALLELS: + case VIR_DOMAIN_VIRT_BHYVE: + case VIR_DOMAIN_VIRT_VZ: + case VIR_DOMAIN_VIRT_NONE: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("the QEMU binary does not support %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + + case VIR_DOMAIN_VIRT_LAST: + default: + virReportEnumRangeError(virDomainVirtType, def->virtType); + return -1; + } + + virCommandAddArgBuffer(cmd, &buf); + return 0; +} + +static void qemuBuildTSEGCommandLine(virCommandPtr cmd, const virDomainDef *def) { @@ -9840,6 +9908,11 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildMachineCommandLine(cmd, cfg, def, qemuCaps, priv) < 0) return NULL; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ACCEL)) { + if (qemuBuildAccelCommandLine(cmd, def) < 0) + return NULL; + } + qemuBuildTSEGCommandLine(cmd, def); if (qemuBuildCpuCommandLine(cmd, driver, def, qemuCaps) < 0) diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args index 0c1fe71..85d0dd4 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt-4.2,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt-4.2,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args index 858eadc..60b0026 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt-4.2,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt-4.2,usb=off,dump-guest-core=off,gic-version=2,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args index ba79804..0b412a9 100644 --- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -cpu host,sve512=on,sve384=off,sve256=on,sve128=on,sve=on \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args index 1ff234c..7cca330 100644 --- a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-aarch64test/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt-4.0,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt-4.0,usb=off,dump-guest-core=off,gic-version=2,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a53 \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 70be61b..de80515 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=2,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index d4b4f05..365e95f 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=2,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args index 8aa4c2b..fcfee22 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args index 79012e5..cd483c6 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args index b8416ef..c0e091e 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args index 79012e5..cd483c6 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args index b03fe20..45a5ba9 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args index 79012e5..cd483c6 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args index f500bfe..588ddd8 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args index fd6098b..4417005 100644 --- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args +++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -cpu host,kvm-no-adjvtime=on \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args index 5e64598..7050fb5 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 1d7583b..42f889c 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args index 96d4306..9235d35 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-3.1,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.1,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Icelake-Server,pconfig=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args index a512623..33a4b49 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu Icelake-Server \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args index 017e7a6..2079080 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,\ clwb=on,pku=on,la57=on,3dnowext=on,3dnow=on,npt=on,vme=off,fma=off,avx=off,\ f16c=off,rdrand=off,avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,\ diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args index f8e19fc..4e30fed 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu Haswell,pclmuldq=on,ds_cpl=on,tsc_adjust=on,fxsr_opt=on,lahf_lm=on,\ cmp_legacy=on,nodeid_msr=on,perfctr_core=on,perfctr_nb=on,kvm_pv_eoi=on,\ kvm_pv_unhalt=on \ diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args index 84c0d05..d2fafd6 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,\ cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,\ kvm-pv-unhalt=on \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args index b0e6d05..c10e5eb 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc_adjust=on,\ clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on,invtsc=on,\ tsc-frequency=3504000000 \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args index 16a4282..b36d2ac 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,\ 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,invtsc=on,\ diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args index 0ec8ba0..26759ec 100644 --- a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args index 8a27403..0a70e08 100644 --- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-a/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args index 7a491a6..57e727f 100644 --- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-p/master-key.aes \ --machine pseries,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu host \ -m 1024 \ -object memory-backend-ram,id=ppc_spapr.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args index c4acaaf..345710e 100644 --- a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-r/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index 9eef70c..02fd29e 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-s/master-key.aes \ --machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel kvm \ -cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,csske=on,mepoch=on,msa9=on,\ msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\ edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\ diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args index 69c8742..1644898 100644 --- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args index f8a8949..dd88aab 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args index 6f9b810..629f781 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args index 3c2a7cf..0706f19 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-armtest/master-key.aes \ --machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \ +-machine vexpress-a9,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args index c3007e1..54ede20 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-armtest/master-key.aes \ --machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off,\ +-machine vexpress-a9,usb=off,dump-guest-core=off,\ memory-backend=vexpress.highmem \ +-accel tcg \ -cpu cortex-a9 \ -m 1024 \ -object memory-backend-ram,id=vexpress.highmem,size=1073741824 \ 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 549eb65..0000000 --- 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 0000000..1ab1ddd --- /dev/null +++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args @@ -0,0 +1,169 @@ +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,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ +-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,nowait \ +-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-backing-chains-noindex.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args index 4769133..bd87945 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args index 0f6d70a..1ab1ddd 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args index aa7a230..bf009d2 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args index e66abd9..e1ca977 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-1.5,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index a77a851..9d2a2ce 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args index 94ffa9f..314b6ff 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args index fa5c0ba..8c7ad9b 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-1.2,usb=off,dump-guest-core=off \ +-accel kvm \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args index 3c4f399..c15bd2d 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc-1.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args index 7952c42..58e1c7b 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args index 4e4e0aa..a787e08 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args index 0621746..a42df87 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args index beac75e..4fafdac 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args index 00d5f45..d294483 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args index 493b478..126f794 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args index 090cccd..ee75aa5 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args index 97cc492..ac28b07 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args b/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args index 4437922..9181005 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args index 1aa06c7..ade6e8d 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args index 6b93b74..7c3bb65 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args index d75d7ac..fee803f 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args index 26e8f56..16195e4 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args index c0079ef..d5ae5a4 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args index b221718..18d7b68 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.11,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-2.11,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args index 7e35f6a..6d7e66e 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.11,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-q35-2.11,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args index 51be454..8bdca7b 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.9,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-2.9,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args index 47ef5db..b567432 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.9,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-q35-2.9,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args index d4f11f8..566591c 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args index 9675650..fa83112 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args index 3e52066..b80cb48 100644 --- a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args index 2721147..d77ec1a 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 1e992fb..a6d38fe 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index 954f182..f119c4d 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args index 930d8d5..38d94f1 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index ab60fc5..8c38a88 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args index 1742f01..2af0a90 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 5e5c236..e92ccfc 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args index b0bc83b..36d480d 100644 --- a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args index 21d1c2d..383cfcb 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args index e91f009..6ad57f5 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args index 653fa1a..adff0ab 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args index 4418906..1dba55b 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args index 0ccf3df..458c803 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args index 879a521..322dbc0 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ 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 afe84fe..d88d39f 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32 \ -m 214 \ -realtime mlock=off \ 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 8ec4a8a..37345a2 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ 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 d778d3d..8b023ad 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32 \ -m 214 \ -realtime mlock=off \ 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 a21f322..4a000fe 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-5.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-5.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ 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 2a30ad0..fd59d83 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32 \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args index ec4c28e..3c63929 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args index 3146ad1..0104094 100644 --- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args index 34ef204..ae56287 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args index 7a83ac4..76535e8 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args index 354686c..21149ff 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args index da4ef33..7149a19 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args index d35e7a5..906be27 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args index 4cae79c..8b0936c 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args index a24b339..cace893 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args index eea8560..6decf5e 100644 --- a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args index 21b267f..a7e19f5 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object pr-manager-helper,id=pr-helper0,\ path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 8,sockets=8,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args index a6e6c12..aa273fd 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object pr-manager-helper,id=pr-helper0,\ path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args index b0a004f..f3334ff 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_eoi=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args index a2593d1..7305a5a 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-eoi=off \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args index b008c77..35d25d4 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_eoi=on \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args index d0befba..fe04dd1 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-eoi=on \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args index e0e416d..4598948 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -enable-fips \ --machine pc-i440fx-5.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-5.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args index 4740e52..16e0e4c 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args index 90ab421..b0d590b 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args index 12f0b9c..15f9286 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args index 07d2a2d..ebc6758 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args index e340218..f6af18c 100644 --- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args index 8f08342..1649e11 100644 --- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxml2argvdata/genid.x86_64-latest.args index 7dd7d1f..4e46393 100644 --- a/tests/qemuxml2argvdata/genid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args index e602555..3b3d4e6 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args @@ -11,7 +11,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args index e602555..3b3d4e6 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args @@ -11,7 +11,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args index 9329e56..ccc8533 100644 --- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ 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 b3251fb..301348c 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index cea42c4..c625aaa 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args index f1a3026..e291f98 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args index 580cbd9..48b178e 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args index 345bddf..e1a1b99 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args index cef437a..fe0cfe6 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args index 68c28fc..d4bc505 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args index cee8911..b121778 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 89e83e3..80fd0bc 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index 973ae56..487f53a 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index c00ef41..a7ec67c 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args index a6cf270..64604be 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 512 \ -object memory-backend-ram,id=s390.ram,size=536870912 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args index be550aa..2907799 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 512 \ -object memory-backend-ram,id=s390.ram,size=536870912 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index 6033950..f743721 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-fedora/master-key.aes \ --machine pc-i440fx-2.9,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.9,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,\ 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 \ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index 969bb71..2d04b4f 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args index 6909b71..2d7b9e1 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args index ce7af1b..8c58738 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args index 55e5099..5671a9b 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,hv-crash \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args index 870fa38..a388726 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,hv-crash \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args index f64bad5..156053f 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,hv-vpindex,hv-synic,hv-stimer,hv-stimer-direct \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args index b9d9542..fc4051d 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu 'qemu32,hv_relaxed,hv_vapic,hv-spinlocks=0x2fff,hv_vpindex,hv_runtime,\ hv_synic,hv_stimer,hv_reset,hv-vendor-id=KVM Hv,hv_frequencies,\ hv_reenlightenment,hv_tlbflush,hv_ipi,hv_evmcs' \ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args index c6cba06..d312485 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu 'qemu64,hv-relaxed,hv-vapic,hv-spinlocks=0x2fff,hv-vpindex,hv-runtime,\ hv-synic,hv-stimer,hv-reset,hv-vendor-id=KVM Hv,hv-frequencies,\ hv-reenlightenment,hv-tlbflush,hv-ipi,hv-evmcs' \ diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args index 211ea3d..f305b37 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args index cea414a..a258b64 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args index ef2fa61..7e832b9 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args index 43e666d..1bb877e 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args index 5fe3ed0..2fc3276 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args index 6ee6108..868f376 100644 --- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args +++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index f8a5aaa..ab5dbb1 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index a2f4d5e..ae6fe5c 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args index c67e253..2b4244c 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvmclock=off,kvm_pv_eoi=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args index 8842d2a..7ad6f0a 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvmclock=off,kvm-pv-eoi=off \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args index 378c3b6..325b081 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.0,accel=kvm,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-machine pc-1.0,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args index 378c3b6..325b081 100644 --- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.0,accel=kvm,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-machine pc-1.0,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args index 6e469d1..2119eb2 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \ --machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.1,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ 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 ef15e2e..a431ca0 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index ef15e2e..a431ca0 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=off \ 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 8d3fa2e..9367b2b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 4f22f78..9d7a04c 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 53dda23..75a3d70 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 fb4ae4b..ae550f1 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 5e44496..26f224c 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 94f8444..4148e0a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args index 8f3725e..3314c4d 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-3.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args index 2772c82..6ec5d12 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args index 46e63a2..191ace7 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-3.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=on \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args index f77d866..515b8de 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args index 190b068..b8f011a 100644 --- a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args index 002ec49..bef606b 100644 --- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args index d889d34..64385a3 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index c52015c..453d350 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,hmat=on \ +-machine pc,usb=off,dump-guest-core=off,hmat=on \ +-accel tcg \ -cpu qemu64 \ -m 12288 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args index ab94f30..493a4ce 100644 --- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-fedora/master-key.aes \ --machine pc-q35-4.0,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-q35-4.0,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ -m 8 \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args index 1eb5aad..a6284d0 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-fedora/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,accel=kvm,usb=off,smm=on,dump-guest-core=off,\ +-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -global driver=cfi.pflash01,property=secure,value=on \ -m 8 \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args index 9b8cbc4..6e26d44 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-fedora/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,accel=kvm,usb=off,smm=on,dump-guest-core=off,\ +-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 8 \ -object memory-backend-ram,id=pc.ram,size=8388608 \ diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args index ea333ef..97bc1b6 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args index 619b03a..6696300 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args index c72b0de..801806e 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-2.7,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries-2.7,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args index ce6b9b0..2a22ef8 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-3.1,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries-3.1,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args index 18e7488..2776d6b 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries-4.2,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args index 5679ba4..1792d83 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-2.7,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-2.7,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER7 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args index 2520237..63b4371 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-3.1,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-3.1,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER8 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args index deeeb8b..b3377fc 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-4.2,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args index 4b6d90c..c0d6531 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args index 6735769..128e6d2 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args index 6190b82..f9b2e38 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 256 \ -object memory-backend-ram,id=ppc_spapr.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args index cac8c27..87ac273 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 256 \ -object memory-backend-ram,id=ppc_spapr.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args index 76e439c..4bb2b43 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_unhalt=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args index 30f45b8..f104e65 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-unhalt=off \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args index e19ebfd..6378655 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_unhalt=on \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args index beb0e5f..bb09fc9 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-unhalt=on \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args index 0f3253f..b2ee231 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args @@ -14,7 +14,8 @@ BAR='' \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args index aefe486..e46fb7a 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -14,7 +14,8 @@ BAR='' \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args index 612e1ce..2e9058b 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 4096 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args index 8485e3d..f95437a 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 4096 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args index a8be43a..730086a 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-2.7,accel=kvm,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel kvm \ -cpu host \ -m 256 \ -object memory-backend-ram,id=s390.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args index 62ffe27..70592c7 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel kvm \ -cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,csske=on,mepoch=on,msa9=on,\ msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\ edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args index f57880c..de63431 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-2.7,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 256 \ -object memory-backend-ram,id=s390.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args index 155e9b3..6f021d9 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 256 \ -object memory-backend-ram,id=s390.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 8c86670..17a9751 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 4096 \ -object memory-backend-ram,id=s390.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index c44c4dd..f1d257b 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 4096 \ -object memory-backend-ram,id=s390.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args index 07b7aba..a41dc11 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args index 3e0262e..a5454b7 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args index 96bf940..b8429ee 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pseries-5.0,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-5.0,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 2048 \ -object memory-backend-ram,id=ppc_spapr.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args index 90505c7..057690f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args index 90505c7..057690f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args index 90505c7..057690f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args index 90505c7..057690f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args index 911d0c6..3f5880e 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args index 5da7d13..436fff0 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args index 2e931df..fe6eaf6 100644 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.10,accel=tcg,usb=off,smm=on,dump-guest-core=off,\ +-machine pc-q35-2.10,usb=off,smm=on,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -global mch.extended-tseg-mbytes=48 \ -cpu qemu64 \ -m 214 \ diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args index 1d247b0..60b739a 100644 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ 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 dd5f68a..f1d1058 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=off \ 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 e4f5db7..7cf6f05 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -overcommit mem-lock=off \ 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 e99a534..d758318 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index 277bf8c..f39b900 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args index bc9102e..0acef70 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.9,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.9,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args index c70f051..99847d0 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args index e1b17eb..ccc034f 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args index a461d4d..984bf85 100644 --- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args index 094c96a..c4914d6 100644 --- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args index 6f38fae..8889752 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args index e79c21e..87d7467 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args index 5e4d4db..0a0f2b4 100644 --- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args index 601d4d2..36ebcff 100644 --- a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args index 4e453a2..4d91a3c 100644 --- a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args index 82a977b..d2bbac8 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-3.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-3.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index 8674a4b..8c3cf59 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args index 6552ee6..7657f1f 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args index 15eb4b5..a182cbd 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args index ae605a6..ba36cea 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args index 908b572..9dd9411 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args index 3a030d8..52546a1 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args index 0cc82a2..f374e62 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args index 92b8e24..99663ca 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args index 62c2d34..4245727 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args index 79aa5ca..3eda7ef 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args index 27375c9..e4a2ce2 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args index b38a8f3..79044a7 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args index 38a402e..1550de3 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args index 9b4ef37..0ec0ead 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args index 6ebc45d..659498f 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args index ead8785..af48807 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args index 3c32335..1a46428 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args index 12c0764..a86028f 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args index f2d626a..3cfdfa4 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args index e645353..9ed9870 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args index cd4807b..ad85b4a 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args index 66fb11b..4ed20c4 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args index 3feff0e..5e4e23b 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args index 3ec61da..fb3fa67 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args index cfd3024..958c89b 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args index c5719bb..f6b5303 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args index e230e92..036ee91 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args index f8e37ce..53f6c3c 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args index 192d844..14db22d 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args index ed810d5..1612599 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-3.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-3.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index c526d7a..ff2f33a 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args index ad770d2..5b26597 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-i440fx-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args index 81df0cb..1002c52 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-q35-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-q35-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args index ffc52d8..f2f5b55 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-i440fx-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args index eda728f..e85c4d9 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-q35-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-q35-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args index 5458fc6..734043c 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args index d2246d0..0efe66f 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index e9d4e2c..3beafee 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args index 8bec375..ca5b286 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ -- 1.8.3.1

2 1

[PATCH v2 1/1] NEWS.rst: update with pSeries initial memory fix
by Daniel Henrique Barboza 12 Jan '21

12 Jan '21

Commit v6.10.0-103-g198c1eb6b4 fixed this issue. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- Changes from v2: - clarified that the bug fix will not affect existing guests that will update from an older Libvirt version to 7.0.0. NEWS.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index da88b19d0a..fffdccd39d 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -23,6 +23,14 @@ v7.0.0 (unreleased) * **Bug fixes** + * Avoid taking extra host memory when launching pSeries guests + + Under certain conditions, pSeries guests were being launched with more + RAM than it was specified in the domain XML by the user. New pSeries + domains created with libvirt 7.0.0 will always launch with the right + amount of initial memory. Existing guests that migrate from an older + libvirt version to 7.0.0 will not be affected by this change. + v6.10.0 (2020-12-01) ==================== -- 2.26.2

2 2

[PATCH RFC 1/2] qemu: use "-accel" option to specify accelerator instead of "-machine"
by huangy81＠chinatelecom.cn 12 Jan '21

12 Jan '21

From: Hyman <huangy81(a)chinatelecom.cn> The "-machine" options for accelerators are legacy, the "-accel" options is a better mechanism. The following are the details: https://lore.kernel.org/qemu-devel/3aa73987-40e8-3619-0723-9f17f73850bd@red… This patch switch the option "-machine accel=xxx" to "-accel xxx" when specifying accelerator type once libvirt build QEMU command line. Since this patch involves many test case of qemuxml2argvtest, do it carefully. Signed-off-by: Hyman <huangy81(a)chinatelecom.cn> --- src/qemu/qemu_command.c | 83 +++++++++++++--------- .../aarch64-aavmf-virtio-mmio.args | 3 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 3 +- .../qemuxml2argvdata/aarch64-cpu-passthrough.args | 3 +- ...64-default-cpu-kvm-virt-4.2.aarch64-latest.args | 3 +- ...64-default-cpu-tcg-virt-4.2.aarch64-latest.args | 3 +- .../aarch64-features-sve.aarch64-latest.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 3 +- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 3 +- tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 3 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 3 +- .../aarch64-os-firmware-efi.aarch64-latest.args | 3 +- tests/qemuxml2argvdata/aarch64-pci-serial.args | 3 +- .../qemuxml2argvdata/aarch64-traditional-pci.args | 3 +- .../aarch64-usb-controller-nec-xhci.args | 3 +- .../aarch64-usb-controller-qemu-xhci.args | 3 +- tests/qemuxml2argvdata/aarch64-video-default.args | 3 +- .../aarch64-video-virtio-gpu-pci.args | 3 +- .../aarch64-virt-2.6-virtio-pci-default.args | 3 +- .../qemuxml2argvdata/aarch64-virt-default-nic.args | 3 +- .../aarch64-virt-graphics.aarch64-latest.args | 3 +- .../aarch64-virt-headless.aarch64-latest.args | 3 +- tests/qemuxml2argvdata/aarch64-virt-virtio.args | 3 +- .../aarch64-virtio-pci-default.args | 3 +- .../aarch64-virtio-pci-manual-addresses.args | 3 +- tests/qemuxml2argvdata/acpi-table.args | 3 +- tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 3 +- tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 3 +- tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 3 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 3 +- tests/qemuxml2argvdata/autoindex.args | 3 +- tests/qemuxml2argvdata/balloon-ccw-deflate.args | 3 +- tests/qemuxml2argvdata/balloon-device-auto.args | 3 +- .../balloon-device-deflate-off.args | 3 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 3 +- tests/qemuxml2argvdata/balloon-device-period.args | 3 +- tests/qemuxml2argvdata/balloon-device.args | 3 +- tests/qemuxml2argvdata/balloon-mmio-deflate.args | 3 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 3 +- tests/qemuxml2argvdata/bios-nvram.args | 3 +- tests/qemuxml2argvdata/bios.args | 3 +- .../blkdeviotune-group-num.x86_64-4.1.0.args | 3 +- .../blkdeviotune-group-num.x86_64-latest.args | 3 +- .../blkdeviotune-max-length.x86_64-4.1.0.args | 3 +- .../blkdeviotune-max-length.x86_64-latest.args | 3 +- .../blkdeviotune-max.x86_64-4.1.0.args | 3 +- .../blkdeviotune-max.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/blkiotune-device.args | 3 +- tests/qemuxml2argvdata/blkiotune.args | 3 +- tests/qemuxml2argvdata/boot-cdrom.args | 3 +- tests/qemuxml2argvdata/boot-complex.args | 3 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 3 +- tests/qemuxml2argvdata/boot-floppy.args | 3 +- .../qemuxml2argvdata/boot-menu-disable-drive.args | 3 +- tests/qemuxml2argvdata/boot-menu-disable.args | 3 +- .../boot-menu-enable-with-timeout.args | 3 +- tests/qemuxml2argvdata/boot-menu-enable.args | 3 +- tests/qemuxml2argvdata/boot-multi.args | 3 +- tests/qemuxml2argvdata/boot-network.args | 3 +- tests/qemuxml2argvdata/boot-order.args | 3 +- tests/qemuxml2argvdata/boot-strict.args | 3 +- tests/qemuxml2argvdata/channel-guestfwd.args | 3 +- tests/qemuxml2argvdata/channel-spicevmc.args | 3 +- .../channel-unix-guestfwd.x86_64-2.5.0.args | 3 +- .../channel-unix-guestfwd.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 3 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 3 +- .../channel-virtio-autoassign.args | 3 +- tests/qemuxml2argvdata/channel-virtio-default.args | 3 +- tests/qemuxml2argvdata/channel-virtio-state.args | 3 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 3 +- tests/qemuxml2argvdata/channel-virtio.args | 3 +- tests/qemuxml2argvdata/chardev-reconnect.args | 3 +- tests/qemuxml2argvdata/clock-catchup.args | 3 +- tests/qemuxml2argvdata/clock-france.args | 3 +- tests/qemuxml2argvdata/clock-hpet-off.args | 3 +- .../clock-localtime-basis-localtime.args | 3 +- tests/qemuxml2argvdata/clock-localtime.args | 3 +- .../clock-timer-armvtimer.aarch64-latest.args | 3 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 3 +- tests/qemuxml2argvdata/clock-utc.args | 3 +- tests/qemuxml2argvdata/clock-variable.args | 3 +- tests/qemuxml2argvdata/console-compat-auto.args | 3 +- tests/qemuxml2argvdata/console-compat-chardev.args | 3 +- tests/qemuxml2argvdata/console-compat.args | 3 +- tests/qemuxml2argvdata/console-sclp.args | 3 +- tests/qemuxml2argvdata/console-virtio-ccw.args | 3 +- tests/qemuxml2argvdata/console-virtio-many.args | 3 +- tests/qemuxml2argvdata/console-virtio-s390.args | 3 +- .../console-virtio-unix.x86_64-2.5.0.args | 3 +- .../console-virtio-unix.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/console-virtio.args | 3 +- tests/qemuxml2argvdata/controller-order.args | 3 +- .../controller-virtio-scsi.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 3 +- tests/qemuxml2argvdata/cpu-Haswell.args | 3 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 3 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 3 +- .../cpu-Icelake-Server-pconfig.x86_64-3.1.0.args | 3 +- .../cpu-Icelake-Server-pconfig.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 3 +- tests/qemuxml2argvdata/cpu-cache-disable2.args | 3 +- tests/qemuxml2argvdata/cpu-cache-disable3.args | 3 +- tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 3 +- tests/qemuxml2argvdata/cpu-cache-passthrough.args | 3 +- tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 3 +- tests/qemuxml2argvdata/cpu-check-default-none.args | 3 +- .../qemuxml2argvdata/cpu-check-default-none2.args | 3 +- .../cpu-check-default-partial.args | 3 +- .../cpu-check-default-partial2.args | 3 +- tests/qemuxml2argvdata/cpu-check-none.args | 3 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 3 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 3 +- tests/qemuxml2argvdata/cpu-exact1.args | 3 +- tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 3 +- tests/qemuxml2argvdata/cpu-exact2.args | 3 +- tests/qemuxml2argvdata/cpu-fallback.args | 3 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 3 +- tests/qemuxml2argvdata/cpu-host-model-cmt.args | 3 +- .../cpu-host-model-cmt.x86_64-4.0.0.args | 3 +- .../qemuxml2argvdata/cpu-host-model-fallback.args | 3 +- tests/qemuxml2argvdata/cpu-host-model-vendor.args | 3 +- tests/qemuxml2argvdata/cpu-host-model.args | 3 +- .../cpu-host-passthrough-features.args | 3 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 3 +- tests/qemuxml2argvdata/cpu-hotplug-startup.args | 3 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 3 +- tests/qemuxml2argvdata/cpu-minimum1.args | 3 +- tests/qemuxml2argvdata/cpu-minimum2.args | 3 +- .../qemuxml2argvdata/cpu-no-removed-features.args | 3 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 3 +- tests/qemuxml2argvdata/cpu-numa-memshared.args | 3 +- .../cpu-numa-no-memory-element.args | 3 +- tests/qemuxml2argvdata/cpu-numa1.args | 3 +- tests/qemuxml2argvdata/cpu-numa2.args | 3 +- tests/qemuxml2argvdata/cpu-s390-features.args | 3 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 3 +- tests/qemuxml2argvdata/cpu-strict1.args | 3 +- tests/qemuxml2argvdata/cpu-topology1.args | 3 +- tests/qemuxml2argvdata/cpu-topology2.args | 3 +- tests/qemuxml2argvdata/cpu-topology3.args | 3 +- .../cpu-translation.x86_64-4.0.0.args | 3 +- .../cpu-translation.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 3 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 3 +- .../cpu-tsc-high-frequency.x86_64-latest.args | 3 +- .../cputune-cpuset-big-id.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/cputune-numatune.args | 3 +- tests/qemuxml2argvdata/cputune-zero-shares.args | 3 +- tests/qemuxml2argvdata/cputune.args | 3 +- tests/qemuxml2argvdata/debug-threads.args | 3 +- tests/qemuxml2argvdata/default-kvm-host-arch.args | 3 +- tests/qemuxml2argvdata/default-qemu-host-arch.args | 3 +- .../default-video-type-aarch64.aarch64-latest.args | 3 +- .../default-video-type-ppc64.ppc64-latest.args | 3 +- .../default-video-type-riscv64.riscv64-latest.args | 3 +- .../default-video-type-s390x.s390x-latest.args | 3 +- .../disk-aio-io_uring.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-aio.args | 3 +- tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args | 3 +- tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 3 +- .../disk-arm-virtio-sd.aarch64-4.0.0.args | 3 +- .../disk-arm-virtio-sd.aarch64-latest.args | 3 +- .../disk-backing-chains-noindex.x86_64-2.12.0.args | 3 +- .../disk-backing-chains-noindex.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-blockio.args | 3 +- tests/qemuxml2argvdata/disk-boot-cdrom.args | 3 +- tests/qemuxml2argvdata/disk-boot-disk.args | 3 +- .../qemuxml2argvdata/disk-cache.x86_64-1.5.3.args | 3 +- .../qemuxml2argvdata/disk-cache.x86_64-2.12.0.args | 3 +- .../qemuxml2argvdata/disk-cache.x86_64-2.6.0.args | 3 +- .../qemuxml2argvdata/disk-cache.x86_64-2.7.0.args | 3 +- .../qemuxml2argvdata/disk-cache.x86_64-latest.args | 3 +- .../disk-cdrom-bus-other.x86_64-latest.args | 3 +- ...-cdrom-empty-network-invalid.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-cdrom-network.args | 3 +- .../disk-cdrom-network.x86_64-2.12.0.args | 3 +- .../disk-cdrom-network.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 3 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 3 +- .../disk-cdrom-tray.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-cdrom.args | 3 +- .../qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args | 3 +- .../qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 3 +- .../disk-copy_on_read.x86_64-2.12.0.args | 3 +- .../disk-copy_on_read.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-detect-zeroes.args | 3 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 3 +- .../disk-detect-zeroes.x86_64-latest.args | 3 +- .../disk-discard.x86_64-4.1.0.args | 3 +- .../disk-discard.x86_64-latest.args | 3 +- .../disk-error-policy-s390x.s390x-2.12.0.args | 3 +- .../disk-error-policy-s390x.s390x-latest.args | 3 +- tests/qemuxml2argvdata/disk-error-policy.args | 3 +- .../disk-error-policy.x86_64-2.12.0.args | 3 +- .../disk-error-policy.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_11.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 3 +- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 3 +- .../disk-floppy-q35-2_9.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-floppy-tray.args | 3 +- tests/qemuxml2argvdata/disk-floppy.args | 3 +- .../disk-floppy.x86_64-2.12.0.args | 3 +- .../disk-floppy.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-fmt-qcow.args | 3 +- tests/qemuxml2argvdata/disk-geometry.args | 3 +- tests/qemuxml2argvdata/disk-ide-split.args | 3 +- tests/qemuxml2argvdata/disk-ide-wwn.args | 3 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 3 +- tests/qemuxml2argvdata/disk-iscsi.args | 3 +- .../disk-metadata-cache.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-network-gluster.args | 3 +- .../disk-network-gluster.x86_64-2.12.0.args | 3 +- .../disk-network-gluster.x86_64-latest.args | 3 +- .../disk-network-http.x86_64-latest.args | 3 +- .../disk-network-iscsi-modern.args | 3 +- tests/qemuxml2argvdata/disk-network-iscsi.args | 3 +- .../disk-network-iscsi.x86_64-2.12.0.args | 3 +- .../disk-network-iscsi.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-network-nbd.args | 3 +- .../disk-network-nbd.x86_64-2.12.0.args | 3 +- .../disk-network-nbd.x86_64-latest.args | 3 +- .../disk-network-nfs.x86_64-latest.args | 3 +- .../disk-network-rbd.x86_64-2.12.0.args | 3 +- .../disk-network-rbd.x86_64-2.5.0.args | 3 +- .../disk-network-rbd.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-network-sheepdog.args | 3 +- .../disk-network-sheepdog.x86_64-2.12.0.args | 3 +- .../disk-network-sheepdog.x86_64-latest.args | 3 +- .../qemuxml2argvdata/disk-network-source-auth.args | 3 +- .../disk-network-source-auth.x86_64-2.12.0.args | 3 +- .../disk-network-source-auth.x86_64-latest.args | 3 +- .../disk-network-tlsx509-nbd.x86_64-2.12.0.args | 3 +- .../disk-network-tlsx509-nbd.x86_64-latest.args | 3 +- .../disk-network-tlsx509-vxhs.x86_64-2.12.0.args | 3 +- .../disk-network-tlsx509-vxhs.x86_64-5.0.0.args | 3 +- .../disk-network-tlsx509.x86_64-2.12.0.args | 3 +- .../disk-network-tlsx509.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-network-vxhs.args | 3 +- tests/qemuxml2argvdata/disk-no-boot.args | 3 +- .../qemuxml2argvdata/disk-nvme.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-order.args | 3 +- tests/qemuxml2argvdata/disk-readonly-disk.args | 3 +- .../disk-readonly-disk.x86_64-2.12.0.args | 3 +- .../disk-readonly-disk.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-sata-device.args | 3 +- .../disk-scsi-device-auto.x86_64-1.5.3.args | 3 +- .../disk-scsi-device-auto.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-scsi-disk-split.args | 3 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 3 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 3 +- .../disk-scsi-lun-passthrough.args | 3 +- .../qemuxml2argvdata/disk-scsi.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-serial.args | 3 +- .../disk-shared.x86_64-2.12.0.args | 3 +- .../disk-shared.x86_64-latest.args | 3 +- .../disk-slices.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-snapshot.args | 3 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 3 +- tests/qemuxml2argvdata/disk-source-pool.args | 3 +- .../disk-transient.x86_64-latest.args | 3 +- .../disk-usb-device-removable.args | 3 +- tests/qemuxml2argvdata/disk-usb-device.args | 3 +- tests/qemuxml2argvdata/disk-virtio-ccw-many.args | 3 +- tests/qemuxml2argvdata/disk-virtio-ccw.args | 3 +- tests/qemuxml2argvdata/disk-virtio-queues.args | 3 +- tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 3 +- tests/qemuxml2argvdata/disk-virtio-s390.args | 3 +- ...isk-virtio-scsi-reservations.x86_64-2.12.0.args | 3 +- ...isk-virtio-scsi-reservations.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-virtio.args | 3 +- tests/qemuxml2argvdata/encrypted-disk-usage.args | 3 +- tests/qemuxml2argvdata/encrypted-disk.args | 3 +- .../eoi-disabled.x86_64-2.7.0.args | 3 +- .../eoi-disabled.x86_64-4.0.0.args | 3 +- .../eoi-disabled.x86_64-latest.args | 3 +- .../qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args | 3 +- .../qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args | 3 +- .../eoi-enabled.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/event_idx.args | 3 +- .../fd-memory-no-numa-topology.args | 3 +- .../qemuxml2argvdata/fd-memory-numa-topology.args | 3 +- .../qemuxml2argvdata/fd-memory-numa-topology2.args | 3 +- .../qemuxml2argvdata/fd-memory-numa-topology3.args | 3 +- .../fips-enabled.x86_64-5.1.0.args | 3 +- .../fips-enabled.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/floppy-drive-fat.args | 3 +- .../floppy-drive-fat.x86_64-2.12.0.args | 3 +- .../floppy-drive-fat.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/fs9p-ccw.args | 3 +- tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args | 3 +- tests/qemuxml2argvdata/fs9p.args | 3 +- tests/qemuxml2argvdata/fs9p.x86_64-latest.args | 3 +- .../qemuxml2argvdata/genid-auto.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/genid.x86_64-latest.args | 3 +- ...hics-egl-headless-rendernode.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/graphics-egl-headless.args | 3 +- .../graphics-egl-headless.x86_64-latest.args | 3 +- .../qemuxml2argvdata/graphics-sdl-fullscreen.args | 3 +- tests/qemuxml2argvdata/graphics-sdl.args | 3 +- .../graphics-spice-agent-file-xfer.args | 3 +- .../graphics-spice-agentmouse.args | 3 +- .../graphics-spice-auto-socket-cfg.args | 3 +- .../graphics-spice-auto-socket.args | 3 +- .../graphics-spice-compression.args | 3 +- .../graphics-spice-egl-headless.args | 3 +- ...ics-spice-gl-auto-rendernode.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/graphics-spice-no-args.args | 3 +- tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 3 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 3 +- tests/qemuxml2argvdata/graphics-spice-socket.args | 3 +- tests/qemuxml2argvdata/graphics-spice-timeout.args | 3 +- .../qemuxml2argvdata/graphics-spice-usb-redir.args | 3 +- tests/qemuxml2argvdata/graphics-spice.args | 3 +- .../graphics-vnc-auto-socket-cfg.args | 3 +- .../qemuxml2argvdata/graphics-vnc-auto-socket.args | 3 +- .../graphics-vnc-egl-headless.args | 3 +- .../graphics-vnc-no-listen-attr.args | 3 +- tests/qemuxml2argvdata/graphics-vnc-none.args | 3 +- tests/qemuxml2argvdata/graphics-vnc-policy.args | 3 +- .../graphics-vnc-remove-generated-socket.args | 3 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 3 +- .../graphics-vnc-socket-new-cmdline.args | 3 +- tests/qemuxml2argvdata/graphics-vnc-socket.args | 3 +- .../graphics-vnc-tls-secret.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/graphics-vnc-tls.args | 3 +- .../graphics-vnc-tls.x86_64-2.4.0.args | 3 +- .../graphics-vnc-tls.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/graphics-vnc-websocket.args | 3 +- tests/qemuxml2argvdata/graphics-vnc.args | 3 +- .../hostdev-mdev-display-ramfb.x86_64-latest.args | 3 +- ...v-display-spice-egl-headless.x86_64-latest.args | 3 +- ...ev-mdev-display-spice-opengl.x86_64-latest.args | 3 +- ...dev-display-vnc-egl-headless.x86_64-latest.args | 3 +- .../hostdev-mdev-display-vnc.x86_64-latest.args | 3 +- .../qemuxml2argvdata/hostdev-mdev-precreated.args | 3 +- .../hostdev-pci-address-device.args | 3 +- .../hostdev-pci-address-unassigned.args | 3 +- tests/qemuxml2argvdata/hostdev-pci-address.args | 3 +- .../hostdev-pci-multifunction.args | 3 +- .../hostdev-scsi-lsi.x86_64-2.8.0.args | 3 +- .../hostdev-scsi-lsi.x86_64-4.1.0.args | 3 +- .../hostdev-scsi-lsi.x86_64-latest.args | 3 +- .../hostdev-scsi-vhost-scsi-ccw.args | 3 +- .../hostdev-scsi-vhost-scsi-pci.args | 3 +- .../hostdev-scsi-vhost-scsi-pcie.args | 3 +- .../hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 3 +- .../hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 3 +- .../hostdev-scsi-virtio-scsi.x86_64-latest.args | 3 +- .../hostdev-subsys-mdev-vfio-ap.s390x-latest.args | 3 +- ...dev-subsys-mdev-vfio-ccw-boot.s390x-latest.args | 3 +- .../hostdev-subsys-mdev-vfio-ccw.args | 3 +- .../hostdev-usb-address-device-boot.args | 3 +- .../hostdev-usb-address-device.args | 3 +- tests/qemuxml2argvdata/hostdev-usb-address.args | 3 +- .../qemuxml2argvdata/hostdev-vfio-multidomain.args | 3 +- .../hostdev-vfio-zpci-autogenerate-fids.args | 3 +- .../hostdev-vfio-zpci-autogenerate-uids.args | 3 +- .../hostdev-vfio-zpci-autogenerate.args | 3 +- .../hostdev-vfio-zpci-boundaries.args | 3 +- .../hostdev-vfio-zpci-ccw-memballoon.args | 3 +- .../hostdev-vfio-zpci-multidomain-many.args | 3 +- tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 3 +- tests/qemuxml2argvdata/hostdev-vfio.args | 3 +- tests/qemuxml2argvdata/hotplug-base.args | 3 +- tests/qemuxml2argvdata/hugepages-default-2M.args | 3 +- .../hugepages-default-system-size.args | 3 +- tests/qemuxml2argvdata/hugepages-default.args | 3 +- tests/qemuxml2argvdata/hugepages-memaccess.args | 3 +- tests/qemuxml2argvdata/hugepages-memaccess2.args | 3 +- .../hugepages-memaccess3.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/hugepages-nodeset.args | 3 +- .../hugepages-numa-default-2M.args | 3 +- .../hugepages-numa-default-dimm.args | 3 +- tests/qemuxml2argvdata/hugepages-numa-default.args | 3 +- .../hugepages-numa-nodeset-part.args | 3 +- tests/qemuxml2argvdata/hugepages-numa-nodeset.args | 3 +- .../hugepages-nvdimm.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/hugepages-shared.args | 3 +- .../qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args | 3 +- .../qemuxml2argvdata/hyperv-off.x86_64-latest.args | 3 +- .../hyperv-panic.x86_64-4.0.0.args | 3 +- .../hyperv-panic.x86_64-latest.args | 3 +- .../hyperv-stimer-direct.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 3 +- tests/qemuxml2argvdata/hyperv.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/input-usbmouse-addr.args | 3 +- tests/qemuxml2argvdata/input-usbmouse.args | 3 +- tests/qemuxml2argvdata/input-usbtablet.args | 3 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 3 +- .../intel-iommu-aw-bits.x86_64-latest.args | 3 +- .../intel-iommu-caching-mode.x86_64-latest.args | 3 +- .../intel-iommu-device-iotlb.x86_64-latest.args | 3 +- .../intel-iommu-eim.x86_64-latest.args | 3 +- .../qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args | 3 +- .../intel-iommu.x86_64-latest.args | 3 +- .../iommu-smmuv3.aarch64-latest.args | 3 +- .../iothreads-disk-virtio-ccw.args | 3 +- tests/qemuxml2argvdata/iothreads-disk.args | 3 +- tests/qemuxml2argvdata/iothreads-ids-partial.args | 3 +- tests/qemuxml2argvdata/iothreads-ids.args | 3 +- .../iothreads-virtio-scsi-ccw.s390x-latest.args | 3 +- .../iothreads-virtio-scsi-pci.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/iothreads.args | 3 +- tests/qemuxml2argvdata/kvm-features-off.args | 3 +- tests/qemuxml2argvdata/kvm-features.args | 3 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 3 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 3 +- .../kvmclock+eoi-disabled.x86_64-2.7.0.args | 3 +- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 3 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/kvmclock.args | 3 +- ...ty-sev-missing-platform-info.x86_64-2.12.0.args | 3 +- .../launch-security-sev.x86_64-2.12.0.args | 3 +- .../qemuxml2argvdata/luks-disks-source-qcow2.args | 3 +- .../luks-disks-source-qcow2.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/luks-disks-source.args | 3 +- tests/qemuxml2argvdata/luks-disks.args | 3 +- .../qemuxml2argvdata/mach-virt-console-virtio.args | 3 +- .../qemuxml2argvdata/mach-virt-serial-native.args | 3 +- tests/qemuxml2argvdata/mach-virt-serial-pci.args | 3 +- tests/qemuxml2argvdata/mach-virt-serial-usb.args | 3 +- .../machine-aeskeywrap-off-cap.args | 3 +- .../machine-aeskeywrap-off-caps.args | 3 +- .../machine-aeskeywrap-on-cap.args | 3 +- .../machine-aeskeywrap-on-caps.args | 3 +- tests/qemuxml2argvdata/machine-aliases1.args | 3 +- tests/qemuxml2argvdata/machine-aliases2.args | 3 +- tests/qemuxml2argvdata/machine-core-off.args | 3 +- tests/qemuxml2argvdata/machine-core-on.args | 3 +- .../machine-deakeywrap-off-cap.args | 3 +- .../machine-deakeywrap-off-caps.args | 3 +- .../machine-deakeywrap-on-cap.args | 3 +- .../machine-deakeywrap-on-caps.args | 3 +- .../machine-keywrap-none-caps.args | 3 +- tests/qemuxml2argvdata/machine-keywrap-none.args | 3 +- .../machine-loadparm-multiple-disks-nets-s390.args | 3 +- .../machine-loadparm-net-s390.args | 3 +- tests/qemuxml2argvdata/machine-loadparm-s390.args | 3 +- tests/qemuxml2argvdata/machine-smm-opt.args | 3 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 3 +- tests/qemuxml2argvdata/master-key.args | 3 +- ...emfd-memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- .../qemuxml2argvdata/memory-hotplug-dimm-addr.args | 3 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 3 +- ...memory-hotplug-nvdimm-access.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm-align.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm-label.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm-ppc64-abi-update.args | 3 +- .../memory-hotplug-nvdimm-ppc64.args | 3 +- ...mory-hotplug-nvdimm-readonly.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 3 +- .../memory-hotplug-ppc64-nonuma-abi-update.args | 3 +- .../memory-hotplug-ppc64-nonuma.args | 3 +- tests/qemuxml2argvdata/memory-hotplug.args | 3 +- tests/qemuxml2argvdata/memtune-unlimited.args | 3 +- tests/qemuxml2argvdata/memtune.args | 3 +- tests/qemuxml2argvdata/migrate-numa-unaligned.args | 3 +- tests/qemuxml2argvdata/migrate.args | 3 +- tests/qemuxml2argvdata/minimal-msg-timestamp.args | 3 +- tests/qemuxml2argvdata/minimal-sandbox.args | 3 +- tests/qemuxml2argvdata/minimal.args | 3 +- tests/qemuxml2argvdata/misc-acpi.args | 3 +- tests/qemuxml2argvdata/misc-disable-s3.args | 3 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 3 +- tests/qemuxml2argvdata/misc-enable-s4.args | 3 +- tests/qemuxml2argvdata/misc-no-reboot.args | 3 +- tests/qemuxml2argvdata/misc-uuid.args | 3 +- tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args | 3 +- .../qemuxml2argvdata/mlock-off.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args | 3 +- tests/qemuxml2argvdata/mlock-on.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/monitor-json.args | 3 +- .../qemuxml2argvdata/multifunction-pci-device.args | 3 +- tests/qemuxml2argvdata/name-escape.args | 3 +- tests/qemuxml2argvdata/net-client.args | 3 +- tests/qemuxml2argvdata/net-eth-hostip.args | 3 +- tests/qemuxml2argvdata/net-eth-ifname.args | 3 +- tests/qemuxml2argvdata/net-eth-names.args | 3 +- tests/qemuxml2argvdata/net-eth-unmanaged-tap.args | 3 +- tests/qemuxml2argvdata/net-eth.args | 3 +- tests/qemuxml2argvdata/net-hostdev-bootorder.args | 3 +- .../qemuxml2argvdata/net-hostdev-multidomain.args | 3 +- .../net-hostdev-vfio-multidomain.args | 3 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 3 +- tests/qemuxml2argvdata/net-hostdev.args | 3 +- tests/qemuxml2argvdata/net-many-models.args | 3 +- tests/qemuxml2argvdata/net-mcast.args | 3 +- tests/qemuxml2argvdata/net-server.args | 3 +- tests/qemuxml2argvdata/net-udp.args | 3 +- tests/qemuxml2argvdata/net-user-addr.args | 3 +- tests/qemuxml2argvdata/net-user.args | 3 +- tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args | 3 +- tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 3 +- tests/qemuxml2argvdata/net-vhostuser.args | 3 +- .../net-vhostuser.x86_64-2.5.0.args | 3 +- .../net-vhostuser.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 3 +- tests/qemuxml2argvdata/net-virtio-device.args | 3 +- .../net-virtio-disable-offloads.args | 3 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 3 +- .../qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 3 +- tests/qemuxml2argvdata/net-virtio-s390.args | 3 +- tests/qemuxml2argvdata/net-virtio-teaming.args | 3 +- tests/qemuxml2argvdata/net-virtio.args | 3 +- tests/qemuxml2argvdata/nosharepages.args | 3 +- .../numad-auto-memory-vcpu-cpuset.args | 3 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 3 +- .../numad-auto-vcpu-static-numatune.args | 3 +- .../numad-static-memory-auto-vcpu.args | 3 +- tests/qemuxml2argvdata/numad.args | 3 +- .../numatune-auto-nodeset-invalid.args | 3 +- tests/qemuxml2argvdata/numatune-auto-prefer.args | 3 +- tests/qemuxml2argvdata/numatune-distances.args | 3 +- .../numatune-hmat.x86_64-latest.args | 3 +- .../numatune-memnode-no-memory.args | 3 +- tests/qemuxml2argvdata/numatune-memnode.args | 3 +- tests/qemuxml2argvdata/numatune-memory.args | 3 +- tests/qemuxml2argvdata/numatune-no-vcpu.args | 3 +- .../os-firmware-bios.x86_64-latest.args | 3 +- .../os-firmware-efi-secboot.x86_64-latest.args | 3 +- .../os-firmware-efi.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/pages-dimm-discard.args | 3 +- .../qemuxml2argvdata/pages-discard-hugepages.args | 3 +- tests/qemuxml2argvdata/pages-discard.args | 3 +- tests/qemuxml2argvdata/panic-double.args | 3 +- tests/qemuxml2argvdata/panic-no-address.args | 3 +- tests/qemuxml2argvdata/panic.args | 3 +- .../qemuxml2argvdata/parallel-parport-chardev.args | 3 +- tests/qemuxml2argvdata/parallel-tcp-chardev.args | 3 +- .../parallel-unix-chardev.x86_64-2.5.0.args | 3 +- .../parallel-unix-chardev.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 3 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 3 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 3 +- tests/qemuxml2argvdata/pci-bridge-many-disks.args | 3 +- tests/qemuxml2argvdata/pci-bridge.args | 3 +- tests/qemuxml2argvdata/pci-expander-bus.args | 3 +- tests/qemuxml2argvdata/pci-many.args | 3 +- tests/qemuxml2argvdata/pci-rom-disabled.args | 3 +- tests/qemuxml2argvdata/pci-rom.args | 3 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 3 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 3 +- .../pcie-root-port-model-generic.args | 3 +- .../pcie-root-port-model-ioh3420.args | 3 +- .../pcie-root-port-nohotplug.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/pcie-root-port.args | 3 +- tests/qemuxml2argvdata/pcie-root.args | 3 +- .../pcie-switch-downstream-port.args | 3 +- .../pcie-switch-upstream-port.args | 3 +- tests/qemuxml2argvdata/pcihole64-q35.args | 3 +- tests/qemuxml2argvdata/pcihole64.args | 3 +- tests/qemuxml2argvdata/pmu-feature-off.args | 3 +- tests/qemuxml2argvdata/pmu-feature.args | 3 +- tests/qemuxml2argvdata/ppc-dtb.args | 3 +- ...4-default-cpu-kvm-pseries-2.7.ppc64-latest.args | 3 +- ...4-default-cpu-kvm-pseries-3.1.ppc64-latest.args | 3 +- ...4-default-cpu-kvm-pseries-4.2.ppc64-latest.args | 3 +- ...4-default-cpu-tcg-pseries-2.7.ppc64-latest.args | 3 +- ...4-default-cpu-tcg-pseries-3.1.ppc64-latest.args | 3 +- ...4-default-cpu-tcg-pseries-4.2.ppc64-latest.args | 3 +- .../ppc64-pseries-graphics.ppc64-latest.args | 3 +- .../ppc64-pseries-headless.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 3 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 3 +- .../ppc64-usb-controller-legacy.args | 3 +- .../ppc64-usb-controller-qemu-xhci.args | 3 +- tests/qemuxml2argvdata/ppc64-usb-controller.args | 3 +- tests/qemuxml2argvdata/ppce500-serial.args | 3 +- tests/qemuxml2argvdata/pseries-basic.args | 3 +- tests/qemuxml2argvdata/pseries-console-virtio.args | 3 +- .../pseries-cpu-compat-power9.args | 3 +- tests/qemuxml2argvdata/pseries-cpu-compat.args | 3 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 3 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 3 +- tests/qemuxml2argvdata/pseries-features.args | 3 +- tests/qemuxml2argvdata/pseries-hostdevs-1.args | 3 +- tests/qemuxml2argvdata/pseries-hostdevs-2.args | 3 +- tests/qemuxml2argvdata/pseries-hostdevs-3.args | 3 +- .../pseries-machine-max-cpu-compat.args | 3 +- tests/qemuxml2argvdata/pseries-many-buses-1.args | 3 +- tests/qemuxml2argvdata/pseries-many-buses-2.args | 3 +- tests/qemuxml2argvdata/pseries-many-devices.args | 3 +- tests/qemuxml2argvdata/pseries-nvram.args | 3 +- tests/qemuxml2argvdata/pseries-panic-missing.args | 3 +- .../qemuxml2argvdata/pseries-panic-no-address.args | 3 +- .../pseries-phb-default-missing.args | 3 +- tests/qemuxml2argvdata/pseries-phb-numa-node.args | 3 +- tests/qemuxml2argvdata/pseries-phb-simple.args | 3 +- tests/qemuxml2argvdata/pseries-serial-native.args | 3 +- tests/qemuxml2argvdata/pseries-serial-pci.args | 3 +- tests/qemuxml2argvdata/pseries-serial-usb.args | 3 +- tests/qemuxml2argvdata/pseries-usb-default.args | 3 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 3 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 3 +- .../pseries-vio-user-assigned.args | 3 +- tests/qemuxml2argvdata/pseries-vio.args | 3 +- .../pv-spinlock-disabled.x86_64-2.7.0.args | 3 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-disabled.x86_64-latest.args | 3 +- .../pv-spinlock-enabled.x86_64-2.7.0.args | 3 +- .../pv-spinlock-enabled.x86_64-4.0.0.args | 3 +- .../pv-spinlock-enabled.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/q35-acpi-nouefi.args | 3 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 3 +- .../qemuxml2argvdata/q35-default-devices-only.args | 3 +- tests/qemuxml2argvdata/q35-multifunction.args | 3 +- tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 3 +- tests/qemuxml2argvdata/q35-pci-force-address.args | 3 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 3 +- tests/qemuxml2argvdata/q35-pcie.args | 3 +- .../qemuxml2argvdata/q35-pm-disable-fallback.args | 3 +- tests/qemuxml2argvdata/q35-pm-disable.args | 3 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 3 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 3 +- tests/qemuxml2argvdata/q35-usb2.args | 3 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 3 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 3 +- tests/qemuxml2argvdata/q35.args | 3 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 3 +- .../qemuxml2argvdata/qemu-ns-commandline-ns0.args | 3 +- .../qemuxml2argvdata/qemu-ns-commandline-ns1.args | 3 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 3 +- .../qemu-ns-domain-commandline-ns0.args | 3 +- .../qemu-ns-domain-commandline.args | 3 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 3 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 3 +- tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args | 3 +- tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args | 3 +- .../qemuxml2argvdata/reboot-timeout-disabled.args | 3 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 3 +- tests/qemuxml2argvdata/restore-v2-fd.args | 3 +- tests/qemuxml2argvdata/restore-v2.args | 3 +- .../riscv64-virt-graphics.riscv64-latest.args | 3 +- .../riscv64-virt-headless.riscv64-latest.args | 3 +- tests/qemuxml2argvdata/riscv64-virt-pci.args | 3 +- tests/qemuxml2argvdata/riscv64-virt.args | 3 +- .../s390-allow-bogus-usb-controller.args | 3 +- .../s390-allow-bogus-usb-none.args | 3 +- ...efault-cpu-kvm-ccw-virtio-2.7.s390x-latest.args | 3 +- ...efault-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 3 +- ...efault-cpu-tcg-ccw-virtio-2.7.s390x-latest.args | 3 +- ...efault-cpu-tcg-ccw-virtio-4.2.s390x-latest.args | 3 +- tests/qemuxml2argvdata/s390-panic-missing.args | 3 +- tests/qemuxml2argvdata/s390-panic-no-address.args | 3 +- tests/qemuxml2argvdata/s390-serial-2.args | 3 +- tests/qemuxml2argvdata/s390-serial-console.args | 3 +- tests/qemuxml2argvdata/s390-serial.args | 3 +- .../s390x-ccw-graphics.s390x-latest.args | 3 +- .../s390x-ccw-headless.s390x-latest.args | 3 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 3 +- .../seclabel-dynamic-baselabel.args | 3 +- .../seclabel-dynamic-labelskip.args | 3 +- .../seclabel-dynamic-override.args | 3 +- .../qemuxml2argvdata/seclabel-dynamic-relabel.args | 3 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 3 +- tests/qemuxml2argvdata/seclabel-none.args | 3 +- .../seclabel-static-labelskip.args | 3 +- .../qemuxml2argvdata/seclabel-static-relabel.args | 3 +- tests/qemuxml2argvdata/seclabel-static.args | 3 +- .../serial-dev-chardev-iobase.args | 3 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 3 +- tests/qemuxml2argvdata/serial-file-chardev.args | 3 +- tests/qemuxml2argvdata/serial-file-log.args | 3 +- tests/qemuxml2argvdata/serial-many-chardev.args | 3 +- tests/qemuxml2argvdata/serial-pty-chardev.args | 3 +- .../qemuxml2argvdata/serial-spiceport-nospice.args | 3 +- tests/qemuxml2argvdata/serial-spiceport.args | 3 +- tests/qemuxml2argvdata/serial-tcp-chardev.args | 3 +- .../serial-tcp-telnet-chardev.args | 3 +- .../serial-tcp-tlsx509-chardev-notls.args | 3 +- .../serial-tcp-tlsx509-chardev-verify.args | 3 +- .../serial-tcp-tlsx509-chardev.args | 3 +- .../serial-tcp-tlsx509-secret-chardev.args | 3 +- tests/qemuxml2argvdata/serial-udp-chardev.args | 3 +- tests/qemuxml2argvdata/serial-unix-chardev.args | 3 +- .../serial-unix-chardev.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 3 +- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 3 +- tests/qemuxml2argvdata/shmem.args | 3 +- tests/qemuxml2argvdata/smartcard-controller.args | 3 +- .../smartcard-host-certificates-database.args | 3 +- .../smartcard-host-certificates.args | 3 +- tests/qemuxml2argvdata/smartcard-host.args | 3 +- .../smartcard-passthrough-spicevmc.args | 3 +- .../smartcard-passthrough-tcp.args | 3 +- .../smartcard-passthrough-unix.x86_64-2.5.0.args | 3 +- .../smartcard-passthrough-unix.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/smbios-type-fwcfg.args | 3 +- tests/qemuxml2argvdata/smbios.args | 3 +- tests/qemuxml2argvdata/smp-dies.args | 3 +- tests/qemuxml2argvdata/smp.args | 3 +- tests/qemuxml2argvdata/sound-device.args | 3 +- tests/qemuxml2argvdata/sound.args | 3 +- tests/qemuxml2argvdata/sparc-minimal.args | 3 +- .../tpm-emulator-spapr.ppc64-latest.args | 3 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 3 +- .../tpm-emulator-tpm2-pstate.x86_64-latest.args | 3 +- .../tpm-emulator-tpm2.x86_64-latest.args | 3 +- .../tpm-emulator.x86_64-latest.args | 3 +- .../tpm-passthrough-crb.x86_64-latest.args | 3 +- .../tpm-passthrough.x86_64-latest.args | 3 +- .../tseg-explicit-size.x86_64-latest.args | 3 +- .../usb-controller-default-q35.args | 3 +- .../usb-controller-explicit-q35.args | 3 +- .../qemuxml2argvdata/usb-controller-qemu-xhci.args | 3 +- tests/qemuxml2argvdata/usb-controller-xhci.args | 3 +- tests/qemuxml2argvdata/usb-controller.args | 3 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 3 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 3 +- tests/qemuxml2argvdata/usb-hub.args | 3 +- tests/qemuxml2argvdata/usb-ich9-autoassign.args | 3 +- tests/qemuxml2argvdata/usb-ich9-companion.args | 3 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 3 +- tests/qemuxml2argvdata/usb-long-port-path.args | 3 +- tests/qemuxml2argvdata/usb-none.args | 3 +- tests/qemuxml2argvdata/usb-piix3-controller.args | 3 +- tests/qemuxml2argvdata/usb-port-autoassign.args | 3 +- tests/qemuxml2argvdata/usb-port-missing.args | 3 +- tests/qemuxml2argvdata/usb-ports.args | 3 +- tests/qemuxml2argvdata/usb-redir-boot.args | 3 +- .../qemuxml2argvdata/usb-redir-filter-version.args | 3 +- tests/qemuxml2argvdata/usb-redir-filter.args | 3 +- .../usb-redir-unix.x86_64-2.5.0.args | 3 +- .../usb-redir-unix.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/usb-redir.args | 3 +- tests/qemuxml2argvdata/usb-xhci-autoassign.args | 3 +- tests/qemuxml2argvdata/usb1-usb2.args | 3 +- tests/qemuxml2argvdata/user-aliases-usb.args | 3 +- tests/qemuxml2argvdata/user-aliases.args | 3 +- tests/qemuxml2argvdata/vcpu-placement-static.args | 3 +- .../vhost-user-fs-fd-memory.x86_64-latest.args | 3 +- .../vhost-user-fs-hugepages.x86_64-latest.args | 3 +- .../vhost-user-gpu-secondary.x86_64-latest.args | 3 +- .../vhost-user-vga.x86_64-latest.args | 3 +- .../vhost-vsock-auto.x86_64-latest.args | 3 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 3 +- .../vhost-vsock-ccw.s390x-latest.args | 3 +- .../vhost-vsock.x86_64-latest.args | 3 +- .../video-bochs-display-device.x86_64-latest.args | 3 +- .../video-device-pciaddr-default.args | 3 +- tests/qemuxml2argvdata/video-none-device.args | 3 +- .../qemuxml2argvdata/video-qxl-device-vgamem.args | 3 +- .../video-qxl-device-vram64.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/video-qxl-device.args | 3 +- tests/qemuxml2argvdata/video-qxl-heads.args | 3 +- tests/qemuxml2argvdata/video-qxl-nodevice.args | 3 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 3 +- tests/qemuxml2argvdata/video-qxl-resolution.args | 3 +- .../video-qxl-sec-device-vgamem.args | 3 +- .../video-qxl-sec-device-vram64.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 3 +- .../video-ramfb-display-device.x86_64-latest.args | 3 +- .../qemuxml2argvdata/video-vga-device-vgamem.args | 3 +- tests/qemuxml2argvdata/video-vga-device.args | 3 +- tests/qemuxml2argvdata/video-vga-nodevice.args | 3 +- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 3 +- tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 3 +- .../qemuxml2argvdata/video-virtio-gpu-device.args | 3 +- .../qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 3 +- .../video-virtio-gpu-secondary.args | 3 +- .../video-virtio-gpu-spice-gl.args | 3 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 3 +- tests/qemuxml2argvdata/video-virtio-vga.args | 3 +- .../virtio-9p-createmode.x86_64-latest.args | 3 +- .../virtio-9p-multidevs.x86_64-latest.args | 3 +- .../qemuxml2argvdata/virtio-input-passthrough.args | 3 +- tests/qemuxml2argvdata/virtio-input.args | 3 +- tests/qemuxml2argvdata/virtio-lun.args | 3 +- .../virtio-non-transitional.x86_64-3.1.0.args | 3 +- .../virtio-non-transitional.x86_64-latest.args | 3 +- ...irtio-options-controller-ats.x86_64-latest.args | 3 +- ...tio-options-controller-iommu.x86_64-latest.args | 3 +- ...io-options-controller-packed.x86_64-latest.args | 3 +- .../virtio-options-disk-ats.x86_64-latest.args | 3 +- .../virtio-options-disk-iommu.x86_64-latest.args | 3 +- .../virtio-options-disk-packed.x86_64-latest.args | 3 +- .../virtio-options-fs-ats.x86_64-latest.args | 3 +- .../virtio-options-fs-iommu.x86_64-latest.args | 3 +- .../virtio-options-fs-packed.x86_64-latest.args | 3 +- .../virtio-options-input-ats.x86_64-latest.args | 3 +- .../virtio-options-input-iommu.x86_64-latest.args | 3 +- .../virtio-options-input-packed.x86_64-latest.args | 3 +- ...irtio-options-memballoon-ats.x86_64-latest.args | 3 +- ...emballoon-freepage-reporting.x86_64-latest.args | 3 +- ...tio-options-memballoon-iommu.x86_64-latest.args | 3 +- ...io-options-memballoon-packed.x86_64-latest.args | 3 +- .../virtio-options-net-ats.x86_64-latest.args | 3 +- .../virtio-options-net-iommu.x86_64-latest.args | 3 +- .../virtio-options-net-packed.x86_64-latest.args | 3 +- .../virtio-options-rng-ats.x86_64-latest.args | 3 +- .../virtio-options-rng-iommu.x86_64-latest.args | 3 +- .../virtio-options-rng-packed.x86_64-latest.args | 3 +- .../virtio-options-video-ats.x86_64-latest.args | 3 +- .../virtio-options-video-iommu.x86_64-latest.args | 3 +- .../virtio-options-video-packed.x86_64-latest.args | 3 +- .../virtio-options.x86_64-latest.args | 3 +- .../virtio-rng-builtin.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 3 +- tests/qemuxml2argvdata/virtio-rng-default.args | 3 +- .../virtio-rng-egd-unix.x86_64-2.5.0.args | 3 +- .../virtio-rng-egd-unix.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 3 +- tests/qemuxml2argvdata/virtio-rng-multiple.args | 3 +- tests/qemuxml2argvdata/virtio-rng-random.args | 3 +- .../virtio-transitional.x86_64-3.1.0.args | 3 +- .../virtio-transitional.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/vmcoreinfo.args | 3 +- tests/qemuxml2argvdata/watchdog-device.args | 3 +- tests/qemuxml2argvdata/watchdog-diag288.args | 3 +- tests/qemuxml2argvdata/watchdog-dump.args | 3 +- tests/qemuxml2argvdata/watchdog-injectnmi.args | 3 +- tests/qemuxml2argvdata/watchdog.args | 3 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 3 +- ...86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args | 3 +- ...6_64-default-cpu-kvm-q35-4.2.x86_64-latest.args | 3 +- ...86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args | 3 +- ...6_64-default-cpu-tcg-q35-4.2.x86_64-latest.args | 3 +- .../x86_64-pc-graphics.x86_64-latest.args | 3 +- .../x86_64-pc-headless.x86_64-latest.args | 3 +- .../x86_64-q35-graphics.x86_64-latest.args | 3 +- .../x86_64-q35-headless.x86_64-latest.args | 3 +- 829 files changed, 1705 insertions(+), 862 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6f970a3..9a64473 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6711,40 +6711,6 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virCommandAddArg(cmd, "-machine"); virBufferAdd(&buf, def->os.machine, -1); - switch ((virDomainVirtType)def->virtType) { - case VIR_DOMAIN_VIRT_QEMU: - virBufferAddLit(&buf, ",accel=tcg"); - break; - - case VIR_DOMAIN_VIRT_KVM: - virBufferAddLit(&buf, ",accel=kvm"); - break; - - case VIR_DOMAIN_VIRT_KQEMU: - case VIR_DOMAIN_VIRT_XEN: - case VIR_DOMAIN_VIRT_LXC: - case VIR_DOMAIN_VIRT_UML: - case VIR_DOMAIN_VIRT_OPENVZ: - case VIR_DOMAIN_VIRT_TEST: - case VIR_DOMAIN_VIRT_VMWARE: - case VIR_DOMAIN_VIRT_HYPERV: - case VIR_DOMAIN_VIRT_VBOX: - case VIR_DOMAIN_VIRT_PHYP: - case VIR_DOMAIN_VIRT_PARALLELS: - case VIR_DOMAIN_VIRT_BHYVE: - case VIR_DOMAIN_VIRT_VZ: - case VIR_DOMAIN_VIRT_NONE: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("the QEMU binary does not support %s"), - virDomainVirtTypeToString(def->virtType)); - return -1; - - case VIR_DOMAIN_VIRT_LAST: - default: - virReportEnumRangeError(virDomainVirtType, def->virtType); - return -1; - } - /* To avoid the collision of creating USB controllers when calling * machine->init in QEMU, it needs to set usb=off */ @@ -6945,6 +6911,52 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, return 0; } +static int +qemuBuildAccelCommandLine(virCommandPtr cmd, + const virDomainDef *def) +{ + /* the '-machine' options for accelerator are legacy, + * using the '-accel' options by default */ + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + virCommandAddArg(cmd, "-accel"); + + switch ((virDomainVirtType)def->virtType) { + case VIR_DOMAIN_VIRT_QEMU: + virBufferAddLit(&buf, "tcg"); + break; + + case VIR_DOMAIN_VIRT_KVM: + virBufferAddLit(&buf, "kvm"); + break; + + case VIR_DOMAIN_VIRT_KQEMU: + case VIR_DOMAIN_VIRT_XEN: + case VIR_DOMAIN_VIRT_LXC: + case VIR_DOMAIN_VIRT_UML: + case VIR_DOMAIN_VIRT_OPENVZ: + case VIR_DOMAIN_VIRT_TEST: + case VIR_DOMAIN_VIRT_VMWARE: + case VIR_DOMAIN_VIRT_HYPERV: + case VIR_DOMAIN_VIRT_VBOX: + case VIR_DOMAIN_VIRT_PHYP: + case VIR_DOMAIN_VIRT_PARALLELS: + case VIR_DOMAIN_VIRT_BHYVE: + case VIR_DOMAIN_VIRT_VZ: + case VIR_DOMAIN_VIRT_NONE: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("the QEMU binary does not support %s"), + virDomainVirtTypeToString(def->virtType)); + return -1; + + case VIR_DOMAIN_VIRT_LAST: + default: + virReportEnumRangeError(virDomainVirtType, def->virtType); + return -1; + } + + virCommandAddArgBuffer(cmd, &buf); + return 0; +} static void qemuBuildTSEGCommandLine(virCommandPtr cmd, @@ -9840,6 +9852,9 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildMachineCommandLine(cmd, cfg, def, qemuCaps, priv) < 0) return NULL; + if (qemuBuildAccelCommandLine(cmd, def) < 0) + return NULL; + qemuBuildTSEGCommandLine(cmd, def); if (qemuBuildCpuCommandLine(cmd, driver, def, qemuCaps) < 0) diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index 41a1dd1..c4102fc 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a53 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args index 0f74e87..b77b4e9 100644 --- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a57 \ -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,\ readonly=on \ diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args index ae92ab0..d088fae 100644 --- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=kvm,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args index 0c1fe71..85d0dd4 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt-4.2,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt-4.2,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args index 858eadc..60b0026 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt-4.2,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt-4.2,usb=off,dump-guest-core=off,gic-version=2,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args index ba79804..0b412a9 100644 --- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -cpu host,sve512=on,sve384=off,sve256=on,sve128=on,sve=on \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2argvdata/aarch64-gic-host.args index 2baf4b9..9afeafe 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-host.args +++ b/tests/qemuxml2argvdata/aarch64-gic-host.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=host \ +-machine virt,usb=off,dump-guest-core=off,gic-version=host \ +-accel kvm \ -cpu host \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args index 18a0ac2..eb52362 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \ +-machine virt,usb=off,dump-guest-core=off,gic-version=2 \ +-accel tcg \ -cpu cortex-a57 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2argvdata/aarch64-gic-v2.args index 6cf5839..9d6f2de 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v2.args +++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args @@ -10,7 +10,8 @@ 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 \ +-machine virt,usb=off,dump-guest-core=off,gic-version=2 \ +-accel kvm \ -cpu host \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2argvdata/aarch64-gic-v3.args index 2049250..9d28764 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v3.args +++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args @@ -10,7 +10,8 @@ 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 \ +-machine virt,usb=off,dump-guest-core=off,gic-version=3 \ +-accel kvm \ -cpu host \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args index e660b78..d23c0b6 100644 --- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-arm \ -name armtest \ -S \ --machine virt,accel=kvm,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host,aarch64=off \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args index cab7600..99e5575 100644 --- a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args +++ b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a57 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args index 5166919..4e88739 100644 --- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args +++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a57 \ -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,\ readonly=on \ diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args index 1ff234c..7cca330 100644 --- a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-aarch64test/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt-4.0,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt-4.0,usb=off,dump-guest-core=off,gic-version=2,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a53 \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args b/tests/qemuxml2argvdata/aarch64-pci-serial.args index 3d89ab0..045e582 100644 --- a/tests/qemuxml2argvdata/aarch64-pci-serial.args +++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args b/tests/qemuxml2argvdata/aarch64-traditional-pci.args index 853723f..9e01ef4 100644 --- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args +++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args index 4c5ea31..0d87e41 100644 --- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args +++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name QEMUGuest1 \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args index 56c66fc..828ab81 100644 --- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name QEMUGuest1 \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args b/tests/qemuxml2argvdata/aarch64-video-default.args index 8cf0640..5cb426f 100644 --- a/tests/qemuxml2argvdata/aarch64-video-default.args +++ b/tests/qemuxml2argvdata/aarch64-video-default.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64-vgpu \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a57 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args index 95a6b51..83ef8d0 100644 --- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args +++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64-vgpu \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a57 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args index 6c99710..ae4851e 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt-2.6,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt-2.6,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a53 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args index 0d42378..685dc8e 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args +++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64-virt-default-nic \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a53 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 70be61b..de80515 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=2,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index d4b4f05..365e95f 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=2,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxml2argvdata/aarch64-virt-virtio.args index 15fb5f3..b6088cc 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args +++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a53 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args index cf39101..561bd6b 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a53 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args index 7ed5551..09884b2 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a53 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.args index 1321888..34d1988 100644 --- a/tests/qemuxml2argvdata/acpi-table.args +++ b/tests/qemuxml2argvdata/acpi-table.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args index d6143c5..bc62c47 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-arm \ -name armtest \ -S \ --machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \ +-machine vexpress-a9,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args index c1a9fd8..11af70c 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-arm \ -name armtest \ -S \ --machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \ +-machine vexpress-a9,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args index 0a9ff6b..bc0f2eb 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-arm \ -name armtest \ -S \ --machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \ +-machine vexpress-a9,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args b/tests/qemuxml2argvdata/arm-virt-virtio.args index 75ca00f..28c3a72 100644 --- a/tests/qemuxml2argvdata/arm-virt-virtio.args +++ b/tests/qemuxml2argvdata/arm-virt-virtio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-arm \ -name armtest \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args index 7cdca08..fec775c 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args b/tests/qemuxml2argvdata/balloon-ccw-deflate.args index 2b4e280..e6a9e40 100644 --- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args +++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args index e81db15..4e9bf67 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args index 3aa2551..f35ee59 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args index 8a6cc8d..7f7b326 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args index 8a6cc8d..7f7b326 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args b/tests/qemuxml2argvdata/balloon-mmio-deflate.args index 33f480e..e784a89 100644 --- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args +++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu cortex-a53 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args index 6627d90..8a18470 100644 --- a/tests/qemuxml2argvdata/bios-nvram-secure.args +++ b/tests/qemuxml2argvdata/bios-nvram-secure.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name test-bios \ -S \ --machine pc-q35-2.5,accel=tcg,usb=off,smm=on,dump-guest-core=off \ +-machine pc-q35-2.5,usb=off,smm=on,dump-guest-core=off \ +-accel tcg \ -global driver=cfi.pflash01,property=secure,value=on \ -drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,\ readonly=on \ diff --git a/tests/qemuxml2argvdata/bios-nvram.args b/tests/qemuxml2argvdata/bios-nvram.args index 45e2a7a..2f17410 100644 --- a/tests/qemuxml2argvdata/bios-nvram.args +++ b/tests/qemuxml2argvdata/bios-nvram.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name test-bios \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,\ readonly=on \ -drive file=/usr/share/OVMF/OVMF_VARS.fd,if=pflash,format=raw,unit=1 \ diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args index 6b63657..245f9f4 100644 --- a/tests/qemuxml2argvdata/bios.args +++ b/tests/qemuxml2argvdata/bios.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name test-bios \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -bios /usr/share/seabios/bios.bin \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args index 8aa4c2b..fcfee22 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args index 79012e5..cd483c6 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args index b8416ef..c0e091e 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args index 79012e5..cd483c6 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args index b03fe20..45a5ba9 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args index 79012e5..cd483c6 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args index c5d66e7..ea31517 100644 --- a/tests/qemuxml2argvdata/boot-cdrom.args +++ b/tests/qemuxml2argvdata/boot-cdrom.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args index 0fbfc3c..593b059 100644 --- a/tests/qemuxml2argvdata/boot-complex.args +++ b/tests/qemuxml2argvdata/boot-complex.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args b/tests/qemuxml2argvdata/boot-floppy-q35.args index cfc396c..aecaa24 100644 --- a/tests/qemuxml2argvdata/boot-floppy-q35.args +++ b/tests/qemuxml2argvdata/boot-floppy-q35.args @@ -10,7 +10,8 @@ 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 \ +-machine pc-q35-2.4,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args index a2b70dc..c48dbea 100644 --- a/tests/qemuxml2argvdata/boot-floppy.args +++ b/tests/qemuxml2argvdata/boot-floppy.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args index f3e2c97..be579a6 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args +++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args index f3e2c97..be579a6 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable.args +++ b/tests/qemuxml2argvdata/boot-menu-disable.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args index 4df0ae4..23b6db4 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args index 83b4fbd..06e4886 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable.args +++ b/tests/qemuxml2argvdata/boot-menu-enable.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args index 83b4fbd..06e4886 100644 --- a/tests/qemuxml2argvdata/boot-multi.args +++ b/tests/qemuxml2argvdata/boot-multi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args index 9ca3f75..cce973b 100644 --- a/tests/qemuxml2argvdata/boot-network.args +++ b/tests/qemuxml2argvdata/boot-network.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args index 57d4b88..3dc3eb4 100644 --- a/tests/qemuxml2argvdata/boot-order.args +++ b/tests/qemuxml2argvdata/boot-order.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/boot-strict.args b/tests/qemuxml2argvdata/boot-strict.args index 827814c..606aa3d 100644 --- a/tests/qemuxml2argvdata/boot-strict.args +++ b/tests/qemuxml2argvdata/boot-strict.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args index 0338d0c..a8212bc 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args index adb7707..ab8ff36 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args index bbaa384..d27a4a6 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args index f500bfe..588ddd8 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args index e7d6531..f79d099 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args index 9daac16..e070849 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args index 67d1662..623d81e 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args index f3e0f59..40ceb05 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args index 38a9f41..df14860 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args index fd42b89..c213eba 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args index 1d22c36..98ef2af 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args index 851052d..af9cc92 100644 --- a/tests/qemuxml2argvdata/chardev-reconnect.args +++ b/tests/qemuxml2argvdata/chardev-reconnect.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args index 4cf109a..2aa3a02 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args index f814906..61eb6da 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -11,7 +11,8 @@ TZ=Europe/Paris \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args index 89e510e..8f53232 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index 4b78d2a..9171880 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args index e6f80f0..ec62e88 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args index fd6098b..4417005 100644 --- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args +++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -cpu host,kvm-no-adjvtime=on \ -m 4096 \ -object memory-backend-ram,id=mach-virt.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args index cb96ffb..b86bfa0 100644 --- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu32,hv-time \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args index e38898e..048cdaa 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args index 9fd990d..46ce015 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args index 4d6d6e3..2be9165 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.args +++ b/tests/qemuxml2argvdata/console-compat-auto.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args index 4d6d6e3..2be9165 100644 --- a/tests/qemuxml2argvdata/console-compat-chardev.args +++ b/tests/qemuxml2argvdata/console-compat-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args index 8a6d72f..38bff38 100644 --- a/tests/qemuxml2argvdata/console-compat.args +++ b/tests/qemuxml2argvdata/console-compat.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/console-sclp.args b/tests/qemuxml2argvdata/console-sclp.args index 7396553..bda818c 100644 --- a/tests/qemuxml2argvdata/console-sclp.args +++ b/tests/qemuxml2argvdata/console-sclp.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml2argvdata/console-virtio-ccw.args index ab9e1c1..7282062 100644 --- a/tests/qemuxml2argvdata/console-virtio-ccw.args +++ b/tests/qemuxml2argvdata/console-virtio-ccw.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args index ec81652..07bc1ed 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/console-virtio-s390.args b/tests/qemuxml2argvdata/console-virtio-s390.args index 7357923..d511c25 100644 --- a/tests/qemuxml2argvdata/console-virtio-s390.args +++ b/tests/qemuxml2argvdata/console-virtio-s390.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args index 648dc74..4f73198 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args index 5e64598..7050fb5 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args index 30a47a9..e120d84 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args index ff88df0..b605394 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-x86_64 \ -name fdr \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -m 4096 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index 1d7583b..42f889c 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args index 3cb634d..4f72d20 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args +++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Haswell-noTSX \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args index a33b16f..3aa9a6c 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell.args +++ b/tests/qemuxml2argvdata/cpu-Haswell.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Haswell \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args index 4e989ed..895f847 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell2.args +++ b/tests/qemuxml2argvdata/cpu-Haswell2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Haswell,-hle,-rtm \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args index d35de5e..0c4627b 100644 --- a/tests/qemuxml2argvdata/cpu-Haswell3.args +++ b/tests/qemuxml2argvdata/cpu-Haswell3.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Haswell,+rtm,+hle \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args index 96d4306..9235d35 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-3.1,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.1,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Icelake-Server,pconfig=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args index a512623..33a4b49 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu Icelake-Server \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args index 03347b6..9fe9eec 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name foo \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host,host-cache-info=off,l3-cache=off \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args b/tests/qemuxml2argvdata/cpu-cache-disable2.args index 375b00c..756a9ff 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable2.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name foo \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args index b597da4..5b3dc9a 100644 --- a/tests/qemuxml2argvdata/cpu-cache-disable3.args +++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name foo \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\ +lahf_lm,l3-cache=off \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args index 3d2a4ba..804cc22 100644 --- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args +++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name foo \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host,l3-cache=on,host-cache-info=off \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args index 5bb2269..c5501af 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name foo \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host,host-cache-info=on,l3-cache=off \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args index 9ddad45..45ccec3 100644 --- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args +++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name foo \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host,host-cache-info=on \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args index 14b02d5..3b142a7 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args index b24a74e..0c5a472 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-none2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu core2duo \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args index f215c45..7915d1f 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\ +lahf_lm \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args index 1e4af63..71891fd 100644 --- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args +++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args index 1e4af63..71891fd 100644 --- a/tests/qemuxml2argvdata/cpu-check-none.args +++ b/tests/qemuxml2argvdata/cpu-check-none.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.args index 786f9b6..1e98cdb 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args +++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,-kvm_pv_eoi \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.args index 90bacb0..853eea9 100644 --- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args +++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,+kvm_pv_eoi \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args index a2e4dca..3f12c1a 100644 --- a/tests/qemuxml2argvdata/cpu-exact1.args +++ b/tests/qemuxml2argvdata/cpu-exact1.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu64,-mca,-pse36,-clflush,-syscall,-nx,-lm,-svm \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args index 93f1787..28d332e 100644 --- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args +++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx,-cx16,-tm2,-pbe,\ -ss,-sse4a,-wdt \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args index 93f1787..28d332e 100644 --- a/tests/qemuxml2argvdata/cpu-exact2.args +++ b/tests/qemuxml2argvdata/cpu-exact2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx,-cx16,-tm2,-pbe,\ -ss,-sse4a,-wdt \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args index 40e0246..8918723 100644 --- a/tests/qemuxml2argvdata/cpu-fallback.args +++ b/tests/qemuxml2argvdata/cpu-fallback.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Penryn,-sse4.1,-sse4.2,-popcnt,-aes \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args index 23cb821..8c394c8 100644 --- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host,-kvmclock \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args index 42f969f..fea068f 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,\ +smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args index 017e7a6..2079080 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu EPYC,acpi=on,ss=on,monitor=on,hypervisor=on,erms=on,mpx=on,pcommit=on,\ clwb=on,pku=on,la57=on,3dnowext=on,3dnow=on,npt=on,vme=off,fma=off,avx=off,\ f16c=off,rdrand=off,avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,\ diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.args index 5f38b72..1ad6738 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args +++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu Penryn,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+monitor,+ds_cpl,+vmx,+est,+tm2,\ +xtpr,-sse4.1,+cx16,+lahf_lm \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args index 8ba238d..e329889 100644 --- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args +++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu 'core2duo,vendor=Libvirt QEMU,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,\ +est,+tm2,+cx16,+xtpr,+lahf_lm' \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2argvdata/cpu-host-model.args index 32e1924..349f984 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.args +++ b/tests/qemuxml2argvdata/cpu-host-model.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\ +lahf_lm \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args index a4de9d3..53b76fa 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host,+abm,+ds,-invtsc \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args index 14b02d5..3b142a7 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args b/tests/qemuxml2argvdata/cpu-hotplug-startup.args index 78c03cf..9b7025f 100644 --- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args +++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,maxcpus=6,sockets=3,cores=2,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args index 39d368a..94bd870 100644 --- a/tests/qemuxml2argvdata/cpu-kvmclock.args +++ b/tests/qemuxml2argvdata/cpu-kvmclock.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo,-kvmclock \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args index 8246efd..4dc0769 100644 --- a/tests/qemuxml2argvdata/cpu-minimum1.args +++ b/tests/qemuxml2argvdata/cpu-minimum1.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\ +lahf_lm \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args index 900d748..db1026d 100644 --- a/tests/qemuxml2argvdata/cpu-minimum2.args +++ b/tests/qemuxml2argvdata/cpu-minimum2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\ +lahf_lm,-syscall,-nx,-lm,-svm \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.args index 1e4af63..71891fd 100644 --- a/tests/qemuxml2argvdata/cpu-no-removed-features.args +++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args index 79ee747..e22b297 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 16,sockets=2,cores=4,threads=2 \ diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args index 8e21418..a32a777 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 16,sockets=2,cores=4,threads=2 \ diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args index c7e4034..5b1aa84 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 16,sockets=2,cores=4,threads=2 \ diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args index c7e4034..5b1aa84 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.args +++ b/tests/qemuxml2argvdata/cpu-numa1.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 16,sockets=2,cores=4,threads=2 \ diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args index c7e4034..5b1aa84 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.args +++ b/tests/qemuxml2argvdata/cpu-numa2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 16,sockets=2,cores=4,threads=2 \ diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args b/tests/qemuxml2argvdata/cpu-s390-features.args index 97ad063..e184082 100644 --- a/tests/qemuxml2argvdata/cpu-s390-features.args +++ b/tests/qemuxml2argvdata/cpu-s390-features.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name guest1 \ -S \ --machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu zEC12,dfppc=on,stckf=off \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args b/tests/qemuxml2argvdata/cpu-s390-zEC12.args index 3f035da..a6e44f5 100644 --- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args +++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name guest1 \ -S \ --machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu zEC12 \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args index ac174e8..4c840db 100644 --- a/tests/qemuxml2argvdata/cpu-strict1.args +++ b/tests/qemuxml2argvdata/cpu-strict1.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo,+ds,+acpi,+ht,+tm,+ds_cpl,+vmx,+est,+xtpr,+3dnowext,+lahf_lm,-nx,\ -cx16,-tm2,-pbe,-ss,-sse4a,-wdt \ -m 214 \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args index 56e4e8e..4663b60 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.args +++ b/tests/qemuxml2argvdata/cpu-topology1.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 6,sockets=3,cores=2,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args index ac99ae3..c17fa92 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.args +++ b/tests/qemuxml2argvdata/cpu-topology2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu core2duo \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args index 56e4e8e..4663b60 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.args +++ b/tests/qemuxml2argvdata/cpu-topology3.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 6,sockets=3,cores=2,threads=1 \ diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args index f8e19fc..4e30fed 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu Haswell,pclmuldq=on,ds_cpl=on,tsc_adjust=on,fxsr_opt=on,lahf_lm=on,\ cmp_legacy=on,nodeid_msr=on,perfctr_core=on,perfctr_nb=on,kvm_pv_eoi=on,\ kvm_pv_unhalt=on \ diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args index 84c0d05..d2fafd6 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,\ cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,\ kvm-pv-unhalt=on \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args index 55b72b4..bb68c03 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,\ +smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+invtsc,\ tsc-frequency=3504000000 \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args index b0e6d05..c10e5eb 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc_adjust=on,\ clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on,invtsc=on,\ tsc-frequency=3504000000 \ diff --git a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args index 16a4282..b36d2ac 100644 --- a/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-tsc-high-frequency.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,\ 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,invtsc=on,\ diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args index 0ec8ba0..26759ec 100644 --- a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/cputune-numatune.args b/tests/qemuxml2argvdata/cputune-numatune.args index 787d587..fe296a7 100644 --- a/tests/qemuxml2argvdata/cputune-numatune.args +++ b/tests/qemuxml2argvdata/cputune-numatune.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name dummy2 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -m 128 \ -realtime mlock=off \ -smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args index 7270aaf..75c73b5 100644 --- a/tests/qemuxml2argvdata/cputune-zero-shares.args +++ b/tests/qemuxml2argvdata/cputune-zero-shares.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args index 7270aaf..75c73b5 100644 --- a/tests/qemuxml2argvdata/cputune.args +++ b/tests/qemuxml2argvdata/cputune.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/debug-threads.args b/tests/qemuxml2argvdata/debug-threads.args index d73625e..333f87d 100644 --- a/tests/qemuxml2argvdata/debug-threads.args +++ b/tests/qemuxml2argvdata/debug-threads.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1,debug-threads=on \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args index 2a4fc70..f697a79 100644 --- a/tests/qemuxml2argvdata/default-kvm-host-arch.args +++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name kvm \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -m 4096 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args index f9e7398..706dcac 100644 --- a/tests/qemuxml2argvdata/default-qemu-host-arch.args +++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name qemu-host \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 4096 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args index 8a27403..0a70e08 100644 --- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-a/master-key.aes \ --machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=3,\ memory-backend=mach-virt.ram \ +-accel kvm \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args index 7a491a6..57e727f 100644 --- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-p/master-key.aes \ --machine pseries,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu host \ -m 1024 \ -object memory-backend-ram,id=ppc_spapr.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args index c4acaaf..345710e 100644 --- a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-r/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index 9eef70c..02fd29e 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-default-video-type-s/master-key.aes \ --machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel kvm \ -cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,csske=on,mepoch=on,msa9=on,\ msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\ edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\ diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args index 69c8742..1644898 100644 --- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args index 1b4dffc..eb04c26 100644 --- a/tests/qemuxml2argvdata/disk-aio.args +++ b/tests/qemuxml2argvdata/disk-aio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args index f8a8949..dd88aab 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args index 6f9b810..629f781 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args index 3c2a7cf..0706f19 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-armtest/master-key.aes \ --machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \ +-machine vexpress-a9,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args index c3007e1..54ede20 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-armtest/master-key.aes \ --machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off,\ +-machine vexpress-a9,usb=off,dump-guest-core=off,\ memory-backend=vexpress.highmem \ +-accel tcg \ -cpu cortex-a9 \ -m 1024 \ -object memory-backend-ram,id=vexpress.highmem,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args index 4769133..bd87945 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args index 0f6d70a..1ab1ddd 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-blockio.args b/tests/qemuxml2argvdata/disk-blockio.args index 72aa592..422c8e1 100644 --- a/tests/qemuxml2argvdata/disk-blockio.args +++ b/tests/qemuxml2argvdata/disk-blockio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.args b/tests/qemuxml2argvdata/disk-boot-cdrom.args index c574cb0..7c54db4 100644 --- a/tests/qemuxml2argvdata/disk-boot-cdrom.args +++ b/tests/qemuxml2argvdata/disk-boot-cdrom.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args b/tests/qemuxml2argvdata/disk-boot-disk.args index 435ddd6..80e8bed 100644 --- a/tests/qemuxml2argvdata/disk-boot-disk.args +++ b/tests/qemuxml2argvdata/disk-boot-disk.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args index 2536007..bbae923 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args index aa7a230..bf009d2 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args index 64fd430..06d6e6b 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args index a6a4489..2d64fd0 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args index e66abd9..e1ca977 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-1.5,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index a77a851..9d2a2ce 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args index 94ffa9f..314b6ff 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args b/tests/qemuxml2argvdata/disk-cdrom-network.args index 794fdec..3cbf5a9 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-1.2,usb=off,dump-guest-core=off \ +-accel kvm \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args index fa5c0ba..8c7ad9b 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-1.2,usb=off,dump-guest-core=off \ +-accel kvm \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args index 3c4f399..c15bd2d 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc-1.2,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args b/tests/qemuxml2argvdata/disk-cdrom-tray.args index ff3f779..776813c 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name test \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args index 7952c42..58e1c7b 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args index 4e4e0aa..a787e08 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args index e506a4b..24fb5e5 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.args +++ b/tests/qemuxml2argvdata/disk-cdrom.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args index 0621746..a42df87 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args index beac75e..4fafdac 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args b/tests/qemuxml2argvdata/disk-copy_on_read.args index ca44c59..699505c 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name test \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args index 00d5f45..d294483 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args index 493b478..126f794 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.args b/tests/qemuxml2argvdata/disk-detect-zeroes.args index 400a1b4..2ad648d 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name test \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args index 090cccd..ee75aa5 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args index 97cc492..ac28b07 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args b/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args index 4437922..9181005 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args index 1aa06c7..ade6e8d 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args index 6b93b74..7c3bb65 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args index d75d7ac..fee803f 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy.args b/tests/qemuxml2argvdata/disk-error-policy.args index c339203..572becf 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.args +++ b/tests/qemuxml2argvdata/disk-error-policy.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args index 26e8f56..16195e4 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args index c0079ef..d5ae5a4 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args index b221718..18d7b68 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.11,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-2.11,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args index 7e35f6a..6d7e66e 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.11,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-q35-2.11,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args index 51be454..8bdca7b 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.9,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-2.9,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args index 47ef5db..b567432 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.9,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-q35-2.9,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args b/tests/qemuxml2argvdata/disk-floppy-tray.args index e8a4472..4da037e 100644 --- a/tests/qemuxml2argvdata/disk-floppy-tray.args +++ b/tests/qemuxml2argvdata/disk-floppy-tray.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.args b/tests/qemuxml2argvdata/disk-floppy.args index 83ec46b..361357f 100644 --- a/tests/qemuxml2argvdata/disk-floppy.args +++ b/tests/qemuxml2argvdata/disk-floppy.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args index d4f11f8..566591c 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args index 9675650..fa83112 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args b/tests/qemuxml2argvdata/disk-fmt-qcow.args index 9c24ce3..13b962f 100644 --- a/tests/qemuxml2argvdata/disk-fmt-qcow.args +++ b/tests/qemuxml2argvdata/disk-fmt-qcow.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args index eefa7dc..412e6e2 100644 --- a/tests/qemuxml2argvdata/disk-geometry.args +++ b/tests/qemuxml2argvdata/disk-geometry.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-ide-split.args b/tests/qemuxml2argvdata/disk-ide-split.args index c1a0cc7..5144837 100644 --- a/tests/qemuxml2argvdata/disk-ide-split.args +++ b/tests/qemuxml2argvdata/disk-ide-split.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args index 939daad..26ff069 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args b/tests/qemuxml2argvdata/disk-ioeventfd.args index 2fc3562..29d6ad2 100644 --- a/tests/qemuxml2argvdata/disk-ioeventfd.args +++ b/tests/qemuxml2argvdata/disk-ioeventfd.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name test \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-iscsi.args b/tests/qemuxml2argvdata/disk-iscsi.args index 9297e95..462e5bd 100644 --- a/tests/qemuxml2argvdata/disk-iscsi.args +++ b/tests/qemuxml2argvdata/disk-iscsi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args index 3e52066..b80cb48 100644 --- a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args b/tests/qemuxml2argvdata/disk-network-gluster.args index 7664284..3bc62a8 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args index 2721147..d77ec1a 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 1e992fb..a6d38fe 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index 954f182..f119c4d 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args index 57eaeb4..a9eaa88 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml2argvdata/disk-network-iscsi.args index 53b3821..80410ba 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args index 930d8d5..38d94f1 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index ab60fc5..8c38a88 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args b/tests/qemuxml2argvdata/disk-network-nbd.args index 17576fe..2f99d71 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args index 1742f01..2af0a90 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 5e5c236..e92ccfc 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args index b0bc83b..36d480d 100644 --- a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args index 21d1c2d..383cfcb 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args index 50af3eb..c999964 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args index e91f009..6ad57f5 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args b/tests/qemuxml2argvdata/disk-network-sheepdog.args index cf83206..7cdcd81 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args index 653fa1a..adff0ab 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args index 4418906..1dba55b 100644 --- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args b/tests/qemuxml2argvdata/disk-network-source-auth.args index 18d48b2..61a286e 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args index 0ccf3df..458c803 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args index 879a521..322dbc0 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ 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 afe84fe..d88d39f 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32 \ -m 214 \ -realtime mlock=off \ 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 8ec4a8a..37345a2 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ 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 d778d3d..8b023ad 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32 \ -m 214 \ -realtime mlock=off \ 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 a21f322..4a000fe 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-5.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-5.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ 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 2a30ad0..fd59d83 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32 \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args index ec4c28e..3c63929 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/disk-network-vxhs.args b/tests/qemuxml2argvdata/disk-network-vxhs.args index e59a760..da1e0aa 100644 --- a/tests/qemuxml2argvdata/disk-network-vxhs.args +++ b/tests/qemuxml2argvdata/disk-network-vxhs.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32 \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/disk-no-boot.args b/tests/qemuxml2argvdata/disk-no-boot.args index 190129e..587d962 100644 --- a/tests/qemuxml2argvdata/disk-no-boot.args +++ b/tests/qemuxml2argvdata/disk-no-boot.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args index 3146ad1..0104094 100644 --- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-order.args b/tests/qemuxml2argvdata/disk-order.args index d85c401..5eadfe8 100644 --- a/tests/qemuxml2argvdata/disk-order.args +++ b/tests/qemuxml2argvdata/disk-order.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args b/tests/qemuxml2argvdata/disk-readonly-disk.args index 6e25779..2bfceda 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args index 34ef204..ae56287 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args index 7a83ac4..76535e8 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-sata-device.args b/tests/qemuxml2argvdata/disk-sata-device.args index 572ca20..7885f8e 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.args +++ b/tests/qemuxml2argvdata/disk-sata-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args index b3cf61b..fa5e598 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args index 354686c..21149ff 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args b/tests/qemuxml2argvdata/disk-scsi-disk-split.args index a0ef28d..80b8281 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args index 8cc1057..48964a0 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args index 7c92f85..bb6b8b9 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args index 9f51c6d..431ad3c 100644 --- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args +++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args index da4ef33..7149a19 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args index bbd10a1..19edbbc 100644 --- a/tests/qemuxml2argvdata/disk-serial.args +++ b/tests/qemuxml2argvdata/disk-serial.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args index d35e7a5..906be27 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args index 4cae79c..8b0936c 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args index a24b339..cace893 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-snapshot.args b/tests/qemuxml2argvdata/disk-snapshot.args index 9098536..38311f7 100644 --- a/tests/qemuxml2argvdata/disk-snapshot.args +++ b/tests/qemuxml2argvdata/disk-snapshot.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args b/tests/qemuxml2argvdata/disk-source-pool-mode.args index d55fcf0..3c458d0 100644 --- a/tests/qemuxml2argvdata/disk-source-pool-mode.args +++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-source-pool.args b/tests/qemuxml2argvdata/disk-source-pool.args index f37a7b3..e31a848 100644 --- a/tests/qemuxml2argvdata/disk-source-pool.args +++ b/tests/qemuxml2argvdata/disk-source-pool.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args index eea8560..6decf5e 100644 --- a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args b/tests/qemuxml2argvdata/disk-usb-device-removable.args index 61ca158..9bcd056 100644 --- a/tests/qemuxml2argvdata/disk-usb-device-removable.args +++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-usb-device.args b/tests/qemuxml2argvdata/disk-usb-device.args index 515be27..bd50d3b 100644 --- a/tests/qemuxml2argvdata/disk-usb-device.args +++ b/tests/qemuxml2argvdata/disk-usb-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args index 2e881ec..59ac19b 100644 --- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args +++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.args b/tests/qemuxml2argvdata/disk-virtio-ccw.args index 27bd471..ded32e1 100644 --- a/tests/qemuxml2argvdata/disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/disk-virtio-ccw.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.args b/tests/qemuxml2argvdata/disk-virtio-queues.args index bd3a1a9..0ad0cc6 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.args +++ b/tests/qemuxml2argvdata/disk-virtio-queues.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args index 34a07bb..0bfc79a 100644 --- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args +++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-s390.args b/tests/qemuxml2argvdata/disk-virtio-s390.args index a37b8a5..eaf6545 100644 --- a/tests/qemuxml2argvdata/disk-virtio-s390.args +++ b/tests/qemuxml2argvdata/disk-virtio-s390.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args index 21b267f..a7e19f5 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object pr-manager-helper,id=pr-helper0,\ path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 8,sockets=8,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args index a6e6c12..aa273fd 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args @@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object pr-manager-helper,id=pr-helper0,\ path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/disk-virtio.args b/tests/qemuxml2argvdata/disk-virtio.args index 7c21725..8e16deb 100644 --- a/tests/qemuxml2argvdata/disk-virtio.args +++ b/tests/qemuxml2argvdata/disk-virtio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.args b/tests/qemuxml2argvdata/encrypted-disk-usage.args index 8641701..5ba59fd 100644 --- a/tests/qemuxml2argvdata/encrypted-disk-usage.args +++ b/tests/qemuxml2argvdata/encrypted-disk-usage.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/encrypted-disk.args b/tests/qemuxml2argvdata/encrypted-disk.args index 8641701..5ba59fd 100644 --- a/tests/qemuxml2argvdata/encrypted-disk.args +++ b/tests/qemuxml2argvdata/encrypted-disk.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args index fb12878..ef23e1c 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.7,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,-kvm_pv_eoi \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args index b0a004f..f3334ff 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_eoi=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args index a2593d1..7305a5a 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-eoi=off \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args index 96bfba2..ccf27b7 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.7,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,+kvm_pv_eoi \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args index b008c77..35d25d4 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_eoi=on \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args index d0befba..fe04dd1 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-eoi=on \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/event_idx.args b/tests/qemuxml2argvdata/event_idx.args index bfeeffd..ec90816 100644 --- a/tests/qemuxml2argvdata/event_idx.args +++ b/tests/qemuxml2argvdata/event_idx.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name test \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args index dec35cc..38787a4 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name instance-00000092 \ -S \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -m 14336 \ -mem-prealloc \ -mem-path /var/lib/libvirt/qemu/ram/-1-instance-00000092/ram \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.args index 2d3e90f..0ca5988 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name instance-00000092 \ -S \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -m 14336 \ -mem-prealloc \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args index 6b1695f..390fdb2 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name instance-00000092 \ -S \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -m 28672 \ -mem-prealloc \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args index 205d14a..4922815 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name instance-00000092 \ -S \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -m 43008 \ -mem-prealloc \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args index e0e416d..4598948 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-5.1.0.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -enable-fips \ --machine pc-i440fx-5.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-5.1,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args index 4740e52..16e0e4c 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args b/tests/qemuxml2argvdata/floppy-drive-fat.args index c654ae5..11dad13 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args index 90ab421..b0d590b 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args index 12f0b9c..15f9286 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args index d83f604..30e4e1f 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args index 07d2a2d..ebc6758 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args index 87bdf4d..1b55b8d 100644 --- a/tests/qemuxml2argvdata/fs9p.args +++ b/tests/qemuxml2argvdata/fs9p.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args index e340218..f6af18c 100644 --- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args index 8f08342..1649e11 100644 --- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxml2argvdata/genid.x86_64-latest.args index 7dd7d1f..4e46393 100644 --- a/tests/qemuxml2argvdata/genid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args index e602555..3b3d4e6 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args @@ -11,7 +11,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args index 76d7583..5fda347 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.args @@ -9,7 +9,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args index e602555..3b3d4e6 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args @@ -11,7 +11,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args index a34f9d4..496701d 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -11,7 +11,8 @@ DISPLAY=:0.1 \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args index c0c354b..83f40f8 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -11,7 +11,8 @@ DISPLAY=:0.1 \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args index abcebd1..b88b6f0 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args index 9bed352..a255cd3 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args index 843e829..fe90961 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args index 843e829..fe90961 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args index 1f06d88..e2a6794 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/graphics-spice-compression.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args index 54b7184..11f6215 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args index 9329e56..ccc8533 100644 --- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args index 76f74c0..962c1d7 100644 --- a/tests/qemuxml2argvdata/graphics-spice-no-args.args +++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args index 630e620..66a3c1d 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args index bc2293d..074ea5e 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args b/tests/qemuxml2argvdata/graphics-spice-socket.args index e781357..2ca561a 100644 --- a/tests/qemuxml2argvdata/graphics-spice-socket.args +++ b/tests/qemuxml2argvdata/graphics-spice-socket.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args index 3f6cf4a..6dd8c8f 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name f14 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\ +lahf_lm \ -m 1024 \ diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args index c46bddf..18f6973 100644 --- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args +++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args index 4c38960..c958f02 100644 --- a/tests/qemuxml2argvdata/graphics-spice.args +++ b/tests/qemuxml2argvdata/graphics-spice.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args index 5e3bb6e..20f4976 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args index 12697fc..baded26 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args index 3c0901d..66f2568 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args index 82a7777..5bc6e49 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args b/tests/qemuxml2argvdata/graphics-vnc-none.args index f9259c7..ed7f016 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-none.args +++ b/tests/qemuxml2argvdata/graphics-vnc-none.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args b/tests/qemuxml2argvdata/graphics-vnc-policy.args index 17fde4e..58e7b77 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.args +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args index 7ee7a37..9bef206 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.args index 3297258..2cdcf4f 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args index 7b845de..7782159 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args b/tests/qemuxml2argvdata/graphics-vnc-socket.args index 8fe87ad..ea9d184 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ 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 b3251fb..301348c 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args index 7d89329..fd82eab 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ 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 3ec2599..3866aa2 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 @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --machine pc-i440fx-2.4,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.4,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index cea42c4..c625aaa 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.args index c094c0d..ca822a2 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/graphics-vnc.args b/tests/qemuxml2argvdata/graphics-vnc.args index 82a7777..5bc6e49 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.args +++ b/tests/qemuxml2argvdata/graphics-vnc.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args index f1a3026..e291f98 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args index 580cbd9..48b178e 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args index 345bddf..e1a1b99 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args index cef437a..fe0cfe6 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args index 68c28fc..d4bc505 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args index 207ac57..fd1cbe8 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args index 98d4a62..ceba02c 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args index 42fae17..882d583 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name delete \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -m 256 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args index edec271..f8a95d0 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-address.args +++ b/tests/qemuxml2argvdata/hostdev-pci-address.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args index d8690c0..fc8b9fd 100644 --- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args +++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name delete \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -m 256 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args index 51dd2da..958234e 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-2.8.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc-i440fx-2.8,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.8,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args index cee8911..b121778 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index 89e83e3..80fd0bc 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args index 0e9fdd7..c0fbdaf 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest2 \ -S \ --machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index 3e8b590..c2f05c0 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args index 0bda46c..2999966 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest2 \ -S \ --machine pc-q35-2.7,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-q35-2.7,usb=off,dump-guest-core=off \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args index bb8a466..30d2494 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc-i440fx-2.8,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.8,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index 973ae56..487f53a 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc-i440fx-4.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index c00ef41..a7ec67c 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args index a6cf270..64604be 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 512 \ -object memory-backend-ram,id=s390.ram,size=536870912 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args index be550aa..2907799 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 512 \ -object memory-backend-ram,id=s390.ram,size=536870912 \ diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args index 1402b23..a65bf20 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args index 6a24db3..dac8530 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args index 5a10d45..c021676 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args b/tests/qemuxml2argvdata/hostdev-usb-address.args index eb17911..911d9c2 100644 --- a/tests/qemuxml2argvdata/hostdev-usb-address.args +++ b/tests/qemuxml2argvdata/hostdev-usb-address.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args index 6bf3ef8..7521d11 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args index 6485433..65cb856 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args index 181652c..2d940a8 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args index 963d508..84bca82 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args index 2fc4200..eb7831b 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args index 103c4f7..2319166 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name KVMGuest1 \ -S \ --machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args index 3dd9a25..c687392 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args index d3a762e..2d590a7 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args index d7eaa77..adb95f4 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.args index b2bd39e..6054f78 100644 --- a/tests/qemuxml2argvdata/hotplug-base.args +++ b/tests/qemuxml2argvdata/hotplug-base.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name hotplug \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -m 4096 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args b/tests/qemuxml2argvdata/hugepages-default-2M.args index 014d71c..5977533 100644 --- a/tests/qemuxml2argvdata/hugepages-default-2M.args +++ b/tests/qemuxml2argvdata/hugepages-default-2M.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -mem-prealloc \ -mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \ diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args b/tests/qemuxml2argvdata/hugepages-default-system-size.args index bcf6e6b..644ed1f 100644 --- a/tests/qemuxml2argvdata/hugepages-default-system-size.args +++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hugepages-default.args b/tests/qemuxml2argvdata/hugepages-default.args index 3184e4e..8386164 100644 --- a/tests/qemuxml2argvdata/hugepages-default.args +++ b/tests/qemuxml2argvdata/hugepages-default.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -mem-prealloc \ -mem-path /dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args index 3358a8c..3eba4e1 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m size=4194304k,slots=16,maxmem=8388608k \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args index f74bf8d..ba8c979 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m size=4194304k,slots=16,maxmem=8388608k \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index 6033950..f743721 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-fedora/master-key.aes \ --machine pc-i440fx-2.9,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.9,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,\ 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 \ diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args b/tests/qemuxml2argvdata/hugepages-nodeset.args index 014d71c..5977533 100644 --- a/tests/qemuxml2argvdata/hugepages-nodeset.args +++ b/tests/qemuxml2argvdata/hugepages-nodeset.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -mem-prealloc \ -mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args index bbf3c9f..1ccc8bd 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args index e219914..51aaafa 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name fedora \ -S \ --machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel tcg \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qemuxml2argvdata/hugepages-numa-default.args index 674bb51..4238c0f 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-default.args +++ b/tests/qemuxml2argvdata/hugepages-numa-default.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name fedora \ -S \ --machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args index 6debc99..d9d3368 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args index 6c05e54..7a2c33b 100644 --- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args +++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 4096 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index 969bb71..2d04b4f 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args index a3cb6b9..673abde 100644 --- a/tests/qemuxml2argvdata/hugepages-shared.args +++ b/tests/qemuxml2argvdata/hugepages-shared.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 4096 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args index 6909b71..2d7b9e1 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args index ce7af1b..8c58738 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args index 55e5099..5671a9b 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,hv-crash \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args index 870fa38..a388726 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,hv-crash \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args index f64bad5..156053f 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,hv-vpindex,hv-synic,hv-stimer,hv-stimer-direct \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args index b9d9542..fc4051d 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu 'qemu32,hv_relaxed,hv_vapic,hv-spinlocks=0x2fff,hv_vpindex,hv_runtime,\ hv_synic,hv_stimer,hv_reset,hv-vendor-id=KVM Hv,hv_frequencies,\ hv_reenlightenment,hv_tlbflush,hv_ipi,hv_evmcs' \ diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args index c6cba06..d312485 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu 'qemu64,hv-relaxed,hv-vapic,hv-spinlocks=0x2fff,hv-vpindex,hv-runtime,\ hv-synic,hv-stimer,hv-reset,hv-vendor-id=KVM Hv,hv-frequencies,\ hv-reenlightenment,hv-tlbflush,hv-ipi,hv-evmcs' \ diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args index 36d9fc4..2529d9a 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args index fc83eef..8bbaa77 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args index 8a96f66..ed4441c 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args b/tests/qemuxml2argvdata/input-virtio-ccw.args index 108a847..66e1a56 100644 --- a/tests/qemuxml2argvdata/input-virtio-ccw.args +++ b/tests/qemuxml2argvdata/input-virtio-ccw.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args index 211ea3d..f305b37 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args index cea414a..a258b64 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args index ef2fa61..7e832b9 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args index 43e666d..1bb877e 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split,\ +-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args index eb491e1..0120c21 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.6,accel=tcg,usb=off,dump-guest-core=off,iommu=on \ +-machine pc-q35-2.6,usb=off,dump-guest-core=off,iommu=on \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args index 5fe3ed0..2fc3276 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args index 6ee6108..868f376 100644 --- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args +++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3,\ +-machine virt,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3,\ memory-backend=mach-virt.ram \ +-accel tcg \ -cpu cortex-a15 \ -m 1024 \ -object memory-backend-ram,id=mach-virt.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args index 402f653..3d11523 100644 --- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args index e3dcb1d..1c06690 100644 --- a/tests/qemuxml2argvdata/iothreads-disk.args +++ b/tests/qemuxml2argvdata/iothreads-disk.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemuxml2argvdata/iothreads-ids-partial.args index 58e764d..08d67ab 100644 --- a/tests/qemuxml2argvdata/iothreads-ids-partial.args +++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argvdata/iothreads-ids.args index 009dcc9..b364263 100644 --- a/tests/qemuxml2argvdata/iothreads-ids.args +++ b/tests/qemuxml2argvdata/iothreads-ids.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index f8a5aaa..ab5dbb1 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index a2f4d5e..ae6fe5c 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata/iothreads.args index 5bc2350..29edfc6 100644 --- a/tests/qemuxml2argvdata/iothreads.args +++ b/tests/qemuxml2argvdata/iothreads.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args index 54d1669..0ac2aba 100644 --- a/tests/qemuxml2argvdata/kvm-features-off.args +++ b/tests/qemuxml2argvdata/kvm-features-off.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/kvm-features.args b/tests/qemuxml2argvdata/kvm-features.args index 629f868..3a9bb26 100644 --- a/tests/qemuxml2argvdata/kvm-features.args +++ b/tests/qemuxml2argvdata/kvm-features.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host,kvm=off,kvm-hint-dedicated=on,kvm-poll-control=on \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args index f51fb19..a708bf9 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args index a71d9d6..1fb76e5 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args index cb2eba7..8ad951e 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.7,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,-kvmclock,-kvm_pv_eoi \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args index c67e253..2b4244c 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvmclock=off,kvm_pv_eoi=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args index 8842d2a..7ad6f0a 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvmclock=off,kvm-pv-eoi=off \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args index 65bea1d..a884e5f 100644 --- a/tests/qemuxml2argvdata/kvmclock.args +++ b/tests/qemuxml2argvdata/kvmclock.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu32,-kvmclock \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args index 378c3b6..325b081 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.0,accel=kvm,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-machine pc-1.0,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args index 378c3b6..325b081 100644 --- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-1.0,accel=kvm,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-machine pc-1.0,usb=off,dump-guest-core=off,memory-encryption=sev0 \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args index e7a29b2..087e781 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \ --machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args index 6e469d1..2119eb2 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \ --machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.1,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/luks-disks-source.args b/tests/qemuxml2argvdata/luks-disks-source.args index e2bd559..c897684 100644 --- a/tests/qemuxml2argvdata/luks-disks-source.args +++ b/tests/qemuxml2argvdata/luks-disks-source.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \ --machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/luks-disks.args b/tests/qemuxml2argvdata/luks-disks.args index 4762696..1fea806 100644 --- a/tests/qemuxml2argvdata/luks-disks.args +++ b/tests/qemuxml2argvdata/luks-disks.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-encryptdisk/master-key.aes \ --machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args b/tests/qemuxml2argvdata/mach-virt-console-virtio.args index 36fe539..e2c0f1a 100644 --- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args +++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args b/tests/qemuxml2argvdata/mach-virt-serial-native.args index 8d25e49..cd27ffe 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial-native.args +++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args b/tests/qemuxml2argvdata/mach-virt-serial-pci.args index 2f4dd08..3485b8b 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args +++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args b/tests/qemuxml2argvdata/mach-virt-serial-usb.args index d96b2c0..9469f4e 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args +++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args index a9577c1..dca842f 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args @@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ aes-key-wrap=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args index a9577c1..dca842f 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args @@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ aes-key-wrap=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args index 7fbbe4e..7db11af 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,aes-key-wrap=on \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=on \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args index 7fbbe4e..7db11af 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,aes-key-wrap=on \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=on \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args index fa3ccef..1ddf4fc 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args index 6e480fc..44701f1 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args index e38898e..048cdaa 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args index b3d271e..8e5a21c 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=on \ +-machine pc,usb=off,dump-guest-core=on \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args index 40d6616..b1ef8b0 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args @@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ dea-key-wrap=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args index 40d6616..b1ef8b0 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args @@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ dea-key-wrap=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args index 4fbb224..2d8ad62 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,dea-key-wrap=on \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=on \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args index 4fbb224..2d8ad62 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,dea-key-wrap=on \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=on \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args index 056bf81..5001b75 100644 --- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args +++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args b/tests/qemuxml2argvdata/machine-keywrap-none.args index 056bf81..5001b75 100644 --- a/tests/qemuxml2argvdata/machine-keywrap-none.args +++ b/tests/qemuxml2argvdata/machine-keywrap-none.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args index f5b822e..ee4e24f 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args @@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ loadparm=SYSTEM1 \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args index 2c401d9..711a2ac 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,loadparm=2 \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,loadparm=2 \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args b/tests/qemuxml2argvdata/machine-loadparm-s390.args index 0326bea..7445f42 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,loadparm=2 \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,loadparm=2 \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args b/tests/qemuxml2argvdata/machine-smm-opt.args index 8f1f041..1f63cc5 100644 --- a/tests/qemuxml2argvdata/machine-smm-opt.args +++ b/tests/qemuxml2argvdata/machine-smm-opt.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine q35,accel=tcg,usb=off,smm=on,dump-guest-core=off \ +-machine q35,usb=off,smm=on,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args index f3f5ddf..01d31dc 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,vmport=off,dump-guest-core=off \ +-machine pc,usb=off,vmport=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdata/master-key.args index 9e91135..0331772 100644 --- a/tests/qemuxml2argvdata/master-key.args +++ b/tests/qemuxml2argvdata/master-key.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ 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 ef15e2e..a431ca0 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index ef15e2e..a431ca0 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-instance-00000092/master-key.aes \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args index 465f1e5..df19cb8 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m size=219136k,slots=16,maxmem=1099511627776k \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args index 6737bc5..7e158db 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m size=219136k,slots=16,maxmem=1099511627776k \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ 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 8d3fa2e..9367b2b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 4f22f78..9d7a04c 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 53dda23..75a3d70 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ 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 fb4ae4b..ae550f1 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args index f50444e..fe1e9a6 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \ +-machine pseries,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args index f50444e..fe1e9a6 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \ +-machine pseries,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ 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 5e44496..26f224c 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 94f8444..4148e0a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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,nvdimm=on \ +-machine pc,usb=off,dump-guest-core=off,nvdimm=on \ +-accel tcg \ -cpu qemu64 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args index ac741b8..43c6f26 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=kvm,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel kvm \ -m size=1048576k,slots=16,maxmem=4194304k \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args index f7f151d..62c3fb0 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=kvm,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel kvm \ -m size=1310720k,slots=16,maxmem=4194304k \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args index c2c80ec..008d0b9 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m size=219136k,slots=16,maxmem=1099511627776k \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qemuxml2argvdata/migrate-numa-unaligned.args index 7f0edb2..be82a56 100644 --- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args +++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 14338 \ -realtime mlock=off \ -smp 32,sockets=32,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args index c977c62..f288778 100644 --- a/tests/qemuxml2argvdata/migrate.args +++ b/tests/qemuxml2argvdata/migrate.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.args b/tests/qemuxml2argvdata/minimal-msg-timestamp.args index 42ca3cb..e6a5e4c 100644 --- a/tests/qemuxml2argvdata/minimal-msg-timestamp.args +++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/minimal-sandbox.args b/tests/qemuxml2argvdata/minimal-sandbox.args index 3f70786..cf6a8bc 100644 --- a/tests/qemuxml2argvdata/minimal-sandbox.args +++ b/tests/qemuxml2argvdata/minimal-sandbox.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args index 5ddfded..535f6fc 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args index a327c45..66e8de1 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args index b36dfe8..ef1fe46 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args index 4b99bdd..1faca0f 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args b/tests/qemuxml2argvdata/misc-no-reboot.args index 057568b..f8c2d28 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.args +++ b/tests/qemuxml2argvdata/misc-no-reboot.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args index 5ddfded..535f6fc 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args index 8f3725e..3314c4d 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-3.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args index 2772c82..6ec5d12 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args index 46e63a2..191ace7 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-3.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-3.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=on \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args index f77d866..515b8de 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args index 50bbb36..acc9865 100644 --- a/tests/qemuxml2argvdata/monitor-json.args +++ b/tests/qemuxml2argvdata/monitor-json.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name encryptdisk \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args index abf230f..6681a75 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args index 1ba2dfb..8edd4b3 100644 --- a/tests/qemuxml2argvdata/name-escape.args +++ b/tests/qemuxml2argvdata/name-escape.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo=1,,\ bar=2/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args index 0aa6645..3fec639 100644 --- a/tests/qemuxml2argvdata/net-client.args +++ b/tests/qemuxml2argvdata/net-client.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args index ff13662..38ae4e9 100644 --- a/tests/qemuxml2argvdata/net-eth-hostip.args +++ b/tests/qemuxml2argvdata/net-eth-hostip.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args index ff13662..38ae4e9 100644 --- a/tests/qemuxml2argvdata/net-eth-ifname.args +++ b/tests/qemuxml2argvdata/net-eth-ifname.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args index a79edee..aae85bb 100644 --- a/tests/qemuxml2argvdata/net-eth-names.args +++ b/tests/qemuxml2argvdata/net-eth-names.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args index 435843b..34cc4b5 100644 --- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args +++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args index ff13662..38ae4e9 100644 --- a/tests/qemuxml2argvdata/net-eth.args +++ b/tests/qemuxml2argvdata/net-eth.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args index 7c7e5bc..de55ff9 100644 --- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args +++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args index 46f2802..5de1877 100644 --- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args index ed8332d..778c882 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args index cd875f6..a10f302 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args index bd49544..6b56e06 100644 --- a/tests/qemuxml2argvdata/net-hostdev.args +++ b/tests/qemuxml2argvdata/net-hostdev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/net-many-models.args index 36b0571..2382be9 100644 --- a/tests/qemuxml2argvdata/net-many-models.args +++ b/tests/qemuxml2argvdata/net-many-models.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args index e8b71a3..929db1d 100644 --- a/tests/qemuxml2argvdata/net-mcast.args +++ b/tests/qemuxml2argvdata/net-mcast.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdata/net-server.args index b92e520..500f79c 100644 --- a/tests/qemuxml2argvdata/net-server.args +++ b/tests/qemuxml2argvdata/net-server.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args index 1390298..31b0fbf7 100644 --- a/tests/qemuxml2argvdata/net-udp.args +++ b/tests/qemuxml2argvdata/net-udp.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args index 5f1de30..1c3bb5b 100644 --- a/tests/qemuxml2argvdata/net-user-addr.args +++ b/tests/qemuxml2argvdata/net-user-addr.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args index a8d43b0..1dc1d1b 100644 --- a/tests/qemuxml2argvdata/net-user.args +++ b/tests/qemuxml2argvdata/net-user.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args index 190b068..b8f011a 100644 --- a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args index 002ec49..bef606b 100644 --- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args index 691ef39..b544e17 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args index 1acc910..3e649e0 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.args +++ b/tests/qemuxml2argvdata/net-vhostuser.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args index 58dcbb5..89bfb92 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args index d889d34..64385a3 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2argvdata/net-virtio-ccw.args index ed8eb90..5c5f000 100644 --- a/tests/qemuxml2argvdata/net-virtio-ccw.args +++ b/tests/qemuxml2argvdata/net-virtio-ccw.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args index 67b0592..f785d0b 100644 --- a/tests/qemuxml2argvdata/net-virtio-device.args +++ b/tests/qemuxml2argvdata/net-virtio-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args index a9ac968..23d280e 100644 --- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args index 32d3b6b..a1669a1 100644 --- a/tests/qemuxml2argvdata/net-virtio-netdev.args +++ b/tests/qemuxml2argvdata/net-virtio-netdev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args index 758da23..2dd0877 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args +++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-virtio-s390.args b/tests/qemuxml2argvdata/net-virtio-s390.args index b863943..38212b3 100644 --- a/tests/qemuxml2argvdata/net-virtio-s390.args +++ b/tests/qemuxml2argvdata/net-virtio-s390.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml2argvdata/net-virtio-teaming.args index 19e7260..79138f0 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming.args +++ b/tests/qemuxml2argvdata/net-virtio-teaming.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args index 4beb5ca..c008cfd 100644 --- a/tests/qemuxml2argvdata/net-virtio.args +++ b/tests/qemuxml2argvdata/net-virtio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args index 3993edf..30ef104 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,mem-merge=off \ +-machine pc,usb=off,dump-guest-core=off,mem-merge=off \ +-accel tcg \ -m 215 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index 7270aaf..75c73b5 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args index 7270aaf..75c73b5 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index 7270aaf..75c73b5 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index 7270aaf..75c73b5 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args index 7270aaf..75c73b5 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args index 7270aaf..75c73b5 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemuxml2argvdata/numatune-auto-prefer.args index babb23b..0ef138d 100644 --- a/tests/qemuxml2argvdata/numatune-auto-prefer.args +++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 64 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.args index a20b40b..c93979d 100644 --- a/tests/qemuxml2argvdata/numatune-distances.args +++ b/tests/qemuxml2argvdata/numatune-distances.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 12288 \ -realtime mlock=off \ -smp 12,sockets=12,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index c52015c..453d350 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,hmat=on \ +-machine pc,usb=off,dump-guest-core=off,hmat=on \ +-accel tcg \ -cpu qemu64 \ -m 12288 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args index 213efe0..b9a03f9 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 64 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args index 64fdcd7..2308589 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.args +++ b/tests/qemuxml2argvdata/numatune-memnode.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 24105 \ -realtime mlock=off \ -smp 32,sockets=32,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args index 7270aaf..75c73b5 100644 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ b/tests/qemuxml2argvdata/numatune-memory.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.args b/tests/qemuxml2argvdata/numatune-no-vcpu.args index a1f1ee0..a661e33 100644 --- a/tests/qemuxml2argvdata/numatune-no-vcpu.args +++ b/tests/qemuxml2argvdata/numatune-no-vcpu.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 12288 \ -realtime mlock=off \ -smp 12,sockets=12,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args index ab94f30..493a4ce 100644 --- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-fedora/master-key.aes \ --machine pc-q35-4.0,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-q35-4.0,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -bios /usr/share/seabios/bios-256k.bin \ -m 8 \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args index 1eb5aad..a6284d0 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-fedora/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,accel=kvm,usb=off,smm=on,dump-guest-core=off,\ +-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -global driver=cfi.pflash01,property=secure,value=on \ -m 8 \ diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args index 9b8cbc4..6e26d44 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args @@ -23,9 +23,10 @@ file=/tmp/lib/domain--1-fedora/master-key.aes \ "discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\ "driver":"raw","file":"libvirt-pflash1-storage"}' \ --machine pc-q35-4.0,accel=kvm,usb=off,smm=on,dump-guest-core=off,\ +-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,\ pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 8 \ -object memory-backend-ram,id=pc.ram,size=8388608 \ diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args index a615dc0..2aa2223 100644 --- a/tests/qemuxml2argvdata/pages-dimm-discard.args +++ b/tests/qemuxml2argvdata/pages-dimm-discard.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name fedora \ -S \ --machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \ +-accel tcg \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args b/tests/qemuxml2argvdata/pages-discard-hugepages.args index bbf3c9f..1ccc8bd 100644 --- a/tests/qemuxml2argvdata/pages-discard-hugepages.args +++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name SomeDummyHugepagesGuest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argvdata/pages-discard.args index b2aed77..4074d9e 100644 --- a/tests/qemuxml2argvdata/pages-discard.args +++ b/tests/qemuxml2argvdata/pages-discard.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 4096 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/panic-double.args b/tests/qemuxml2argvdata/panic-double.args index 745efc7..864183e 100644 --- a/tests/qemuxml2argvdata/panic-double.args +++ b/tests/qemuxml2argvdata/panic-double.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,hv-crash \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/panic-no-address.args b/tests/qemuxml2argvdata/panic-no-address.args index b4adee0..7e63273 100644 --- a/tests/qemuxml2argvdata/panic-no-address.args +++ b/tests/qemuxml2argvdata/panic-no-address.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args index 51e107e..7330c7c 100644 --- a/tests/qemuxml2argvdata/panic.args +++ b/tests/qemuxml2argvdata/panic.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args index c1b1852..4037b92 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args index 2ab87fb..dbbd13f 100644 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args +++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args index b1ea53a..603164a 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args index ea333ef..97bc1b6 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args index 6982638..7a71932 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name fdr-br \ -S \ --machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-1.2,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args index 2d22f96..82c613b 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name fdr-br \ -S \ --machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-1.2,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args index 76d9414..14ed850 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name fdr-br \ -S \ --machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-1.2,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args index 18cc4b9..2e549f2 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name lots-of-disks \ -S \ --machine pc-i440fx-1.4,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.4,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64,-kvmclock \ -bios /usr/share/seabios/bios.bin \ -m 3907 \ diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args index 4b26702..1df4d1f 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name fdr-br \ -S \ --machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-1.2,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args index 6427976..804c5d7 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name expander-test \ -S \ --machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 16,sockets=2,cores=4,threads=2 \ diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args index 056c2a5..f0a4e6e 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name fdr-br \ -S \ --machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-1.2,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.args index 1dd1695..b812421 100644 --- a/tests/qemuxml2argvdata/pci-rom-disabled.args +++ b/tests/qemuxml2argvdata/pci-rom-disabled.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args index d82e1d0..7a7a341 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest2 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args index 92858a2..51d2d41 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args index a241324..e07346e 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name pcie-expander-bus-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 16,sockets=2,cores=4,threads=2 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args index 9438366..b198390 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args index 134be6b..031b913 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args +++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args index 619b03a..6696300 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args index 0040100..c496dd2 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.args index 18d26b4..c072b4e 100644 --- a/tests/qemuxml2argvdata/pcie-root.args +++ b/tests/qemuxml2argvdata/pcie-root.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args index a15c7d4..58bcc78 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args index a479b14..2df6c6e 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args index 9831ee3..dfa82ae 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args index 4557dc2..5494d65 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name foo \ -S \ --machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-1.2,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args index 37ab3ea..d7224c0 100644 --- a/tests/qemuxml2argvdata/pmu-feature-off.args +++ b/tests/qemuxml2argvdata/pmu-feature-off.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,pmu=off \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args index b0ac523..f1feeb0 100644 --- a/tests/qemuxml2argvdata/pmu-feature.args +++ b/tests/qemuxml2argvdata/pmu-feature.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,pmu=on \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args index f3ac10b..9a2255a 100644 --- a/tests/qemuxml2argvdata/ppc-dtb.args +++ b/tests/qemuxml2argvdata/ppc-dtb.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc \ -name QEMUGuest1 \ -S \ --machine ppce500,accel=kvm,usb=off,dump-guest-core=off \ +-machine ppce500,usb=off,dump-guest-core=off \ +-accel kvm \ -m 256 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args index c72b0de..801806e 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-2.7,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries-2.7,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args index ce6b9b0..2a22ef8 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-3.1,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries-3.1,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args index 18e7488..2776d6b 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pseries-4.2,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel kvm \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args index 5679ba4..1792d83 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-2.7,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-2.7,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER7 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args index 2520237..63b4371 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-3.1,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-3.1,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER8 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args index deeeb8b..b3377fc 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-4.2,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args index 4b6d90c..c0d6531 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args index 6735769..128e6d2 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 4096 \ -object memory-backend-ram,id=ppc_spapr.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args index 6190b82..f9b2e38 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 256 \ -object memory-backend-ram,id=ppc_spapr.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args index cac8c27..87ac273 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 256 \ -object memory-backend-ram,id=ppc_spapr.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args index 4934944..3202af2 100644 --- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args +++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 256 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args index d40f8cf..1c3e348 100644 --- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 256 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.args b/tests/qemuxml2argvdata/ppc64-usb-controller.args index 7d6ba64..adc21bc 100644 --- a/tests/qemuxml2argvdata/ppc64-usb-controller.args +++ b/tests/qemuxml2argvdata/ppc64-usb-controller.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 256 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/ppce500-serial.args b/tests/qemuxml2argvdata/ppce500-serial.args index 3728b4d..da53502 100644 --- a/tests/qemuxml2argvdata/ppce500-serial.args +++ b/tests/qemuxml2argvdata/ppce500-serial.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc \ -name QEMUGuest1 \ -S \ --machine ppce500,accel=kvm,usb=off,dump-guest-core=off \ +-machine ppce500,usb=off,dump-guest-core=off \ +-accel kvm \ -m 256 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-basic.args b/tests/qemuxml2argvdata/pseries-basic.args index 574e3b1..13aa587 100644 --- a/tests/qemuxml2argvdata/pseries-basic.args +++ b/tests/qemuxml2argvdata/pseries-basic.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args b/tests/qemuxml2argvdata/pseries-console-virtio.args index 7c85321..6a8301d 100644 --- a/tests/qemuxml2argvdata/pseries-console-virtio.args +++ b/tests/qemuxml2argvdata/pseries-console-virtio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args index ece96ee..2f90782 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args +++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=kvm,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host,compat=power9 \ -m 256 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args b/tests/qemuxml2argvdata/pseries-cpu-compat.args index 1c64344..b623250 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-compat.args +++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=kvm,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu host,compat=power7 \ -m 256 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args b/tests/qemuxml2argvdata/pseries-cpu-exact.args index 5949d95..06805bd 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-exact.args +++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu POWER7 \ -m 512 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args b/tests/qemuxml2argvdata/pseries-cpu-le.args index 9645918..60ad5a6 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-le.args +++ b/tests/qemuxml2argvdata/pseries-cpu-le.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=kvm,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel kvm \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-features.args b/tests/qemuxml2argvdata/pseries-features.args index 668eeb1..cb2ff7f 100644 --- a/tests/qemuxml2argvdata/pseries-features.args +++ b/tests/qemuxml2argvdata/pseries-features.args @@ -10,9 +10,10 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off,resize-hpt=required,\ +-machine pseries,usb=off,dump-guest-core=off,resize-hpt=required,\ cap-hpt-max-page-size=1048576k,cap-htm=on,cap-nested-hv=off,cap-ccf-assist=on,\ cap-cfpc=fixed,cap-sbbc=broken,cap-ibs=fixed-ccd \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args b/tests/qemuxml2argvdata/pseries-hostdevs-1.args index 51ec025..4df2348 100644 --- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args +++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args b/tests/qemuxml2argvdata/pseries-hostdevs-2.args index 87b6d92..8c2520a 100644 --- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args +++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args b/tests/qemuxml2argvdata/pseries-hostdevs-3.args index 5820140..9fa0a34 100644 --- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args +++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args index 1d9a7b1..640bffe 100644 --- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args +++ b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=kvm,usb=off,dump-guest-core=off,max-cpu-compat=power7 \ +-machine pseries,usb=off,dump-guest-core=off,max-cpu-compat=power7 \ +-accel kvm \ -cpu host \ -m 256 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args b/tests/qemuxml2argvdata/pseries-many-buses-1.args index 6290a5f..4ea01ba 100644 --- a/tests/qemuxml2argvdata/pseries-many-buses-1.args +++ b/tests/qemuxml2argvdata/pseries-many-buses-1.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args b/tests/qemuxml2argvdata/pseries-many-buses-2.args index 0e8a269..0ef5643 100644 --- a/tests/qemuxml2argvdata/pseries-many-buses-2.args +++ b/tests/qemuxml2argvdata/pseries-many-buses-2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args b/tests/qemuxml2argvdata/pseries-many-devices.args index e5e1d94..b5e8883 100644 --- a/tests/qemuxml2argvdata/pseries-many-devices.args +++ b/tests/qemuxml2argvdata/pseries-many-devices.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-nvram.args b/tests/qemuxml2argvdata/pseries-nvram.args index aabd97c..740ccca 100644 --- a/tests/qemuxml2argvdata/pseries-nvram.args +++ b/tests/qemuxml2argvdata/pseries-nvram.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args b/tests/qemuxml2argvdata/pseries-panic-missing.args index 574e3b1..13aa587 100644 --- a/tests/qemuxml2argvdata/pseries-panic-missing.args +++ b/tests/qemuxml2argvdata/pseries-panic-missing.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args b/tests/qemuxml2argvdata/pseries-panic-no-address.args index 574e3b1..13aa587 100644 --- a/tests/qemuxml2argvdata/pseries-panic-no-address.args +++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args b/tests/qemuxml2argvdata/pseries-phb-default-missing.args index c0725bf..3c41595 100644 --- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args +++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args b/tests/qemuxml2argvdata/pseries-phb-numa-node.args index ca25e84..e295045 100644 --- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args +++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 8,sockets=2,cores=1,threads=4 \ diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args b/tests/qemuxml2argvdata/pseries-phb-simple.args index c0725bf..3c41595 100644 --- a/tests/qemuxml2argvdata/pseries-phb-simple.args +++ b/tests/qemuxml2argvdata/pseries-phb-simple.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args b/tests/qemuxml2argvdata/pseries-serial-native.args index 9a5f8c8..c8295f7 100644 --- a/tests/qemuxml2argvdata/pseries-serial-native.args +++ b/tests/qemuxml2argvdata/pseries-serial-native.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args b/tests/qemuxml2argvdata/pseries-serial-pci.args index 9305325..d91c38e 100644 --- a/tests/qemuxml2argvdata/pseries-serial-pci.args +++ b/tests/qemuxml2argvdata/pseries-serial-pci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.args b/tests/qemuxml2argvdata/pseries-serial-usb.args index 104f0d5..d18cafe 100644 --- a/tests/qemuxml2argvdata/pseries-serial-usb.args +++ b/tests/qemuxml2argvdata/pseries-serial-usb.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name guest \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args b/tests/qemuxml2argvdata/pseries-usb-default.args index 5de1777..26dfe86 100644 --- a/tests/qemuxml2argvdata/pseries-usb-default.args +++ b/tests/qemuxml2argvdata/pseries-usb-default.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args b/tests/qemuxml2argvdata/pseries-usb-kbd.args index 61246e4..cc3d0a4 100644 --- a/tests/qemuxml2argvdata/pseries-usb-kbd.args +++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args b/tests/qemuxml2argvdata/pseries-usb-multi.args index b811c02..2fa76dd 100644 --- a/tests/qemuxml2argvdata/pseries-usb-multi.args +++ b/tests/qemuxml2argvdata/pseries-usb-multi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args index a412593..c628019 100644 --- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvdata/pseries-vio.args index a500e9b..b707cfc 100644 --- a/tests/qemuxml2argvdata/pseries-vio.args +++ b/tests/qemuxml2argvdata/pseries-vio.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-ppc64 \ -name QEMUGuest1 \ -S \ --machine pseries,accel=tcg,usb=off,dump-guest-core=off \ +-machine pseries,usb=off,dump-guest-core=off \ +-accel tcg \ -m 512 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args index 7e3c90e..b9a04ae 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.7,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,-kvm_pv_unhalt \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args index 76e439c..4bb2b43 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_unhalt=off \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args index 30f45b8..f104e65 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-unhalt=off \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args index c5d0095..2e55d11 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.7,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,+kvm_pv_unhalt \ -m 214 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args index e19ebfd..6378655 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu32,kvm_pv_unhalt=on \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args index beb0e5f..bb09fc9 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64,kvm-pv-unhalt=on \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args b/tests/qemuxml2argvdata/q35-acpi-nouefi.args index 09e06c9..708fa85 100644 --- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args +++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu Haswell \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argvdata/q35-acpi-uefi.args index d00fe5b..92956de 100644 --- a/tests/qemuxml2argvdata/q35-acpi-uefi.args +++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu Haswell \ -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,\ readonly=on \ diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args b/tests/qemuxml2argvdata/q35-default-devices-only.args index 90f4150..522e0ac 100644 --- a/tests/qemuxml2argvdata/q35-default-devices-only.args +++ b/tests/qemuxml2argvdata/q35-default-devices-only.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-multifunction.args b/tests/qemuxml2argvdata/q35-multifunction.args index b720a6c..fb259b6 100644 --- a/tests/qemuxml2argvdata/q35-multifunction.args +++ b/tests/qemuxml2argvdata/q35-multifunction.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args index de34dff..184e2d9 100644 --- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args +++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu Haswell \ -m 1024 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args index b3be517..1dba0bd 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2argvdata/q35-pcie-autoadd.args index 4e17350..7d07ad9 100644 --- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args +++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args index e741e84..471636e 100644 --- a/tests/qemuxml2argvdata/q35-pcie.args +++ b/tests/qemuxml2argvdata/q35-pcie.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args index ccde170..3324623 100644 --- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args +++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35 \ -S \ --machine pc-q35-2.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-2.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2argvdata/q35-pm-disable.args index 86340d3..567ec9e 100644 --- a/tests/qemuxml2argvdata/q35-pm-disable.args +++ b/tests/qemuxml2argvdata/q35-pm-disable.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35 \ -S \ --machine pc-q35-2.5,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-2.5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args index 82e54d1..acf9ff8 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args index 23629ea..b88e7ad 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args index ab39342..4783cef 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args index dbe9cf9..10dd800 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-x86_64 \ -name virt-manager-basic \ -S \ --machine pc-q35-2.7,accel=kvm,usb=off,vmport=off,dump-guest-core=off \ +-machine pc-q35-2.7,usb=off,vmport=off,dump-guest-core=off \ +-accel kvm \ -m 4096 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2argvdata/q35-virtio-pci.args index ca4ed91..fd3d6c0 100644 --- a/tests/qemuxml2argvdata/q35-virtio-pci.args +++ b/tests/qemuxml2argvdata/q35-virtio-pci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args index 5ca5917..f9fd451 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args index 7e4cffa..a289816 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -12,7 +12,8 @@ BAR='' \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args index fc1592f..94d622c 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args index fc1592f..94d622c 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args index fc1592f..94d622c 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index fc1592f..94d622c 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args index fc1592f..94d622c 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args index fc1592f..94d622c 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args index 74f7b88..c3da15c 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args index 0f3253f..b2ee231 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args @@ -14,7 +14,8 @@ BAR='' \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args index aefe486..e46fb7a 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -14,7 +14,8 @@ BAR='' \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args index 1ddc18b..f3153dd 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args index e31f37e..3990dcb 100644 --- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args +++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 6,sockets=6,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args index cc0a751..98f302f 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.args +++ b/tests/qemuxml2argvdata/restore-v2-fd.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args index ac3d16f..ff43c7e 100644 --- a/tests/qemuxml2argvdata/restore-v2.args +++ b/tests/qemuxml2argvdata/restore-v2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args index 612e1ce..2e9058b 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 4096 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args index 8485e3d..f95437a 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 4096 \ -overcommit mem-lock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args b/tests/qemuxml2argvdata/riscv64-virt-pci.args index 0b91972..274c6e2 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-pci.args +++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-riscv64 \ -name riscv64 \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvdata/riscv64-virt.args index 1631e46..8b153e0 100644 --- a/tests/qemuxml2argvdata/riscv64-virt.args +++ b/tests/qemuxml2argvdata/riscv64-virt.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-riscv64 \ -name riscv64 \ -S \ --machine virt,accel=tcg,usb=off,dump-guest-core=off \ +-machine virt,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args index 573d953..9661631 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name test \ -S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args index 573d953..9661631 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name test \ -S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args index a8be43a..730086a 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-2.7,accel=kvm,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel kvm \ -cpu host \ -m 256 \ -object memory-backend-ram,id=s390.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args index 62ffe27..70592c7 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel kvm \ -cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,csske=on,mepoch=on,msa9=on,\ msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\ edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args index f57880c..de63431 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-2.7,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 256 \ -object memory-backend-ram,id=s390.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args index 155e9b3..6f021d9 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine s390-ccw-virtio-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 256 \ -object memory-backend-ram,id=s390.ram,size=268435456 \ diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args b/tests/qemuxml2argvdata/s390-panic-missing.args index ef24f8f..6f5a861 100644 --- a/tests/qemuxml2argvdata/s390-panic-missing.args +++ b/tests/qemuxml2argvdata/s390-panic-missing.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 256 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args b/tests/qemuxml2argvdata/s390-panic-no-address.args index 60ddab9..b623b60 100644 --- a/tests/qemuxml2argvdata/s390-panic-no-address.args +++ b/tests/qemuxml2argvdata/s390-panic-no-address.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 256 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390-serial-2.args b/tests/qemuxml2argvdata/s390-serial-2.args index e6103ce..3642983 100644 --- a/tests/qemuxml2argvdata/s390-serial-2.args +++ b/tests/qemuxml2argvdata/s390-serial-2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390-serial-console.args b/tests/qemuxml2argvdata/s390-serial-console.args index cb454ef..89c59a0 100644 --- a/tests/qemuxml2argvdata/s390-serial-console.args +++ b/tests/qemuxml2argvdata/s390-serial-console.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390-serial.args b/tests/qemuxml2argvdata/s390-serial.args index cb454ef..89c59a0 100644 --- a/tests/qemuxml2argvdata/s390-serial.args +++ b/tests/qemuxml2argvdata/s390-serial.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 8c86670..17a9751 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 4096 \ -object memory-backend-ram,id=s390.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index c44c4dd..f1d257b 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 4096 \ -object memory-backend-ram,id=s390.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args index b561a77..70c5718 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args index 239c131..b071027 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args index 96053f2..61c8564 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args index 435b9eb..865c340 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.args +++ b/tests/qemuxml2argvdata/serial-file-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args index 3533429..76f5e4a 100644 --- a/tests/qemuxml2argvdata/serial-file-log.args +++ b/tests/qemuxml2argvdata/serial-file-log.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args index 31800b3..d2848ad 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.args +++ b/tests/qemuxml2argvdata/serial-many-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args index 4d6d6e3..2be9165 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/serial-pty-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args b/tests/qemuxml2argvdata/serial-spiceport-nospice.args index 60253f4..d57fa14 100644 --- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args +++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args index 6e3d4e4..8245e61 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ b/tests/qemuxml2argvdata/serial-spiceport.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args index dd91391..fb77881 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args index a372863..e6417b4 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args index c08869b..da268de 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args index c84e58e..c4470a6 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args index c84e58e..c4470a6 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args index 051c8ab..adc0dcc 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args index 27fda92..b586186 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.args +++ b/tests/qemuxml2argvdata/serial-udp-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args index 2699832..019d87f 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args index 07b7aba..a41dc11 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args index f5a5bab..24cf2c3 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.args +++ b/tests/qemuxml2argvdata/serial-vc-chardev.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemuxml2argvdata/shmem-plain-doorbell.args index 93d089c..196718a 100644 --- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args +++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args index f2f3c3e..9fd8d78 100644 --- a/tests/qemuxml2argvdata/shmem.args +++ b/tests/qemuxml2argvdata/shmem.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args index 7e94420..1bc304b 100644 --- a/tests/qemuxml2argvdata/smartcard-controller.args +++ b/tests/qemuxml2argvdata/smartcard-controller.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args index 9381649..d3db941 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args index eecc454..5a3f74c 100644 --- a/tests/qemuxml2argvdata/smartcard-host-certificates.args +++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args index 7e94420..1bc304b 100644 --- a/tests/qemuxml2argvdata/smartcard-host.args +++ b/tests/qemuxml2argvdata/smartcard-host.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args index 983648a..145ad84 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args index bac4418..fc919b5 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args index 7eb5449..13de57b 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args index 3e0262e..a5454b7 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args b/tests/qemuxml2argvdata/smbios-type-fwcfg.args index 372ae77..66ebd0e 100644 --- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args +++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args index 8ded1cb..ab4e1a1 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args index 632e9d8..636f5a9 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,maxcpus=4,sockets=2,dies=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args index dbf714c..7329776 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args index ce159a7..7fdd798 100644 --- a/tests/qemuxml2argvdata/sound-device.args +++ b/tests/qemuxml2argvdata/sound-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args index 7ed0c1e..60d21b5 100644 --- a/tests/qemuxml2argvdata/sound.args +++ b/tests/qemuxml2argvdata/sound.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/sparc-minimal.args b/tests/qemuxml2argvdata/sparc-minimal.args index b91a4e8..b9b89d1 100644 --- a/tests/qemuxml2argvdata/sparc-minimal.args +++ b/tests/qemuxml2argvdata/sparc-minimal.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-sparc \ -name redhat62sparc \ -S \ --machine SS-5,accel=tcg,usb=off,dump-guest-core=off \ +-machine SS-5,usb=off,dump-guest-core=off \ +-accel tcg \ -m 500 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args index 96bf940..b8429ee 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pseries-5.0,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pseries-5.0,usb=off,dump-guest-core=off,\ memory-backend=ppc_spapr.ram \ +-accel tcg \ -cpu POWER9 \ -m 2048 \ -object memory-backend-ram,id=ppc_spapr.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args index 90505c7..057690f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args index 90505c7..057690f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args index 90505c7..057690f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args index 90505c7..057690f 100644 --- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args index 911d0c6..3f5880e 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args index 5da7d13..436fff0 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.12,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -object memory-backend-ram,id=pc.ram,size=2147483648 \ diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args index 2e931df..fe6eaf6 100644 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-2.10,accel=tcg,usb=off,smm=on,dump-guest-core=off,\ +-machine pc-q35-2.10,usb=off,smm=on,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -global mch.extended-tseg-mbytes=48 \ -cpu qemu64 \ -m 214 \ diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests/qemuxml2argvdata/usb-controller-default-q35.args index 9b4f99c..192feed 100644 --- a/tests/qemuxml2argvdata/usb-controller-default-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args index ef7a60a..eb86c4a 100644 --- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args +++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name q35-test \ -S \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -m 2048 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args index d93bd4f..b87275f 100644 --- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args index a23d0c4..0a8ac4f 100644 --- a/tests/qemuxml2argvdata/usb-controller-xhci.args +++ b/tests/qemuxml2argvdata/usb-controller-xhci.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args index 4aa1388..94f63a2 100644 --- a/tests/qemuxml2argvdata/usb-controller.args +++ b/tests/qemuxml2argvdata/usb-controller.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args index b944dcb..2877a24 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args index fbfc88b..6328ed3 100644 --- a/tests/qemuxml2argvdata/usb-hub-autoadd.args +++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args index 24b5217..f3aa614 100644 --- a/tests/qemuxml2argvdata/usb-hub.args +++ b/tests/qemuxml2argvdata/usb-hub.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args index dee4c84..7c09765 100644 --- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args +++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args index b1f2478..b625b09 100644 --- a/tests/qemuxml2argvdata/usb-ich9-companion.args +++ b/tests/qemuxml2argvdata/usb-ich9-companion.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args index a2c46c0..a8470ed 100644 --- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args +++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args index caddab7..fe3c7cd 100644 --- a/tests/qemuxml2argvdata/usb-long-port-path.args +++ b/tests/qemuxml2argvdata/usb-long-port-path.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args index a3a01b7..471abf3 100644 --- a/tests/qemuxml2argvdata/usb-none.args +++ b/tests/qemuxml2argvdata/usb-none.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args index 6000e89..59a9859 100644 --- a/tests/qemuxml2argvdata/usb-piix3-controller.args +++ b/tests/qemuxml2argvdata/usb-piix3-controller.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args index bd3c573..05b814f 100644 --- a/tests/qemuxml2argvdata/usb-port-autoassign.args +++ b/tests/qemuxml2argvdata/usb-port-autoassign.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args index 4809688..4cf2b35 100644 --- a/tests/qemuxml2argvdata/usb-port-missing.args +++ b/tests/qemuxml2argvdata/usb-port-missing.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args index 5f04bf0..b2af594 100644 --- a/tests/qemuxml2argvdata/usb-ports.args +++ b/tests/qemuxml2argvdata/usb-ports.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args index 9f6b493..ea22cb6 100644 --- a/tests/qemuxml2argvdata/usb-redir-boot.args +++ b/tests/qemuxml2argvdata/usb-redir-boot.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args index 89dcbfa..af09b4e 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter-version.args +++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args index d801505..96bfdd8 100644 --- a/tests/qemuxml2argvdata/usb-redir-filter.args +++ b/tests/qemuxml2argvdata/usb-redir-filter.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args index a8a90a8..0b1f851 100644 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args index 1d247b0..60b739a 100644 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args index d4f1e0d..3685ab5 100644 --- a/tests/qemuxml2argvdata/usb-redir.args +++ b/tests/qemuxml2argvdata/usb-redir.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args index d68ff5f..498f0fd 100644 --- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args +++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args index 9098cc6..92d3246 100644 --- a/tests/qemuxml2argvdata/usb1-usb2.args +++ b/tests/qemuxml2argvdata/usb1-usb2.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args b/tests/qemuxml2argvdata/user-aliases-usb.args index abaf54c..60b6781 100644 --- a/tests/qemuxml2argvdata/user-aliases-usb.args +++ b/tests/qemuxml2argvdata/user-aliases-usb.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name gentoo \ -S \ --machine pc-i440fx-1.4,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.4,usb=off,dump-guest-core=off \ +-accel kvm \ -m 4096 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args index e0eed48..0cd5f3d 100644 --- a/tests/qemuxml2argvdata/user-aliases.args +++ b/tests/qemuxml2argvdata/user-aliases.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-gentoo/master-key.aes \ --machine pc-i440fx-1.4,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-1.4,usb=off,dump-guest-core=off \ +-accel kvm \ -m 4096 \ -realtime mlock=off \ -smp 4,sockets=4,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args b/tests/qemuxml2argvdata/vcpu-placement-static.args index 7ceb679..27e0d33 100644 --- a/tests/qemuxml2argvdata/vcpu-placement-static.args +++ b/tests/qemuxml2argvdata/vcpu-placement-static.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name dummy2 \ -S \ --machine pc-q35-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-q35-2.3,usb=off,dump-guest-core=off \ +-accel kvm \ -m 128 \ -realtime mlock=off \ -smp 2,maxcpus=6,sockets=6,cores=1,threads=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 dd5f68a..f1d1058 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 @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu64 \ -m 14336 \ -overcommit mem-lock=off \ 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 e4f5db7..7cf6f05 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off \ +-machine q35,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 2048 \ -overcommit mem-lock=off \ 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 e99a534..d758318 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index 277bf8c..f39b900 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -overcommit mem-lock=off \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args index bc9102e..0acef70 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc-i440fx-2.9,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-2.9,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args index c70f051..99847d0 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args index e1b17eb..ccc034f 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\ memory-backend=s390.ram \ +-accel tcg \ -cpu qemu \ -m 214 \ -object memory-backend-ram,id=s390.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args index a461d4d..984bf85 100644 --- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-test/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args index 094c96a..c4914d6 100644 --- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args index 4ffc229..01c7158 100644 --- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2argvdata/video-none-device.args index 193ff21..f8f5205 100644 --- a/tests/qemuxml2argvdata/video-none-device.args +++ b/tests/qemuxml2argvdata/video-none-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args index aef42cc..4208aed 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args index 6f38fae..8889752 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args index 575a6d4..a59b886 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.args +++ b/tests/qemuxml2argvdata/video-qxl-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2argvdata/video-qxl-heads.args index 74cab50..b686985 100644 --- a/tests/qemuxml2argvdata/video-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-qxl-heads.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.args b/tests/qemuxml2argvdata/video-qxl-nodevice.args index 830b5f9..e3a117c 100644 --- a/tests/qemuxml2argvdata/video-qxl-nodevice.args +++ b/tests/qemuxml2argvdata/video-qxl-nodevice.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args index 8c38697..15f032c 100644 --- a/tests/qemuxml2argvdata/video-qxl-noheads.args +++ b/tests/qemuxml2argvdata/video-qxl-noheads.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemuxml2argvdata/video-qxl-resolution.args index 1fdaf7e..8031eeb 100644 --- a/tests/qemuxml2argvdata/video-qxl-resolution.args +++ b/tests/qemuxml2argvdata/video-qxl-resolution.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args index 3c47329..d6b7270 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args index e79c21e..87d7467 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args index 6fb7286..c4a04d9 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args index 5e4d4db..0a0f2b4 100644 --- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 1024 \ -object memory-backend-ram,id=pc.ram,size=1073741824 \ diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args index c267f4b..5056cba 100644 --- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args index 132d67e..d1ef8d0 100644 --- a/tests/qemuxml2argvdata/video-vga-device.args +++ b/tests/qemuxml2argvdata/video-vga-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.args b/tests/qemuxml2argvdata/video-vga-nodevice.args index cf21caf..91e3341 100644 --- a/tests/qemuxml2argvdata/video-vga-nodevice.args +++ b/tests/qemuxml2argvdata/video-vga-nodevice.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args index 154bc1c..13c76aa 100644 --- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args index 45c7701..c6b4a0e 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args index 050d989..5591c89 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args index 7a5df40..ab8bbf5 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args @@ -9,7 +9,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args index 860eaf0..a011f44 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args index 8852351..229acad 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args index 42760eb..8725265 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args index cb87552..e8d8595 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga.args +++ b/tests/qemuxml2argvdata/video-virtio-vga.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args index 601d4d2..36ebcff 100644 --- a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args index 4e453a2..4d91a3c 100644 --- a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args index d26952c..f221c8d 100644 --- a/tests/qemuxml2argvdata/virtio-input-passthrough.args +++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args index c89997a..6a612f1 100644 --- a/tests/qemuxml2argvdata/virtio-input.args +++ b/tests/qemuxml2argvdata/virtio-input.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-lun.args b/tests/qemuxml2argvdata/virtio-lun.args index 8505011..e62580e 100644 --- a/tests/qemuxml2argvdata/virtio-lun.args +++ b/tests/qemuxml2argvdata/virtio-lun.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name test \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 1024 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args index 82a977b..d2bbac8 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-3.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-3.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index 8674a4b..8c3cf59 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args index 6552ee6..7657f1f 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args index 15eb4b5..a182cbd 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args index ae605a6..ba36cea 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args index 908b572..9dd9411 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args index 3a030d8..52546a1 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args index 0cc82a2..f374e62 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args index 92b8e24..99663ca 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args index 62c2d34..4245727 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args index 79aa5ca..3eda7ef 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args index 27375c9..e4a2ce2 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args index b38a8f3..79044a7 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args index 38a402e..1550de3 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args index 9b4ef37..0ec0ead 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args index 6ebc45d..659498f 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args index ead8785..af48807 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args index 3c32335..1a46428 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args index 12c0764..a86028f 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args index f2d626a..3cfdfa4 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args index e645353..9ed9870 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args index cd4807b..ad85b4a 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args index 66fb11b..4ed20c4 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args index 3feff0e..5e4e23b 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args index 3ec61da..fb3fa67 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args index cfd3024..958c89b 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args index c5719bb..f6b5303 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args index e230e92..036ee91 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -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 \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args index f8e37ce..53f6c3c 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2argvdata/virtio-rng-ccw.args index 31e8b8a..8b03b0d 100644 --- a/tests/qemuxml2argvdata/virtio-rng-ccw.args +++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-ccw,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args index c21e017..afbb59f 100644 --- a/tests/qemuxml2argvdata/virtio-rng-default.args +++ b/tests/qemuxml2argvdata/virtio-rng-default.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args index 842d18d..d266bc9 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \ +-accel kvm \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args index 192d844..14db22d 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=kvm,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args index b07549c..2302183 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args index c70eba0..e578185 100644 --- a/tests/qemuxml2argvdata/virtio-rng-multiple.args +++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args index dbe0148..a05a2a6 100644 --- a/tests/qemuxml2argvdata/virtio-rng-random.args +++ b/tests/qemuxml2argvdata/virtio-rng-random.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args index ed810d5..1612599 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-q35-3.1,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc-q35-3.1,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index c526d7a..ff2f33a 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 214 \ -object memory-backend-ram,id=pc.ram,size=224395264 \ diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args index e4b1bbe..bb711a4 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args index 5e5e33d..df66920 100644 --- a/tests/qemuxml2argvdata/watchdog-device.args +++ b/tests/qemuxml2argvdata/watchdog-device.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/watchdog-diag288.args b/tests/qemuxml2argvdata/watchdog-diag288.args index 0790e7d..5db373d 100644 --- a/tests/qemuxml2argvdata/watchdog-diag288.args +++ b/tests/qemuxml2argvdata/watchdog-diag288.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-s390x \ -name QEMUGuest1 \ -S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ +-machine s390-virtio,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args index 9d69a49..ebd3f4b 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.args +++ b/tests/qemuxml2argvdata/watchdog-dump.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args index 9109a71..2f934aa 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.args +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args index bfd9019..b7b3b97 100644 --- a/tests/qemuxml2argvdata/watchdog.args +++ b/tests/qemuxml2argvdata/watchdog.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i386 \ -name QEMUGuest1 \ -S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel tcg \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args index 871ac6f..f078c45 100644 --- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args @@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-x86_64 \ -name kvm \ -S \ --machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc,usb=off,dump-guest-core=off \ +-accel kvm \ -cpu qemu32 \ -m 4096 \ -realtime mlock=off \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args index ad770d2..5b26597 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-i440fx-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args index 81df0cb..1002c52 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-q35-4.2,accel=kvm,usb=off,dump-guest-core=off,\ +-machine pc-q35-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel kvm \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args index ffc52d8..f2f5b55 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-i440fx-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-i440fx-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args index eda728f..e85c4d9 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args @@ -12,8 +12,9 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc-q35-4.2,accel=tcg,usb=off,dump-guest-core=off,\ +-machine pc-q35-4.2,usb=off,dump-guest-core=off,\ memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args index 5458fc6..734043c 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args index d2246d0..0efe66f 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index e9d4e2c..3beafee 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args index 8bec375..ca5b286 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-guest/master-key.aes \ --machine q35,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \ +-accel tcg \ -cpu qemu64 \ -m 4096 \ -object memory-backend-ram,id=pc.ram,size=4294967296 \ -- 1.8.3.1

7 9