From 2af5a938d20668f4daf0bcdfeb82588c11ce4433 Mon Sep 17 00:00:00 2001 From: yezengruan Date: Tue, 6 Dec 2022 15:38:34 +0800 Subject: [PATCH] libvirt update to version 6.2.0-47 - sync some bugfix patches from upstream - support vhostuser disk - libvirt: support dirtyrate (calc-dirty-rate, dirtyrate-param.mode) Signed-off-by: yezengruan (cherry picked from commit 6291e25165891a96b7cfcffb7bd612c675810b95) --- client-fix-memory-leak-in-client-msg.patch | 47 + ...implement-support-for-vhostuser-disk.patch | 617 + ...e-CPU-function-is-ignoring-return-va.patch | 44 + docs-introduces-new-vhostuser-disk-type.patch | 149 + examples-hellolibvirt-fix-argc-check.patch | 41 + ...v-fix-the-number-of-threads-per-core.patch | 32 + ...ntroduce-virDomainDirtyRateCalcFlags.patch | 77 + ...sts-Sync-time-for-autostarted-guests.patch | 40 + libvirt.spec | 41 +- ...tax-error-in-lxcNodeGetSecurityModel.patch | 38 + ...ror-value-of-lxcNodeGetSecurityModel.patch | 47 + ...ire-TSC-frequency-to-strictly-match-.patch | 95 + qemu-Switch-to-accel.patch | 11728 ++++++++++++++++ qemu-implement-vhost-user-blk-support.patch | 566 + ...duce-qemuDomainGetVhostUserAlias-hel.patch | 89 + ...capabilities-Fix-incorrect-alignment.patch | 53 + ...s-Introduce-QEMU_CAPS_CALC_DIRTY_RAT.patch | 59 + ...s-Introduce-QEMU_CAPS_DIRTYRATE_MODE.patch | 55 + ...s-introduce-vhost-user-blk-capabilit.patch | 378 + ...-t-validate-accelerator-when-buildin.patch | 48 + ...ove-redundant-scsi-option-in-vhost-u.patch | 32 + ...ire-MODIFY-job-in-qemuDomainStartDir.patch | 31 + ...mode-parameter-to-qemuDomainStartDir.patch | 146 + ...e-capability-before-calculating-dirt.patch | 52 + ...n-t-error-on-macOS-when-getting-sett.patch | 70 + ...l2argvtest-Reorder-gluster-arguments.patch | 38 + ...-false-positive-in-testConfRoundTrip.patch | 37 + ...x-lstat-mock-initialization-on-macOS.patch | 32 + tests-Fix-vhostuser-args-file.patch | 31 + ...uxml2argvdata-qtests-switch-to-accel.patch | 314 + ...-possible-memory-leak-in-vboxNetwork.patch | 47 + ...ursive-Return-1-on-failure-condition.patch | 33 + ...hot-fix-cbdata-passing-to-virshStrea.patch | 52 + ...-mistake-in-cmdMigrateSetMaxDowntime.patch | 38 + ...on-error-in-case-of-multiple-mac-add.patch | 54 + 35 files changed, 15250 insertions(+), 1 deletion(-) create mode 100644 client-fix-memory-leak-in-client-msg.patch create mode 100644 conf-implement-support-for-vhostuser-disk.patch create mode 100644 cpu_ppc64-compare-CPU-function-is-ignoring-return-va.patch create mode 100644 docs-introduces-new-vhostuser-disk-type.patch create mode 100644 examples-hellolibvirt-fix-argc-check.patch create mode 100644 hyperv-fix-the-number-of-threads-per-core.patch create mode 100644 include-Introduce-virDomainDirtyRateCalcFlags.patch create mode 100644 libvirt-guests-Sync-time-for-autostarted-guests.patch create mode 100644 lxc-Fix-syntax-error-in-lxcNodeGetSecurityModel.patch create mode 100644 lxc-fix-error-value-of-lxcNodeGetSecurityModel.patch create mode 100644 qemu-Do-not-require-TSC-frequency-to-strictly-match-.patch create mode 100644 qemu-Switch-to-accel.patch create mode 100644 qemu-implement-vhost-user-blk-support.patch create mode 100644 qemu_alias-introduce-qemuDomainGetVhostUserAlias-hel.patch create mode 100644 qemu_capabilities-Fix-incorrect-alignment.patch create mode 100644 qemu_capabilities-Introduce-QEMU_CAPS_CALC_DIRTY_RAT.patch create mode 100644 qemu_capabilities-Introduce-QEMU_CAPS_DIRTYRATE_MODE.patch create mode 100644 qemu_capabilities-introduce-vhost-user-blk-capabilit.patch create mode 100644 qemu_command-Don-t-validate-accelerator-when-buildin.patch create mode 100644 qemu_command-remove-redundant-scsi-option-in-vhost-u.patch create mode 100644 qemu_driver-Acquire-MODIFY-job-in-qemuDomainStartDir.patch create mode 100644 qemu_driver-Add-mode-parameter-to-qemuDomainStartDir.patch create mode 100644 qemu_driver-Probe-capability-before-calculating-dirt.patch create mode 100644 security_util-Don-t-error-on-macOS-when-getting-sett.patch create mode 100644 storagepoolxml2argvtest-Reorder-gluster-arguments.patch create mode 100644 tests-Fix-false-positive-in-testConfRoundTrip.patch create mode 100644 tests-Fix-lstat-mock-initialization-on-macOS.patch create mode 100644 tests-Fix-vhostuser-args-file.patch create mode 100644 tests-qemuxml2argvdata-qtests-switch-to-accel.patch create mode 100644 vbox_network-fix-possible-memory-leak-in-vboxNetwork.patch create mode 100644 virCgroupKillRecursive-Return-1-on-failure-condition.patch create mode 100644 virsh-cmdScreenshot-fix-cbdata-passing-to-virshStrea.patch create mode 100644 virsh-domain-fix-mistake-in-cmdMigrateSetMaxDowntime.patch create mode 100644 vsh-Fix-completion-error-in-case-of-multiple-mac-add.patch diff --git a/client-fix-memory-leak-in-client-msg.patch b/client-fix-memory-leak-in-client-msg.patch new file mode 100644 index 0000000..cda5438 --- /dev/null +++ b/client-fix-memory-leak-in-client-msg.patch @@ -0,0 +1,47 @@ +From ea9860d9f89252f0890dae01c6b92af2a82227f4 Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Tue, 29 Nov 2022 08:19:29 +0000 +Subject: [PATCH 02/24] client: fix memory leak in client msg When closing + client->waitDispatch in virNetClientIOEventLoopRemoveAll or + virNetClientIOEventLoopRemoveDone, VIR_FREE() is called to free call->msg + directly, resulting in leak of the memory call->msg->buffer points to. Use + virNetMessageFree(call->msg) instead of VIR_FREE(call->msg). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Hao Wang +Reviewed-by: Ján Tomko +Signed-off-by: Ján Tomko + +Signed-off-by: tangbin +(cherry-pick from 0011ec3191a5bffff14fc2c53fbdf457a805cfb1) +--- + src/rpc/virnetclient.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c +index 1c5bef86a1..70ace5d0e8 100644 +--- a/src/rpc/virnetclient.c ++++ b/src/rpc/virnetclient.c +@@ -1519,7 +1519,7 @@ static bool virNetClientIOEventLoopRemoveDone(virNetClientCallPtr call, + if (call->expectReply) + VIR_WARN("Got a call expecting a reply but without a waiting thread"); + virCondDestroy(&call->cond); +- VIR_FREE(call->msg); ++ virNetMessageFree(call->msg); + VIR_FREE(call); + } + +@@ -1546,7 +1546,7 @@ virNetClientIOEventLoopRemoveAll(virNetClientCallPtr call, + + VIR_DEBUG("Removing call %p", call); + virCondDestroy(&call->cond); +- VIR_FREE(call->msg); ++ virNetMessageFree(call->msg); + VIR_FREE(call); + return true; + } +-- +2.27.0 + diff --git a/conf-implement-support-for-vhostuser-disk.patch b/conf-implement-support-for-vhostuser-disk.patch new file mode 100644 index 0000000..a7c61fe --- /dev/null +++ b/conf-implement-support-for-vhostuser-disk.patch @@ -0,0 +1,617 @@ +From 02565aca5158fb4d9870546ea29be85278649511 Mon Sep 17 00:00:00 2001 +From: Luo Yifan +Date: Wed, 30 Nov 2022 18:13:36 +0800 +Subject: [PATCH 15/24] conf: implement support for vhostuser disk +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Pavel Hrdina +Reviewed-by: Ján Tomko +Reviewed-by: Peter Krempa +(cherry picked from commit f00fe96eb045eed2b6b40d5046449bec6d495875) +Signed-off-by: Luo Yifan +--- + src/conf/domain_conf.c | 254 ++++++++++++++++++ + src/libxl/xen_xl.c | 1 + + src/qemu/qemu_block.c | 6 + + src/qemu/qemu_command.c | 1 + + src/qemu/qemu_driver.c | 4 + + src/qemu/qemu_migration.c | 2 + + src/util/virstoragefile.c | 4 + + src/util/virstoragefile.h | 4 + + tests/qemuxml2argvdata/disk-vhostuser.xml | 30 +++ + .../disk-vhostuser.x86_64-latest.xml | 48 ++++ + tests/qemuxml2xmltest.c | 1 + + 11 files changed, 355 insertions(+) + create mode 100644 tests/qemuxml2argvdata/disk-vhostuser.xml + create mode 100644 tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml + +diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c +index b60b9d31a1..8b1ca76d39 100644 +--- a/src/conf/domain_conf.c ++++ b/src/conf/domain_conf.c +@@ -1278,6 +1278,17 @@ static virClassPtr virDomainXMLOptionClass; + static void virDomainObjDispose(void *obj); + static void virDomainXMLOptionDispose(void *obj); + ++static int ++virDomainChrSourceDefFormat(virBufferPtr buf, ++ virDomainChrSourceDefPtr def, ++ unsigned int flags); ++ ++ ++static int ++virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, ++ xmlNodePtr node, ++ xmlXPathContextPtr ctxt); ++ + static int virDomainObjOnceInit(void) + { + if (!VIR_CLASS_NEW(virDomainObj, virClassForObjectLockable())) +@@ -5200,6 +5211,12 @@ virDomainDiskDefPostParse(virDomainDiskDefPtr disk, + disk->src->nvme->managed = VIR_TRISTATE_BOOL_YES; + } + ++ /* vhost-user doesn't allow us to snapshot, disable snapshots by default */ ++ if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER && ++ disk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT) { ++ disk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NONE; ++ } ++ + if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + virDomainDiskDefAssignAddress(xmlopt, disk, def) < 0) { + return -1; +@@ -5995,6 +6012,174 @@ virDomainDiskAddressDiskBusCompatibility(virDomainDiskBus bus, + return true; + } + ++static int ++virDomainDiskVhostUserValidate(const virDomainDiskDef *disk) ++{ ++ if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("vhostuser disk supports only virtio bus")); ++ return -1; ++ } ++ ++ if (disk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("only snapshot=no is supported with vhostuser disk")); ++ return -1; ++ } ++ ++ /* Unsupported driver attributes */ ++ ++ if (disk->cachemode != VIR_DOMAIN_DISK_CACHE_DEFAULT) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("cache is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->error_policy || disk->rerror_policy) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("error_policy is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->iomode) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("io is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->ioeventfd != VIR_TRISTATE_SWITCH_ABSENT) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("ioeventfd is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->copy_on_read) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("copy_on_read is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->discard) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("discard is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->iothread) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("iothread is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->detect_zeroes) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("detect_zeroes is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ /* Unsupported driver elements */ ++ ++ if (disk->virtio) { ++ if (disk->virtio->iommu != VIR_TRISTATE_SWITCH_ABSENT) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("iommu is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->virtio->ats != VIR_TRISTATE_SWITCH_ABSENT) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("ats is not supported with vhostuser disk")); ++ return -1; ++ } ++ } ++ ++ /* Unsupported disk elements */ ++ ++ if (disk->blkdeviotune.group_name || ++ virDomainBlockIoTuneInfoHasAny(&disk->blkdeviotune)) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("iotune is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->src->backingStore) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("backingStore is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->src->encryption) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("encryption is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->src->readonly) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("readonly is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->src->shared) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("shareable is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->transient) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("transient is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->serial) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("serial is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->wwn) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("wwn is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->vendor) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("vendor is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->product) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("product is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->src->auth) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("auth is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->geometry.cylinders > 0 || ++ disk->geometry.heads > 0 || ++ disk->geometry.sectors > 0 || ++ disk->geometry.trans != VIR_DOMAIN_DISK_TRANS_DEFAULT) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("geometry is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ if (disk->blockio.logical_block_size > 0 || ++ disk->blockio.physical_block_size > 0) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("blockio is not supported with vhostuser disk")); ++ return -1; ++ } ++ ++ return 0; ++} + + static int + virSecurityDeviceLabelDefValidateXML(virSecurityDeviceLabelDefPtr *seclabels, +@@ -6095,6 +6280,11 @@ virDomainDiskDefValidate(const virDomainDef *def, + } + } + ++ if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER && ++ virDomainDiskVhostUserValidate(disk) < 0) { ++ return -1; ++ } ++ + for (next = disk->src; next; next = next->backingStore) { + if (virSecurityDeviceLabelDefValidateXML(next->seclabels, + next->nseclabels, +@@ -9530,6 +9720,47 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, + return 0; + } + ++static int ++virDomainDiskSourceVHostUserParse(xmlNodePtr node, ++ virStorageSourcePtr src, ++ virDomainXMLOptionPtr xmlopt, ++ xmlXPathContextPtr ctxt) ++{ ++ g_autofree char *type = virXMLPropString(node, "type"); ++ g_autofree char *path = virXMLPropString(node, "path"); ++ ++ if (!type) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("missing 'type' attribute for vhostuser disk source")); ++ return -1; ++ } ++ ++ if (STRNEQ(type, "unix")) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("invalid 'type' attribute for vhostuser disk source")); ++ return -1; ++ } ++ ++ if (!path) { ++ virReportError(VIR_ERR_XML_ERROR, "%s", ++ _("missing 'path' attribute for vhostuser disk source")); ++ return -1; ++ } ++ ++ if (!(src->vhostuser = virDomainChrSourceDefNew(xmlopt))) ++ return -1; ++ ++ src->vhostuser->type = virDomainChrTypeFromString(type); ++ src->vhostuser->data.nix.path = g_steal_pointer(&path); ++ ++ if (virDomainChrSourceReconnectDefParseXML(&src->vhostuser->data.nix.reconnect, ++ node, ++ ctxt) < 0) { ++ return -1; ++ } ++ ++ return 0; ++} + + static int + virDomainDiskSourceNVMeParse(xmlNodePtr node, +@@ -9746,6 +9977,10 @@ virDomainStorageSourceParse(xmlNodePtr node, + if (virDomainDiskSourceNVMeParse(node, ctxt, src) < 0) + return -1; + break; ++ case VIR_STORAGE_TYPE_VHOST_USER: ++ if (virDomainDiskSourceVHostUserParse(node, src, xmlopt, ctxt) < 0) ++ return -1; ++ break; + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, +@@ -24682,6 +24917,21 @@ virDomainDiskSourceNVMeFormat(virBufferPtr attrBuf, + virPCIDeviceAddressFormat(childBuf, nvme->pciAddr, false); + } + ++static void ++virDomainChrSourceReconnectDefFormat(virBufferPtr buf, ++ virDomainChrSourceReconnectDefPtr def); ++ ++ ++static void ++virDomainDiskSourceVhostuserFormat(virBufferPtr attrBuf, ++ virBufferPtr childBuf, ++ virDomainChrSourceDefPtr vhostuser) ++{ ++ virBufferAddLit(attrBuf, " type='unix'"); ++ virBufferAsprintf(attrBuf, " path='%s'", vhostuser->data.nix.path); ++ ++ virDomainChrSourceReconnectDefFormat(childBuf, &vhostuser->data.nix.reconnect); ++} + + static int + virDomainDiskSourceFormatPrivateData(virBufferPtr buf, +@@ -24796,6 +25046,10 @@ virDomainDiskSourceFormat(virBufferPtr buf, + virDomainDiskSourceNVMeFormat(&attrBuf, &childBuf, src->nvme); + break; + ++ case VIR_STORAGE_TYPE_VHOST_USER: ++ virDomainDiskSourceVhostuserFormat(&attrBuf, &childBuf, src->vhostuser); ++ break; ++ + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, +diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c +index 91b1825399..08eea48d6c 100644 +--- a/src/libxl/xen_xl.c ++++ b/src/libxl/xen_xl.c +@@ -1641,6 +1641,7 @@ xenFormatXLDiskSrc(virStorageSourcePtr src, char **srcstr) + + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + break; +diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c +index d32277d7fd..8bd6238238 100644 +--- a/src/qemu/qemu_block.c ++++ b/src/qemu/qemu_block.c +@@ -1108,6 +1108,11 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src, + return NULL; + break; + ++ case VIR_STORAGE_TYPE_VHOST_USER: ++ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", ++ _("unable to create blockdev props for vhostuser disk type")); ++ return NULL; ++ + case VIR_STORAGE_TYPE_VOLUME: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("storage source pool '%s' volume '%s' is not translated"), +@@ -2491,6 +2496,7 @@ qemuBlockStorageSourceCreateGetStorageProps(virStorageSourcePtr src, + case VIR_STORAGE_TYPE_DIR: + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + return 0; + + case VIR_STORAGE_TYPE_NONE: +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index 9157008b73..bc62843783 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -1166,6 +1166,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src, + + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + break; +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 854b56a563..b2ad021e4d 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -14536,6 +14536,7 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdi + case VIR_STORAGE_TYPE_DIR: + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, +@@ -14553,6 +14554,7 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdi + case VIR_STORAGE_TYPE_DIR: + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, +@@ -14621,6 +14623,7 @@ qemuDomainSnapshotPrepareDiskExternalActive(virDomainSnapshotDiskDefPtr snapdisk + case VIR_STORAGE_TYPE_DIR: + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, +@@ -14749,6 +14752,7 @@ qemuDomainSnapshotPrepareDiskInternal(virDomainDiskDefPtr disk, + case VIR_STORAGE_TYPE_DIR: + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 1c48138ce3..faf4e223a8 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -228,6 +228,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, + case VIR_STORAGE_TYPE_BLOCK: + case VIR_STORAGE_TYPE_DIR: + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, +@@ -1358,6 +1359,7 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def, + unsafe = true; + break; + ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_BLOCK: + case VIR_STORAGE_TYPE_DIR: +diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c +index ffc8bdb344..2515dbf5ed 100644 +--- a/src/util/virstoragefile.c ++++ b/src/util/virstoragefile.c +@@ -56,6 +56,7 @@ VIR_ENUM_IMPL(virStorage, + "network", + "volume", + "nvme", ++ "vhostuser", + ); + + VIR_ENUM_IMPL(virStorageFileFormat, +@@ -2617,6 +2618,7 @@ virStorageSourceIsLocalStorage(const virStorageSource *src) + /* While NVMe disks are local, they are not accessible via src->path. + * Therefore, we have to return false here. */ + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_LAST: + case VIR_STORAGE_TYPE_NONE: + return false; +@@ -4164,6 +4166,7 @@ virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src, + /* We shouldn't get VOLUME, but the switch requires all cases */ + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + return -1; +@@ -4610,6 +4613,7 @@ virStorageSourceIsRelative(virStorageSourcePtr src) + case VIR_STORAGE_TYPE_NETWORK: + case VIR_STORAGE_TYPE_VOLUME: + case VIR_STORAGE_TYPE_NVME: ++ case VIR_STORAGE_TYPE_VHOST_USER: + case VIR_STORAGE_TYPE_NONE: + case VIR_STORAGE_TYPE_LAST: + return false; +diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h +index 7939c09cd5..f2096b8705 100644 +--- a/src/util/virstoragefile.h ++++ b/src/util/virstoragefile.h +@@ -28,6 +28,7 @@ + #include "virseclabel.h" + #include "virstorageencryption.h" + #include "virsecret.h" ++#include "../conf/virconftypes.h" + #include "virenum.h" + #include "virpci.h" + +@@ -52,6 +53,7 @@ typedef enum { + VIR_STORAGE_TYPE_NETWORK, + VIR_STORAGE_TYPE_VOLUME, + VIR_STORAGE_TYPE_NVME, ++ VIR_STORAGE_TYPE_VHOST_USER, + + VIR_STORAGE_TYPE_LAST + } virStorageType; +@@ -302,6 +304,8 @@ struct _virStorageSource { + + virStorageSourceNVMeDefPtr nvme; /* type == VIR_STORAGE_TYPE_NVME */ + ++ virDomainChrSourceDefPtr vhostuser; /* type == VIR_STORAGE_TYPE_VHOST_USER */ ++ + virStorageSourceInitiatorDef initiator; + + virObjectPtr privateData; +diff --git a/tests/qemuxml2argvdata/disk-vhostuser.xml b/tests/qemuxml2argvdata/disk-vhostuser.xml +new file mode 100644 +index 0000000000..c96ef9119c +--- /dev/null ++++ b/tests/qemuxml2argvdata/disk-vhostuser.xml +@@ -0,0 +1,30 @@ ++ ++ QEMUGuest1 ++ c7a5fdbd-edaf-9455-926a-d65c16db1809 ++ 219136 ++ 219136 ++ ++ ++ ++ ++ 1 ++ ++ hvm ++ ++ ++ /usr/bin/qemu-system-x86_64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml +new file mode 100644 +index 0000000000..9712dc0b12 +--- /dev/null ++++ b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml +@@ -0,0 +1,48 @@ ++ ++ QEMUGuest1 ++ c7a5fdbd-edaf-9455-926a-d65c16db1809 ++ 219136 ++ 219136 ++ ++ ++ ++ ++ 1 ++ ++ hvm ++ ++ ++ qemu64 ++ ++ ++ destroy ++ restart ++ destroy ++ ++ /usr/bin/qemu-system-x86_64 ++ ++ ++ ++ ++ ++
++ ++ ++ ++ ++ ++ ++ ++
++ ++ ++
++ ++ ++ ++ ++ ++
++ ++ ++ +diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c +index 3a2539596b..2569c27261 100644 +--- a/tests/qemuxml2xmltest.c ++++ b/tests/qemuxml2xmltest.c +@@ -338,6 +338,7 @@ mymain(void) + DO_TEST("disk-network-vxhs", NONE); + DO_TEST("disk-network-tlsx509", NONE); + DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS); ++ DO_TEST_CAPS_LATEST("disk-vhostuser"); + DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS, + QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST("disk-virtio-scsi-reservations", +-- +2.27.0 + diff --git a/cpu_ppc64-compare-CPU-function-is-ignoring-return-va.patch b/cpu_ppc64-compare-CPU-function-is-ignoring-return-va.patch new file mode 100644 index 0000000..369d662 --- /dev/null +++ b/cpu_ppc64-compare-CPU-function-is-ignoring-return-va.patch @@ -0,0 +1,44 @@ +From 9549d796fd310e41ec58f1c438328d1bedc0cb93 Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Tue, 29 Nov 2022 12:12:58 +0000 +Subject: [PATCH 09/24] cpu_ppc64: compare CPU function is ignoring return + value Function to compare CPU on 64-bits PowerPC is ignoring the flag to + avoid failure in case of CPUs (host and guest) are incompatible. Basically, + the function is returning -1 even if it is set to continue. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Julio Faracco jcfaracco@gmail.com +Reviewed-by: Ján Tomko jtomko@redhat.com +Signed-off-by: Ján Tomko jtomko@redhat.com + +Signed-off-by: tangbin tangbin_yewu@cmss.chinamobile.com +(cherry-pick from b356d81b8960c3a43212f8c0e9eab66465c8c10a) +--- + src/cpu/cpu_ppc64.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c +index 6b3590ab6a..9cbb28cbc5 100644 +--- a/src/cpu/cpu_ppc64.c ++++ b/src/cpu/cpu_ppc64.c +@@ -561,11 +561,11 @@ virCPUppc64Compare(virCPUDefPtr host, + if (failIncompatible) { + virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", + _("unknown host CPU")); +- } else { +- VIR_WARN("unknown host CPU"); +- ret = VIR_CPU_COMPARE_INCOMPATIBLE; ++ return VIR_CPU_COMPARE_ERROR; + } +- return -1; ++ ++ VIR_WARN("unknown host CPU"); ++ return VIR_CPU_COMPARE_INCOMPATIBLE; + } + + ret = ppc64Compute(host, cpu, NULL, &message); +-- +2.27.0 + diff --git a/docs-introduces-new-vhostuser-disk-type.patch b/docs-introduces-new-vhostuser-disk-type.patch new file mode 100644 index 0000000..f083253 --- /dev/null +++ b/docs-introduces-new-vhostuser-disk-type.patch @@ -0,0 +1,149 @@ +From 0b8ff5672665c3792c27c02d9d05e0951c03d440 Mon Sep 17 00:00:00 2001 +From: Luo Yifan +Date: Wed, 30 Nov 2022 18:13:36 +0800 +Subject: [PATCH 14/24] docs: introduces new vhostuser disk type +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + + + + + + + + +Signed-off-by: Pavel Hrdina +Reviewed-by: Ján Tomko +Reviewed-by: Peter Krempa +(cherry picked from commit e88bdaf789b6f1cc5347b217240f15afd86a94c1) +Signed-off-by: Luo Yifan +--- + docs/formatdomain.html.in | 51 ++++++++++++++++++++++++++++++++++- + docs/schemas/domaincommon.rng | 19 +++++++++++++ + 2 files changed, 69 insertions(+), 1 deletion(-) + +diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in +index aaeb05961f..5860ec9f20 100644 +--- a/docs/formatdomain.html.in ++++ b/docs/formatdomain.html.in +@@ -2977,6 +2977,13 @@ + </source> + <target dev='vde' bus='virtio'/> + </disk> ++ <disk type='vhostuser' device='disk'> ++ <driver name='qemu' type='raw'/> ++ <source type='unix' path='/tmp/vhost-blk.sock'> ++ <reconnect enabled='yes' timeout='10'/> ++ </source> ++ <target dev='vdf' bus='virtio'/> ++ </disk> + </devices> + ... + +@@ -2991,7 +2998,8 @@ + "dir" (since 0.7.5), + "network" (since 0.8.7), or + "volume" (since 1.0.5), or +- "nvme" (since 6.0.0) ++ "nvme" (since 6.0.0), or ++ "vhostuser" (since 6.2.0) + and refer to the underlying source for the disk. + Since 0.0.3 + +@@ -3217,6 +3225,31 @@ + <disk type='block'> and therefore lower + latencies can be achieved. + ++
vhostuser
++
++ Enables the hypervisor to connect to another process using vhost-user ++ protocol. Requires shared memory configured for the VM, for more details ++ see access mode for ++ memoryBacking <#elementsMemoryBacking> element. ++ ++ The source element has following mandatory attributes: ++
++
type
++
The type of char device. Currently only unix type ++ is supported. ++
++ ++
path
++
Path to the unix socket to be used as disk source. ++
++
++ ++ Note that the vhost server replaces both the disk frontend and backend ++ thus almost all of the disk properties can't be configured via the ++ <disk> XML for this disk type. Additionally features ++ such as blockjobs, incremental backups and snapshots are not supported ++ for this disk type. ++
+ + With "file", "block", and "volume", one or more optional + sub-elements seclabel, described +@@ -3424,6 +3457,22 @@ + Note that '0' is considered as if the value is not provided. + Since 6.2.0 + ++
reconnect
++
++ For disk type vhostuser configures reconnect timeout ++ if the connection is lost. It has two mandatory attributes: ++
++
enabled
++
If the reconnect feature is enabled, acceptsyes ++ and no ++
++ ++
timeout
++
The amount of seconds after which hypervisor tries to reconnect. ++
++
++ Since 6.2.0 ++
+ + +

+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng +index 1807df521c..764f826df4 100644 +--- a/docs/schemas/domaincommon.rng ++++ b/docs/schemas/domaincommon.rng +@@ -1631,6 +1631,7 @@ + + + ++ + + + +@@ -2103,6 +2104,24 @@ + + + ++ ++ ++ vhostuser ++ ++ ++ ++ unix ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + (ioemu:)?(fd|hd|sd|vd|xvd|ubd)[a-zA-Z0-9_]+ +-- +2.27.0 + diff --git a/examples-hellolibvirt-fix-argc-check.patch b/examples-hellolibvirt-fix-argc-check.patch new file mode 100644 index 0000000..7b56c05 --- /dev/null +++ b/examples-hellolibvirt-fix-argc-check.patch @@ -0,0 +1,41 @@ +From 7a13a72308b5ad5887497e13995522ab151e6293 Mon Sep 17 00:00:00 2001 +From: wangmeiyang +Date: Wed, 30 Nov 2022 19:47:10 +0800 +Subject: [PATCH 20/24] examples: hellolibvirt: fix argc check +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://gitlab.com/libvirt/libvirt/-/issues/255 + +cherry-pick from dacf616b788a989ecaa1679845a07ff8010372cf + +Reported-by: Jeremy Alcim +Signed-off-by: Ján Tomko +Signed-off-by: Meiyang Wang +--- + examples/c/misc/hellolibvirt.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/examples/c/misc/hellolibvirt.c b/examples/c/misc/hellolibvirt.c +index a598e01be2..39cefe934c 100644 +--- a/examples/c/misc/hellolibvirt.c ++++ b/examples/c/misc/hellolibvirt.c +@@ -107,11 +107,12 @@ main(int argc, char *argv[]) + { + int ret = 0; + virConnectPtr conn; +- char *uri; ++ char *uri = NULL; + + printf("Attempting to connect to hypervisor\n"); + +- uri = (argc > 0 ? argv[1] : NULL); ++ if (argc > 1) ++ uri = argv[1]; + + /* virConnectOpenAuth is called here with all default parameters, + * except, possibly, the URI of the hypervisor. */ +-- +2.27.0 + diff --git a/hyperv-fix-the-number-of-threads-per-core.patch b/hyperv-fix-the-number-of-threads-per-core.patch new file mode 100644 index 0000000..3f717fe --- /dev/null +++ b/hyperv-fix-the-number-of-threads-per-core.patch @@ -0,0 +1,32 @@ +From ee9069defba076d94b432662af93a784ea002f5a Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Tue, 29 Nov 2022 08:57:42 +0000 +Subject: [PATCH 04/24] hyperv: fix the number of threads per core The operands + were reversed, producing an incorrect result. + +Co-authored-by: Sri Ramanujam +Signed-off-by: Matt Coleman +Reviewed-by: Michal Privoznik + +Signed-off-by: tangbin +(cherry-pick from 1e18d3b833b9daa7bb18b9550a2cf4d140303d86) +--- + src/hyperv/hyperv_driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c +index 4677a25ff8..213dd8837b 100644 +--- a/src/hyperv/hyperv_driver.c ++++ b/src/hyperv/hyperv_driver.c +@@ -310,7 +310,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) + } + + info->cores = processorList->data.common->NumberOfCores; +- info->threads = info->cores / processorList->data.common->NumberOfLogicalProcessors; ++ info->threads = processorList->data.common->NumberOfLogicalProcessors / info->cores; + info->cpus = info->sockets * info->cores; + + result = 0; +-- +2.27.0 + diff --git a/include-Introduce-virDomainDirtyRateCalcFlags.patch b/include-Introduce-virDomainDirtyRateCalcFlags.patch new file mode 100644 index 0000000..cc700c6 --- /dev/null +++ b/include-Introduce-virDomainDirtyRateCalcFlags.patch @@ -0,0 +1,77 @@ +From c4c665b4654280560eafe5782359b71e8ef2b1b5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= + +Date: Sun, 20 Feb 2022 21:28:11 +0800 +Subject: [PATCH 6/7] include: Introduce virDomainDirtyRateCalcFlags +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Introduce virDomainDirtyRateCalcFlags to get ready for +adding mode parameter to qemuDomainStartDirtyRateCalc. + +Signed-off-by: Hyman Huang(黄勇) +Signed-off-by: Michal Privoznik +Reviewed-by: Michal Privoznik +--- + include/libvirt/libvirt-domain.h | 13 +++++++++++++ + src/libvirt-domain.c | 12 +++++++++++- + 2 files changed, 24 insertions(+), 1 deletion(-) + +diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h +index e1954ae663..c7956c81d6 100644 +--- a/include/libvirt/libvirt-domain.h ++++ b/include/libvirt/libvirt-domain.h +@@ -5030,6 +5030,19 @@ typedef enum { + # endif + } virDomainDirtyRateStatus; + ++/** ++ * virDomainDirtyRateCalcFlags: ++ * ++ * Flags OR'ed together to provide specific behaviour when calculating dirty page ++ * rate for a Domain ++ * ++ */ ++typedef enum { ++ VIR_DOMAIN_DIRTYRATE_MODE_PAGE_SAMPLING = 0, /* default mode - page-sampling */ ++ VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_BITMAP = 1 << 0, /* dirty-bitmap mode */ ++ VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_RING = 1 << 1, /* dirty-ring mode */ ++} virDomainDirtyRateCalcFlags; ++ + int virDomainStartDirtyRateCalc(virDomainPtr domain, + int seconds, + unsigned int flags); +diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c +index 6a37ea85b7..0ff99c94b6 100644 +--- a/src/libvirt-domain.c ++++ b/src/libvirt-domain.c +@@ -12821,7 +12821,7 @@ virDomainHotpatchManage(virDomainPtr domain, + * virDomainStartDirtyRateCalc: + * @domain: a domain object + * @seconds: specified calculating time in seconds +- * @flags: extra flags; not used yet, so callers should always pass 0 ++ * @flags: bitwise-OR of supported virDomainDirtyRateCalcFlags + * + * Calculate the current domain's memory dirty rate in next @seconds. + * The calculated dirty rate information is available by calling +@@ -12845,6 +12845,16 @@ virDomainStartDirtyRateCalc(virDomainPtr domain, + + virCheckReadOnlyGoto(conn->flags, error); + ++ VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_DIRTYRATE_MODE_PAGE_SAMPLING, ++ VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_BITMAP, ++ error); ++ VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_DIRTYRATE_MODE_PAGE_SAMPLING, ++ VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_RING, ++ error); ++ VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_BITMAP, ++ VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_RING, ++ error); ++ + if (conn->driver->domainStartDirtyRateCalc) { + int ret; + ret = conn->driver->domainStartDirtyRateCalc(domain, seconds, flags); +-- +2.27.0 + diff --git a/libvirt-guests-Sync-time-for-autostarted-guests.patch b/libvirt-guests-Sync-time-for-autostarted-guests.patch new file mode 100644 index 0000000..16a14d4 --- /dev/null +++ b/libvirt-guests-Sync-time-for-autostarted-guests.patch @@ -0,0 +1,40 @@ +From bad0bdbee1225d4d5831bc7ea7d4113df4de743d Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Tue, 29 Nov 2022 10:01:51 +0000 +Subject: [PATCH 08/24] libvirt-guests: Sync time for autostarted guests + Setting SYNC_TIME=1 does not work on autostarted guests. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +See https://bugzilla.redhat.com/show_bug.cgi?id=1555398. + +Signed-off-by: Tim Wiederhake +Reviewed-by: Daniel P. Berrangé + +Signed-off-by: tangbin +(cherry-pick from a501fa7cae2b93807496295945e6d3b51e5ccb3f) +--- + tools/libvirt-guests.sh.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in +index a881f6266e..74286a12c4 100644 +--- a/tools/libvirt-guests.sh.in ++++ b/tools/libvirt-guests.sh.in +@@ -200,9 +200,9 @@ start() { + retval run_virsh "$uri" start $bypass "$name" \ + >/dev/null && \ + gettext "done"; echo +- if "$sync_time"; then +- run_virsh "$uri" domtime --sync "$name" >/dev/null +- fi ++ fi ++ if "$sync_time"; then ++ run_virsh "$uri" domtime --sync "$name" >/dev/null + fi + fi + done +-- +2.27.0 + diff --git a/libvirt.spec b/libvirt.spec index 9a3bc99..d2739b5 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -101,7 +101,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 46 +Release: 47 License: LGPLv2+ URL: https://libvirt.org/ @@ -391,6 +391,40 @@ Patch0278: bash-completion-fix-variable-leaks-of-word.patch Patch0279: util-Drop-pointless-NUL_TERMINATE-macro.patch Patch0280: virDomainCheckpointCreateXML-Don-t-use-HTML-in-funct.patch Patch0281: qemuMigrationSrcWaitForSpice-Remove-return-value.patch +Patch0282: virsh-cmdScreenshot-fix-cbdata-passing-to-virshStrea.patch +Patch0283: client-fix-memory-leak-in-client-msg.patch +Patch0284: tests-Fix-false-positive-in-testConfRoundTrip.patch +Patch0285: hyperv-fix-the-number-of-threads-per-core.patch +Patch0286: virCgroupKillRecursive-Return-1-on-failure-condition.patch +Patch0287: tests-Fix-lstat-mock-initialization-on-macOS.patch +Patch0288: storagepoolxml2argvtest-Reorder-gluster-arguments.patch +Patch0289: libvirt-guests-Sync-time-for-autostarted-guests.patch +Patch0290: cpu_ppc64-compare-CPU-function-is-ignoring-return-va.patch +Patch0291: security_util-Don-t-error-on-macOS-when-getting-sett.patch +Patch0292: vsh-Fix-completion-error-in-case-of-multiple-mac-add.patch +Patch0293: qemu-Do-not-require-TSC-frequency-to-strictly-match-.patch +Patch0294: qemu_alias-introduce-qemuDomainGetVhostUserAlias-hel.patch +Patch0295: docs-introduces-new-vhostuser-disk-type.patch +Patch0296: conf-implement-support-for-vhostuser-disk.patch +Patch0297: qemu_capabilities-introduce-vhost-user-blk-capabilit.patch +Patch0298: qemu-implement-vhost-user-blk-support.patch +Patch0299: qemu_command-remove-redundant-scsi-option-in-vhost-u.patch +Patch0300: lxc-fix-error-value-of-lxcNodeGetSecurityModel.patch +Patch0301: examples-hellolibvirt-fix-argc-check.patch +Patch0302: virsh-domain-fix-mistake-in-cmdMigrateSetMaxDowntime.patch +Patch0303: vbox_network-fix-possible-memory-leak-in-vboxNetwork.patch +Patch0304: lxc-Fix-syntax-error-in-lxcNodeGetSecurityModel.patch +Patch0305: qemu_command-Don-t-validate-accelerator-when-buildin.patch +Patch0306: qemu-Switch-to-accel.patch +Patch0307: tests-qemuxml2argvdata-qtests-switch-to-accel.patch +Patch0308: tests-Fix-vhostuser-args-file.patch +Patch0309: qemu_capabilities-Fix-incorrect-alignment.patch +Patch0310: qemu_driver-Acquire-MODIFY-job-in-qemuDomainStartDir.patch +Patch0311: qemu_capabilities-Introduce-QEMU_CAPS_CALC_DIRTY_RAT.patch +Patch0312: qemu_driver-Probe-capability-before-calculating-dirt.patch +Patch0313: qemu_capabilities-Introduce-QEMU_CAPS_DIRTYRATE_MODE.patch +Patch0314: include-Introduce-virDomainDirtyRateCalcFlags.patch +Patch0315: qemu_driver-Add-mode-parameter-to-qemuDomainStartDir.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -2125,6 +2159,11 @@ exit 0 %changelog +* Tue Dec 06 2022 yezengruan - 6.2.0-47 +- sync some bugfix patches from upstream +- support vhostuser disk +- libvirt: support dirtyrate (calc-dirty-rate, dirtyrate-param.mode) + * Fri Nov 25 2022 yezengruan - 6.2.0-46 - sync some bugfix patches from upstream diff --git a/lxc-Fix-syntax-error-in-lxcNodeGetSecurityModel.patch b/lxc-Fix-syntax-error-in-lxcNodeGetSecurityModel.patch new file mode 100644 index 0000000..f2d6009 --- /dev/null +++ b/lxc-Fix-syntax-error-in-lxcNodeGetSecurityModel.patch @@ -0,0 +1,38 @@ +From 275e5fe562d1645683c59f777b453cc24d4c8bec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= + +Date: Mon, 5 Dec 2022 08:07:40 -0500 +Subject: [PATCH 24/24] lxc: Fix syntax error in lxcNodeGetSecurityModel +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix syntax error, which is introduced by the following commit +be72edbfc14440cceb63fa2d38811e5cbd962ad8 + +Signed-off-by: Hyman Huang(黄勇) +--- + src/lxc/lxc_driver.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c +index aa4cddc275..120d41f2b6 100644 +--- a/src/lxc/lxc_driver.c ++++ b/src/lxc/lxc_driver.c +@@ -1241,11 +1241,11 @@ static int lxcNodeGetSecurityModel(virConnectPtr conn, + memset(secmodel, 0, sizeof(*secmodel)); + + if (virNodeGetSecurityModelEnsureACL(conn) < 0) { +- ret = -1; ++ ret = -1; + } + + if (!(caps = virLXCDriverGetCapabilities(driver, false))) { +- return = -1; ++ ret = -1; + } + + /* we treat no driver as success, but simply return no data in *secmodel */ +-- +2.27.0 + diff --git a/lxc-fix-error-value-of-lxcNodeGetSecurityModel.patch b/lxc-fix-error-value-of-lxcNodeGetSecurityModel.patch new file mode 100644 index 0000000..e4362ad --- /dev/null +++ b/lxc-fix-error-value-of-lxcNodeGetSecurityModel.patch @@ -0,0 +1,47 @@ +From be72edbfc14440cceb63fa2d38811e5cbd962ad8 Mon Sep 17 00:00:00 2001 +From: wangmeiyang +Date: Wed, 30 Nov 2022 20:06:45 +0800 +Subject: [PATCH 19/24] lxc: fix error value of lxcNodeGetSecurityModel +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When adding the ACL check and caps getter, we assumed that +the default return value is -1, not 0 as usual. + +Fix the return value on error by assigning them explicitly. + +cherry-pick from efe98ca98bb0febe6a8274175b7c5493c0d6c9f3 + +Signed-off-by: Ján Tomko +Signed-off-by: Meiyang Wang +Reviewed-by: Michal Privoznik +--- + src/lxc/lxc_driver.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c +index 71c7068bbf..aa4cddc275 100644 +--- a/src/lxc/lxc_driver.c ++++ b/src/lxc/lxc_driver.c +@@ -1240,11 +1240,13 @@ static int lxcNodeGetSecurityModel(virConnectPtr conn, + + memset(secmodel, 0, sizeof(*secmodel)); + +- if (virNodeGetSecurityModelEnsureACL(conn) < 0) +- goto cleanup; ++ if (virNodeGetSecurityModelEnsureACL(conn) < 0) { ++ ret = -1; ++ } + +- if (!(caps = virLXCDriverGetCapabilities(driver, false))) +- goto cleanup; ++ if (!(caps = virLXCDriverGetCapabilities(driver, false))) { ++ return = -1; ++ } + + /* we treat no driver as success, but simply return no data in *secmodel */ + if (caps->host.nsecModels == 0 +-- +2.27.0 + diff --git a/qemu-Do-not-require-TSC-frequency-to-strictly-match-.patch b/qemu-Do-not-require-TSC-frequency-to-strictly-match-.patch new file mode 100644 index 0000000..b971dab --- /dev/null +++ b/qemu-Do-not-require-TSC-frequency-to-strictly-match-.patch @@ -0,0 +1,95 @@ +From e24914dcbeb169f2608fd03cf6e701697844e065 Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Wed, 30 Nov 2022 09:38:41 +0000 +Subject: [PATCH 12/24] qemu: Do not require TSC frequency to strictly match + host Some CPUs provide a way to read exact TSC frequency, while measuring it + is required on other CPUs. However, measuring is never exact and the result + may slightly differ across reboots. For this reason both Linux kernel and + QEMU recently started allowing for guests TSC frequency to fall into +/- 250 + ppm tolerance interval around the host TSC frequency. + +Let's do the same to avoid unnecessary failures (esp. during migration) +in case the host frequency does not exactly match the frequency +configured in a domain XML. + +https://bugzilla.redhat.com/show_bug.cgi?id=1839095 + +Signed-off-by: Jiri Denemark +Reviewed-by: Daniel Henrique Barboza + +Signed-off-by: tangbin +(cherry-pick from d8e5b4560006590668d4669f54a46b08ec14c1a2) +--- + src/qemu/qemu_process.c | 35 ++++++++++++++++++++++++++--------- + 1 file changed, 26 insertions(+), 9 deletions(-) + +diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c +index 360c4fcbb1..9cbf34a046 100644 +--- a/src/qemu/qemu_process.c ++++ b/src/qemu/qemu_process.c +@@ -5271,12 +5271,18 @@ qemuProcessStartValidateDisks(virDomainObjPtr vm, + } + + ++/* 250 parts per million (ppm) is a half of NTP threshold */ ++#define TSC_TOLERANCE 250 ++ + static int + qemuProcessStartValidateTSC(virQEMUDriverPtr driver, + virDomainObjPtr vm) + { + size_t i; + unsigned long long freq = 0; ++ unsigned long long tolerance; ++ unsigned long long minFreq; ++ unsigned long long maxFreq; + virHostCPUTscInfoPtr tsc; + g_autoptr(virCPUDef) cpu = NULL; + +@@ -5302,23 +5308,34 @@ qemuProcessStartValidateTSC(virQEMUDriverPtr driver, + } + + tsc = cpu->tsc; +- VIR_DEBUG("Host TSC frequency %llu Hz, scaling %s", +- tsc->frequency, virTristateBoolTypeToString(tsc->scaling)); ++ tolerance = tsc->frequency * TSC_TOLERANCE / 1000000; ++ minFreq = tsc->frequency - tolerance; ++ maxFreq = tsc->frequency + tolerance; ++ ++ VIR_DEBUG("Host TSC frequency %llu Hz, scaling %s, tolerance +/- %llu Hz", ++ tsc->frequency, virTristateBoolTypeToString(tsc->scaling), ++ tolerance); ++ ++ if (freq > minFreq && freq < maxFreq) { ++ VIR_DEBUG("Requested TSC frequency is within tolerance interval"); ++ return 0; ++ } + +- if (freq == tsc->frequency || tsc->scaling == VIR_TRISTATE_BOOL_YES) ++ if (tsc->scaling == VIR_TRISTATE_BOOL_YES) + return 0; + + if (tsc->scaling == VIR_TRISTATE_BOOL_ABSENT) { +- VIR_DEBUG("TSC frequencies do not match and scaling support is " +- "unknown, QEMU will try and possibly fail later"); ++ VIR_DEBUG("Requested TSC frequency falls outside tolerance range and " ++ "scaling support is unknown, QEMU will try and possibly " ++ "fail later"); + return 0; + } + + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, +- _("Requested TSC frequency %llu Hz does not match " +- "host (%llu Hz) and TSC scaling is not supported " +- "by the host CPU"), +- freq, tsc->frequency); ++ _("Requested TSC frequency %llu Hz is outside tolerance " ++ "range ([%llu, %llu] Hz) around host frequency %llu Hz " ++ "and TSC scaling is not supported by the host CPU"), ++ freq, minFreq, maxFreq, tsc->frequency); + return -1; + } + +-- +2.27.0 + diff --git a/qemu-Switch-to-accel.patch b/qemu-Switch-to-accel.patch new file mode 100644 index 0000000..1e717ec --- /dev/null +++ b/qemu-Switch-to-accel.patch @@ -0,0 +1,11728 @@ +From 7fb831be7d2e9d5bd0cf362920ca0d6727390c6a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= + +Date: Sat, 22 Oct 2022 23:40:15 +0800 +Subject: [PATCH 2/2] qemu: Switch to -accel +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We currently use -machine accel=XXX which is just a syntax sugar +for -accel XXX. The former doesn't allow specifying arguments for +accelerator, because all arguments passed to -machine are +treated as arguments of machine itself. + +The -accel argument was introduced in QEMU commit +v2.9.0-rc0~70^2~19 and since our minimum required version is +newer (2.11.0) we can safely assume its existence and use it +without any capability. + +cherry-pick from d20ebdda28fe254727989102bd5522aafe42cc25 + +Resolves: https://gitlab.com/libvirt/libvirt/-/issues/233 +Signed-off-by: Michal Privoznik +Signed-off-by: Hyman Huang(黄勇) +Tested-by: Kashyap Chamarthy +Reviewed-by: Peter Krempa +--- + src/qemu/qemu_command.c | 72 +++++++++++-------- + .../aarch64-aavmf-virtio-mmio.args | 3 +- + tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 3 +- + .../aarch64-cpu-passthrough.args | 3 +- + ...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 +- + tests/qemuxml2argvdata/aarch64-gic-host.args | 3 +- + .../aarch64-gic-none-tcg.args | 3 +- + tests/qemuxml2argvdata/aarch64-gic-v2.args | 3 +- + tests/qemuxml2argvdata/aarch64-gic-v3.args | 3 +- + .../aarch64-kvm-32-on-64.args | 3 +- + .../aarch64-noacpi-nouefi.args | 3 +- + .../qemuxml2argvdata/aarch64-noacpi-uefi.args | 3 +- + ...arch64-os-firmware-efi.aarch64-latest.args | 3 +- + .../qemuxml2argvdata/aarch64-pci-serial.args | 3 +- + .../aarch64-tpm.aarch64-latest.args | 3 +- + .../aarch64-traditional-pci.args | 3 +- + .../aarch64-usb-controller-nec-xhci.args | 3 +- + .../aarch64-usb-controller-qemu-xhci.args | 3 +- + .../aarch64-video-default.args | 3 +- + .../aarch64-video-virtio-gpu-pci.args | 3 +- + .../aarch64-virt-2.6-virtio-pci-default.args | 3 +- + .../aarch64-virt-default-nic.args | 3 +- + .../aarch64-virt-graphics.aarch64-latest.args | 3 +- + .../aarch64-virt-headless.aarch64-latest.args | 3 +- + .../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 +- + .../arm-vexpressa9-basic.args | 3 +- + .../arm-vexpressa9-nodevs.args | 3 +- + .../arm-vexpressa9-virtio.args | 3 +- + tests/qemuxml2argvdata/arm-virt-virtio.args | 3 +- + tests/qemuxml2argvdata/autoindex.args | 3 +- + .../qemuxml2argvdata/balloon-ccw-deflate.args | 3 +- + .../qemuxml2argvdata/balloon-device-auto.args | 3 +- + .../balloon-device-deflate-off.args | 3 +- + .../balloon-device-deflate.args | 3 +- + .../balloon-device-period.args | 3 +- + tests/qemuxml2argvdata/balloon-device.args | 3 +- + .../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.args | 3 +- + .../blkdeviotune-max-length.args | 3 +- + tests/qemuxml2argvdata/blkdeviotune-max.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 +- + .../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 +- + .../qemuxml2argvdata/channel-virtio-auto.args | 3 +- + .../channel-virtio-autoadd.args | 3 +- + .../channel-virtio-autoassign.args | 3 +- + .../channel-virtio-default.args | 3 +- + .../channel-virtio-state.args | 3 +- + .../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 +- + .../clock-timer-hyperv-rtc.args | 3 +- + tests/qemuxml2argvdata/clock-utc.args | 3 +- + tests/qemuxml2argvdata/clock-variable.args | 3 +- + .../qemuxml2argvdata/console-compat-auto.args | 3 +- + .../console-compat-chardev.args | 3 +- + tests/qemuxml2argvdata/console-compat.args | 3 +- + tests/qemuxml2argvdata/console-sclp.args | 3 +- + .../qemuxml2argvdata/console-virtio-ccw.args | 3 +- + .../qemuxml2argvdata/console-virtio-many.args | 3 +- + .../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 +- + ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 3 +- + ...-Icelake-Server-pconfig.x86_64-latest.args | 3 +- + tests/qemuxml2argvdata/cpu-cache-disable.args | 3 +- + .../qemuxml2argvdata/cpu-cache-disable2.args | 3 +- + .../qemuxml2argvdata/cpu-cache-disable3.args | 3 +- + .../cpu-cache-emulate-l3.args | 3 +- + .../cpu-cache-passthrough.args | 3 +- + .../cpu-cache-passthrough2.args | 3 +- + .../cpu-check-default-none.args | 3 +- + .../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 +- + .../cpu-exact2-nofallback.args | 3 +- + tests/qemuxml2argvdata/cpu-exact2.args | 3 +- + tests/qemuxml2argvdata/cpu-fallback.args | 3 +- + tests/qemuxml2argvdata/cpu-host-kvmclock.args | 3 +- + .../qemuxml2argvdata/cpu-host-model-cmt.args | 3 +- + .../cpu-host-model-cmt.x86_64-4.0.0.args | 3 +- + .../cpu-host-model-fallback.args | 3 +- + .../cpu-host-model-vendor.args | 3 +- + tests/qemuxml2argvdata/cpu-host-model.args | 3 +- + .../cpu-host-passthrough-features.args | 3 +- + .../cpu-host-passthrough.args | 3 +- + .../qemuxml2argvdata/cpu-hotplug-startup.args | 3 +- + tests/qemuxml2argvdata/cpu-kvmclock.args | 3 +- + tests/qemuxml2argvdata/cpu-minimum1.args | 3 +- + tests/qemuxml2argvdata/cpu-minimum2.args | 3 +- + .../cpu-no-removed-features.args | 3 +- + tests/qemuxml2argvdata/cpu-numa-disjoint.args | 3 +- + .../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 +- + tests/qemuxml2argvdata/cputune-numatune.args | 3 +- + .../qemuxml2argvdata/cputune-zero-shares.args | 3 +- + tests/qemuxml2argvdata/cputune.args | 3 +- + tests/qemuxml2argvdata/debug-threads.args | 3 +- + .../default-kvm-host-arch.args | 3 +- + .../default-qemu-host-arch.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 +- + tests/qemuxml2argvdata/disk-aio.args | 3 +- + .../disk-aio.x86_64-2.12.0.args | 3 +- + .../disk-aio.x86_64-latest.args | 3 +- + ...-backing-chains-noindex.x86_64-2.12.0.args | 3 +- + ...-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 +- + .../disk-cache.x86_64-1.5.3.args | 3 +- + .../disk-cache.x86_64-2.12.0.args | 3 +- + .../disk-cache.x86_64-2.6.0.args | 3 +- + .../disk-cache.x86_64-2.7.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 +- + .../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 +- + .../disk-cdrom.x86_64-2.12.0.args | 3 +- + .../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 +- + .../qemuxml2argvdata/disk-detect-zeroes.args | 3 +- + .../disk-detect-zeroes.x86_64-2.12.0.args | 3 +- + .../disk-detect-zeroes.x86_64-latest.args | 3 +- + tests/qemuxml2argvdata/disk-discard.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 +- + ...sk-hostdev-scsi-virtio-iscsi-auth-AES.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-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 +- + .../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-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 +- + .../disk-network-sheepdog.args | 3 +- + .../disk-network-sheepdog.x86_64-2.12.0.args | 3 +- + .../disk-network-sheepdog.x86_64-latest.args | 3 +- + .../disk-network-source-auth.args | 3 +- + ...isk-network-source-auth.x86_64-2.12.0.args | 3 +- + ...isk-network-source-auth.x86_64-latest.args | 3 +- + .../disk-network-tlsx509.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 +- + .../disk-nvme.x86_64-latest.args | 3 +- + tests/qemuxml2argvdata/disk-order.args | 3 +- + .../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 +- + .../disk-scsi-disk-split.args | 3 +- + .../qemuxml2argvdata/disk-scsi-disk-vpd.args | 3 +- + .../qemuxml2argvdata/disk-scsi-disk-wwn.args | 3 +- + .../disk-scsi-lun-passthrough.args | 3 +- + .../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 +- + .../disk-source-pool-mode.args | 3 +- + tests/qemuxml2argvdata/disk-source-pool.args | 3 +- + .../disk-usb-device-removable.args | 3 +- + tests/qemuxml2argvdata/disk-usb-device.args | 3 +- + .../disk-virtio-ccw-many.args | 3 +- + tests/qemuxml2argvdata/disk-virtio-ccw.args | 3 +- + .../qemuxml2argvdata/disk-virtio-queues.args | 3 +- + .../disk-virtio-s390-zpci.args | 3 +- + tests/qemuxml2argvdata/disk-virtio-s390.args | 3 +- + ...irtio-scsi-reservations.x86_64-2.12.0.args | 3 +- + ...irtio-scsi-reservations.x86_64-latest.args | 3 +- + tests/qemuxml2argvdata/disk-virtio.args | 3 +- + .../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 +- + .../eoi-enabled.x86_64-2.7.0.args | 3 +- + .../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 +- + .../fd-memory-numa-topology.args | 3 +- + .../fd-memory-numa-topology2.args | 3 +- + .../fd-memory-numa-topology3.args | 3 +- + tests/qemuxml2argvdata/fips-enabled.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 +- + .../fs9p-ccw.s390x-latest.args | 3 +- + tests/qemuxml2argvdata/fs9p.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.args | 3 +- + .../graphics-egl-headless.x86_64-latest.args | 3 +- + .../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 +- + ...pice-gl-auto-rendernode.x86_64-latest.args | 3 +- + .../graphics-spice-no-args.args | 3 +- + .../graphics-spice-qxl-vga.args | 3 +- + .../qemuxml2argvdata/graphics-spice-sasl.args | 3 +- + .../graphics-spice-socket.args | 3 +- + .../graphics-spice-timeout.args | 3 +- + .../graphics-spice-usb-redir.args | 3 +- + tests/qemuxml2argvdata/graphics-spice.args | 3 +- + .../graphics-vnc-auto-socket-cfg.args | 3 +- + .../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 +- + .../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 +- + .../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 +- + .../graphics-vnc-websocket.args | 3 +- + tests/qemuxml2argvdata/graphics-vnc.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-mdev-precreated.args | 3 +- + .../hostdev-pci-address-device.args | 3 +- + .../hostdev-pci-address-unassigned.args | 3 +- + .../qemuxml2argvdata/hostdev-pci-address.args | 3 +- + .../hostdev-pci-multifunction.args | 3 +- + .../hostdev-scsi-lsi-iscsi-auth.args | 3 +- + .../hostdev-scsi-lsi-iscsi.args | 3 +- + tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 3 +- + .../hostdev-scsi-readonly.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-iscsi-auth.args | 3 +- + .../hostdev-scsi-virtio-iscsi.args | 3 +- + .../hostdev-scsi-virtio-scsi.args | 3 +- + ...tdev-subsys-mdev-vfio-ap.s390x-latest.args | 3 +- + ...ubsys-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 +- + .../qemuxml2argvdata/hostdev-usb-address.args | 3 +- + .../hostdev-vfio-multidomain.args | 3 +- + .../hostdev-vfio-zpci-autogenerate.args | 3 +- + .../hostdev-vfio-zpci-boundaries.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 +- + .../hugepages-default-2M.args | 3 +- + .../hugepages-default-system-size.args | 3 +- + tests/qemuxml2argvdata/hugepages-default.args | 3 +- + .../qemuxml2argvdata/hugepages-memaccess.args | 3 +- + .../hugepages-memaccess2.args | 3 +- + tests/qemuxml2argvdata/hugepages-nodeset.args | 3 +- + .../hugepages-numa-default-2M.args | 3 +- + .../hugepages-numa-default-dimm.args | 3 +- + .../hugepages-numa-default.args | 3 +- + .../hugepages-numa-nodeset-part.args | 3 +- + .../hugepages-numa-nodeset.args | 3 +- + .../hugepages-nvdimm.x86_64-latest.args | 3 +- + tests/qemuxml2argvdata/hugepages-shared.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 +- + .../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 +- + ...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-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 +- + .../iothreads-ids-partial.args | 3 +- + tests/qemuxml2argvdata/iothreads-ids.args | 3 +- + ...othreads-virtio-scsi-ccw.s390x-latest.args | 3 +- + ...threads-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 +- + .../launch-security-sev.x86_64-2.12.0.args | 3 +- + .../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 +- + .../mach-virt-console-virtio.args | 3 +- + .../mach-virt-serial-native.args | 3 +- + .../mach-virt-serial-pci.args | 3 +- + .../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 +- + .../machine-keywrap-none.args | 3 +- + ...ine-loadparm-multiple-disks-nets-s390.args | 3 +- + .../machine-loadparm-net-s390.args | 3 +- + .../machine-loadparm-s390.args | 3 +- + tests/qemuxml2argvdata/machine-smm-opt.args | 3 +- + .../qemuxml2argvdata/machine-vmport-opt.args | 3 +- + tests/qemuxml2argvdata/master-key.args | 3 +- + ...memory-default-hugepage.x86_64-latest.args | 3 +- + .../memfd-memory-numa.x86_64-latest.args | 3 +- + .../memory-hotplug-dimm-addr.args | 3 +- + .../qemuxml2argvdata/memory-hotplug-dimm.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 +- + .../memory-hotplug-nvdimm-ppc64.args | 3 +- + ...ory-hotplug-nvdimm-ppc64.ppc64-latest.args | 3 +- + ...hotplug-nvdimm-readonly.x86_64-latest.args | 3 +- + .../memory-hotplug-nvdimm.x86_64-latest.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 +- + .../migrate-numa-unaligned.args | 3 +- + tests/qemuxml2argvdata/migrate.args | 3 +- + .../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 +- + .../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 +- + .../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 +- + tests/qemuxml2argvdata/monitor-json.args | 3 +- + .../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 +- + .../net-eth-unmanaged-tap.args | 3 +- + tests/qemuxml2argvdata/net-eth.args | 3 +- + .../net-hostdev-bootorder.args | 3 +- + .../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 +- + .../net-user.x86_64-4.0.0.args | 3 +- + .../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 +- + .../net-virtio-rxtxqueuesize.args | 3 +- + tests/qemuxml2argvdata/net-virtio-s390.args | 3 +- + .../qemuxml2argvdata/net-virtio-teaming.args | 3 +- + tests/qemuxml2argvdata/net-virtio.args | 3 +- + tests/qemuxml2argvdata/nosharepages.args | 3 +- + .../numad-auto-memory-vcpu-cpuset.args | 3 +- + ...o-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 +- + .../numatune-auto-prefer.args | 3 +- + .../qemuxml2argvdata/numatune-distances.args | 3 +- + .../numatune-memnode-no-memory.args | 3 +- + tests/qemuxml2argvdata/numatune-memnode.args | 3 +- + tests/qemuxml2argvdata/numatune-memory.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 +- + .../qemuxml2argvdata/pages-dimm-discard.args | 3 +- + .../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 +- + .../parallel-parport-chardev.args | 3 +- + .../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 +- + .../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 +- + .../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 +- + 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 +- + ...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-usb-controller-legacy.args | 3 +- + .../ppc64-usb-controller-qemu-xhci.args | 3 +- + .../ppc64-usb-controller.args | 3 +- + tests/qemuxml2argvdata/ppce500-serial.args | 3 +- + tests/qemuxml2argvdata/pseries-basic.args | 3 +- + .../pseries-console-virtio.args | 3 +- + .../pseries-cpu-compat-power9.args | 3 +- + .../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 +- + .../qemuxml2argvdata/pseries-hostdevs-1.args | 3 +- + .../qemuxml2argvdata/pseries-hostdevs-2.args | 3 +- + .../qemuxml2argvdata/pseries-hostdevs-3.args | 3 +- + .../pseries-machine-max-cpu-compat.args | 3 +- + .../pseries-many-buses-1.args | 3 +- + .../pseries-many-buses-2.args | 3 +- + .../pseries-many-devices.args | 3 +- + tests/qemuxml2argvdata/pseries-nvram.args | 3 +- + .../pseries-panic-missing.args | 3 +- + .../pseries-panic-no-address.args | 3 +- + .../pseries-phb-default-missing.args | 3 +- + .../pseries-phb-numa-node.args | 3 +- + .../qemuxml2argvdata/pseries-phb-simple.args | 3 +- + .../pseries-serial-native.args | 3 +- + .../qemuxml2argvdata/pseries-serial-pci.args | 3 +- + .../qemuxml2argvdata/pseries-serial-usb.args | 3 +- + .../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 +- + .../q35-default-devices-only.args | 3 +- + tests/qemuxml2argvdata/q35-multifunction.args | 3 +- + tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 3 +- + .../q35-pci-force-address.args | 3 +- + tests/qemuxml2argvdata/q35-pcie-autoadd.args | 3 +- + tests/qemuxml2argvdata/q35-pcie.args | 3 +- + .../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 +- + .../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 +- + .../qemu-ns-commandline-ns0.args | 3 +- + .../qemu-ns-commandline-ns1.args | 3 +- + .../qemuxml2argvdata/qemu-ns-commandline.args | 3 +- + .../qemu-ns-domain-commandline-ns0.args | 3 +- + .../qemu-ns-domain-commandline.args | 3 +- + .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 3 +- + tests/qemuxml2argvdata/qemu-ns-no-env.args | 3 +- + .../qemu-ns.x86_64-4.0.0.args | 3 +- + .../qemu-ns.x86_64-latest.args | 3 +- + .../reboot-timeout-disabled.args | 3 +- + .../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 +- + ...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 +- + .../qemuxml2argvdata/s390-panic-missing.args | 3 +- + .../s390-panic-no-address.args | 3 +- + tests/qemuxml2argvdata/s390-serial-2.args | 3 +- + .../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 +- + .../seclabel-dynamic-relabel.args | 3 +- + tests/qemuxml2argvdata/seclabel-dynamic.args | 3 +- + tests/qemuxml2argvdata/seclabel-none.args | 3 +- + .../seclabel-static-labelskip.args | 3 +- + .../seclabel-static-relabel.args | 3 +- + tests/qemuxml2argvdata/seclabel-static.args | 3 +- + .../serial-dev-chardev-iobase.args | 3 +- + .../qemuxml2argvdata/serial-dev-chardev.args | 3 +- + .../qemuxml2argvdata/serial-file-chardev.args | 3 +- + tests/qemuxml2argvdata/serial-file-log.args | 3 +- + .../qemuxml2argvdata/serial-many-chardev.args | 3 +- + .../qemuxml2argvdata/serial-pty-chardev.args | 3 +- + .../serial-spiceport-nospice.args | 3 +- + tests/qemuxml2argvdata/serial-spiceport.args | 3 +- + .../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 +- + .../qemuxml2argvdata/serial-udp-chardev.args | 3 +- + .../qemuxml2argvdata/serial-unix-chardev.args | 3 +- + .../serial-unix-chardev.x86_64-latest.args | 3 +- + tests/qemuxml2argvdata/serial-vc-chardev.args | 3 +- + .../shmem-plain-doorbell.args | 3 +- + tests/qemuxml2argvdata/shmem.args | 3 +- + .../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 +- + ...artcard-passthrough-unix.x86_64-2.5.0.args | 3 +- + ...rtcard-passthrough-unix.x86_64-latest.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 +- + .../tpm-emulator-spapr.ppc64-latest.args | 3 +- + .../tpm-emulator-tpm2-enc.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 +- + .../usb-controller-qemu-xhci.args | 3 +- + .../qemuxml2argvdata/usb-controller-xhci.args | 3 +- + tests/qemuxml2argvdata/usb-controller.args | 3 +- + .../usb-hub-autoadd-deluxe.args | 3 +- + tests/qemuxml2argvdata/usb-hub-autoadd.args | 3 +- + tests/qemuxml2argvdata/usb-hub.args | 3 +- + .../qemuxml2argvdata/usb-ich9-autoassign.args | 3 +- + .../qemuxml2argvdata/usb-ich9-companion.args | 3 +- + .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 3 +- + .../qemuxml2argvdata/usb-long-port-path.args | 3 +- + tests/qemuxml2argvdata/usb-none.args | 3 +- + .../usb-piix3-controller.args | 3 +- + .../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 +- + .../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 +- + .../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 +- + .../vcpu-placement-static.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-device-pciaddr-default.args | 3 +- + tests/qemuxml2argvdata/video-none-device.args | 3 +- + .../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 +- + .../qemuxml2argvdata/video-qxl-nodevice.args | 3 +- + tests/qemuxml2argvdata/video-qxl-noheads.args | 3 +- + .../video-qxl-resolution.args | 3 +- + .../video-qxl-sec-device-vgamem.args | 3 +- + ...o-qxl-sec-device-vram64.x86_64-latest.args | 3 +- + .../video-qxl-sec-device.args | 3 +- + ...eo-ramfb-display-device.x86_64-latest.args | 3 +- + .../video-vga-device-vgamem.args | 3 +- + tests/qemuxml2argvdata/video-vga-device.args | 3 +- + .../qemuxml2argvdata/video-vga-nodevice.args | 3 +- + .../qemuxml2argvdata/video-vga-qxl-heads.args | 3 +- + .../video-virtio-gpu-ccw.args | 3 +- + .../video-virtio-gpu-device.args | 3 +- + .../video-virtio-gpu-sdl-gl.args | 3 +- + .../video-virtio-gpu-secondary.args | 3 +- + .../video-virtio-gpu-spice-gl.args | 3 +- + .../video-virtio-gpu-virgl.args | 3 +- + tests/qemuxml2argvdata/video-virtio-vga.args | 3 +- + .../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 +- + tests/qemuxml2argvdata/virtio-options.args | 3 +- + .../virtio-rng-builtin.x86_64-latest.args | 3 +- + tests/qemuxml2argvdata/virtio-rng-ccw.args | 3 +- + .../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 +- + .../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 +- + .../qemuxml2argvdata/watchdog-injectnmi.args | 3 +- + tests/qemuxml2argvdata/watchdog.args | 3 +- + tests/qemuxml2argvdata/x86-kvm-32-on-64.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 +- + 773 files changed, 1587 insertions(+), 801 deletions(-) + +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index b009890e35..481d29b14e 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -190,7 +190,7 @@ VIR_ENUM_IMPL(qemuNumaPolicy, + "interleave", + ); + +- ++ + static int + qemuBuildObjectCommandlineFromJSON(virBuffer *buf, + virJSONValue *props, +@@ -7061,33 +7061,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: +- case VIR_DOMAIN_VIRT_LAST: +- break; +- } +- + /* To avoid the collision of creating USB controllers when calling + * machine->init in QEMU, it needs to set usb=off + */ +@@ -7253,7 +7226,46 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, + + + static void +-qemuBuildTSEGCommandLine(virCommandPtr cmd, ++qemuBuildAccelCommandLine(virCommand *cmd, ++ const virDomainDef *def) ++{ ++ 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: ++ case VIR_DOMAIN_VIRT_LAST: ++ break; ++ } ++ ++ virCommandAddArgBuffer(cmd, &buf); ++} ++ ++ ++static void ++qemuBuildTSEGCommandLine(virCommand *cmd, + const virDomainDef *def) + { + if (!def->tseg_specified) +@@ -9988,6 +10000,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, + if (qemuBuildMachineCommandLine(cmd, cfg, def, qemuCaps, priv) < 0) + return NULL; + ++ qemuBuildAccelCommandLine(cmd, def); ++ + 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 41a1dd185d..c4102fccd3 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 0f74e87bd4..b77b4e9705 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 ae92ab0dea..d088fae5d1 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 e8da16897f..f67255db06 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,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-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 \ ++-accel kvm \ + -m 4096 \ + -overcommit mem-lock=off \ + -smp 1,sockets=1,cores=1,threads=1 \ +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 1b41743107..30178b5a6a 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,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-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 \ ++-accel tcg \ + -cpu cortex-a15 \ + -m 4096 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args +index 6852f5d54d..8461f65cdf 100644 +--- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args ++++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-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=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,sve512=on,sve384=off,sve256=on,sve128=on,sve=on \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2argvdata/aarch64-gic-host.args +index 2baf4b9d78..9afeafef31 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 18a0ac2df3..eb523624f2 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 6cf583935d..9d6f2dece4 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 2049250b07..9d287646c6 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 e660b78397..d23c0b6485 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 cab7600693..99e557552f 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 51669190db..4e88739168 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 ed6e513f3c..f3c5f034ae 100644 +--- a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args ++++ b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args +@@ -23,8 +23,9 @@ 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 \ ++-accel tcg \ + -cpu cortex-a53 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args b/tests/qemuxml2argvdata/aarch64-pci-serial.args +index 3d89ab0b7e..045e582e38 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-tpm.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args +index 4ca09a1fb0..bb67a470cf 100644 +--- a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args ++++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args +@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \ + -S \ + -object secret,id=masterKey0,format=raw,\ + file=/tmp/lib/domain--1-aarch64test/master-key.aes \ +--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-a15 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args b/tests/qemuxml2argvdata/aarch64-traditional-pci.args +index 853723f4de..9e01ef4148 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 4c5ea313e4..0d87e41f34 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 56c66fc399..828ab81dba 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 8cf06402ed..5cb426f2c9 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 95a6b5154f..83ef8d03c0 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 6c997100da..ae4851e653 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 0d423783e6..685dc8e3df 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 058c528e8a..ecf2645e3a 100644 +--- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args ++++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +@@ -23,8 +23,9 @@ 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 \ ++-accel tcg \ + -cpu cortex-a15 \ + -m 4096 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +index ddd0518bd5..b397308916 100644 +--- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args ++++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +@@ -23,8 +23,9 @@ 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 \ ++-accel tcg \ + -cpu cortex-a15 \ + -m 4096 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxml2argvdata/aarch64-virt-virtio.args +index 15fb5f319e..b6088cc2fc 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 cf39101b8d..561bd6b3c2 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 7ed55510c4..09884b2a59 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 13218881c3..34d1988e39 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 d6143c5e5d..bc62c47310 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 c1a9fd84f3..11af70cfc3 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 0a9ff6b7d0..bc0f2ebae6 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 75ca00f779..28c3a72c17 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 7cdca083ce..fec775cf87 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 2b4e280686..e6a9e40804 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 60253f43ec..d57fa14fad 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 e81db15972..4e9bf67a92 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 3aa255187b..f35ee59a56 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 8a6cc8dec5..7f7b3262ab 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 8a6cc8dec5..7f7b3262ab 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 33f480e2a4..e784a89125 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 6627d90bf7..8a184700bd 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 45e2a7a5a5..2f1741094e 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 6b636575b1..245f9f45c2 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.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.args +index dfa7155b1e..a10c89b8f0 100644 +--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.args ++++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.args +@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ + /usr/bin/qemu-system-i386 \ + -name QEMUGuest1 \ + -S \ +--machine pc,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/blkdeviotune-max-length.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.args +index 5d301a465d..aa870ccdd5 100644 +--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.args ++++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.args +@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ + /usr/bin/qemu-system-i386 \ + -name QEMUGuest1 \ + -S \ +--machine pc,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/blkdeviotune-max.args b/tests/qemuxml2argvdata/blkdeviotune-max.args +index 4548443377..a831355b4b 100644 +--- a/tests/qemuxml2argvdata/blkdeviotune-max.args ++++ b/tests/qemuxml2argvdata/blkdeviotune-max.args +@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \ + /usr/bin/qemu-system-i386 \ + -name QEMUGuest1 \ + -S \ +--machine pc,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-device.args b/tests/qemuxml2argvdata/blkiotune-device.args +index 60253f43ec..d57fa14fad 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 60253f43ec..d57fa14fad 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 c5d66e7b82..ea315175ce 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 0fbfc3c242..593b059e49 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 cfc396cba6..aecaa24951 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 a2b70dc96a..c48dbeaf7e 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 f3e2c97537..be579a6d6b 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 f3e2c97537..be579a6d6b 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 4df0ae4624..23b6db48b9 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 83b4fbde44..06e4886286 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 83b4fbde44..06e4886286 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 9ca3f75df3..cce973b364 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 57d4b88989..3dc3eb41ff 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 827814cbb9..606aa3de78 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 0338d0c5e3..a8212bc2ab 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 adb7707270..ab8ff36774 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 bbaa384ff2..d27a4a6116 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 95ac94ab7d..649273fb99 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args +index e7d6531021..f79d099f99 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 9daac162d0..e070849121 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 67d1662096..623d81e5fb 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 f3e0f591be..40ceb05691 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 38a9f41b1e..df14860470 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 fd42b897fd..c213eba653 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 1d22c3633f..98ef2af9f1 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 851052d5a5..af9cc92d30 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 4cf109a0e8..2aa3a029da 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 f814906c01..61eb6da458 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 89e510e977..8f532327ed 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 4b78d2ac23..9171880e32 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 e6f80f0085..ec62e88cf0 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 a1faa97b9f..10202e0775 100644 +--- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args ++++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-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=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,kvm-no-adjvtime=on \ + -m 4096 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args +index cb96ffbef3..b86bfa0ad8 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 e38898e335..048cdaada1 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 9fd990da1f..46ce015dc7 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 4d6d6e376c..2be9165af0 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 4d6d6e376c..2be9165af0 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 8a6d72fb6e..38bff38870 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 73965531fd..bda818cc51 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 ab9e1c187e..728206275c 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 ec81652e20..07bc1ed957 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 7357923e37..d511c2593d 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 648dc7493e..4f731981eb 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 dbad074eb3..faf3502ac1 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args +index 30a47a915b..e120d84315 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 ff88df04d8..b605394b77 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 454da17e2c..748d7956e1 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args +index 3cb634d0c7..4f72d206cd 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 a33b16f7ce..3aa9a6cd84 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 4e989ed2f5..895f8478c3 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 d35de5ea58..0c4627b90a 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 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 88d05a482a..0aa9db7137 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu Icelake-Server \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args +index 03347b66cc..9fe9eecc55 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 375b00cc67..756a9ff812 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 b597da4d6f..5b3dc9a474 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 3d2a4baa51..804cc221de 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 5bb2269b34..c5501afbee 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 9ddad45b9f..45ccec3fb2 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 14b02d5dbd..3b142a75a3 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 b24a74e54c..0c5a47220b 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 f215c45fad..7915d1f0cf 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 1e4af63dc3..71891fd324 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 1e4af63dc3..71891fd324 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 786f9b693c..1e98cdbdc5 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 90bacb0224..853eea9ac7 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 a2e4dcaf91..3f12c1a288 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 93f178751b..28d332eeb4 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 93f178751b..28d332eeb4 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 40e0246031..89187236b7 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 23cb82113a..8c394c8fdb 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 42f969fd62..fea068f3f8 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 b44dc2ec48..871b725a26 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,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,pku=on,\ + la57=on,3dnowext=on,3dnow=on,vme=off,fma=off,avx=off,f16c=off,rdrand=off,\ + avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,misalignsse=off,\ +diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.args +index 5f38b72f92..1ad6738fe7 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 8ba238de3c..e3298894e5 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 32e192421f..349f98489c 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 a4de9d3de9..53b76fa78d 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 14b02d5dbd..3b142a75a3 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 78c03cfad5..9b7025f7e6 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 39d368a359..94bd87022f 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 8246efd563..4dc0769cf5 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 900d7486a6..db1026d95c 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 1e4af63dc3..71891fd324 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 79ee747184..e22b2978c3 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 752eed8d13..364934db4c 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 c7e403441f..5b1aa84235 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 c7e403441f..5b1aa84235 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 c7e403441f..5b1aa84235 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 97ad063a52..e184082900 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 3f035da711..a6e44f59ec 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 ac174e8f51..4c840db2c4 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 56e4e8ee40..4663b60c8d 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 ac99ae3f58..c17fa92996 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 56e4e8ee40..4663b60c8d 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 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 9322b826f4..dc8f97ac7a 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-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 55b72b4404..bb68c039bf 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 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/cputune-numatune.args b/tests/qemuxml2argvdata/cputune-numatune.args +index 787d5879b5..fe296a7911 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 7270aafeb7..75c73b54d2 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 7270aafeb7..75c73b54d2 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 d73625e94e..333f87da95 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 2a4fc70f67..f697a799fb 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 f9e7398a12..706dcac244 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 4eaeaa5436..2ceec30c8f 100644 +--- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args ++++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel kvm \ + -m 1024 \ + -overcommit mem-lock=off \ + -smp 1,sockets=1,cores=1,threads=1 \ +diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args +index 5fadd1b61f..6256bc3e43 100644 +--- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args ++++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel kvm \ + -cpu host \ + -m 1024 \ + -overcommit mem-lock=off \ +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 934c5d598b..e994918032 100644 +--- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args ++++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel kvm \ + -cpu z13.2-base,aen=on,aefsi=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,\ + sthyi=on,edat=on,ri=on,edat2=on,vx=on,ipter=on,ap=on,esop=on,apft=on,apqci=on,\ + cte=on,bpb=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ +diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args +index 1b4dffc84c..eb04c26bdd 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 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 487018cf3e..a60ac6f736 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 6c19da970f..914886466e 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-blockio.args b/tests/qemuxml2argvdata/disk-blockio.args +index 72aa592fef..422c8e199d 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 c574cb02e6..7c54db4f14 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 435ddd6194..80e8bedddf 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 25360071e3..bbae923759 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 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-2.6.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args +index 64fd4308e4..06d6e6b964 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 a6a448999b..2d64fd0ede 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 4b70cb634c..3b6798d67e 100644 +--- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/disk-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-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \ ++-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 b1c30dd4d8..caee68fc62 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 81f250600e..3f887da8ca 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args b/tests/qemuxml2argvdata/disk-cdrom-network.args +index 81ff324a0f..90f142993c 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 81f6b400aa..6a2b59e3ab 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 2515b256d0..c8fb6a760d 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 \ ++-machine pc-1.2,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args b/tests/qemuxml2argvdata/disk-cdrom-tray.args +index ff3f77962e..776813c6f4 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 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 120aa5b53b..acc3753a6a 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args +index cbac368129..0fe4ff94d0 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 2440acc78a..138d723d1e 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 9c8097c4a6..378b9bd1fa 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args b/tests/qemuxml2argvdata/disk-copy_on_read.args +index ca44c59816..699505c0bc 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 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 82d44ba0bb..e89558a05b 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.args b/tests/qemuxml2argvdata/disk-detect-zeroes.args +index 400a1b4957..2ad648db46 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 1da46d8987..124f330cd7 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 \ + -m 1024 \ + -realtime mlock=off \ + -smp 1,sockets=1,cores=1,threads=1 \ +diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +index 1a6a02a3be..248bc93d28 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-discard.args b/tests/qemuxml2argvdata/disk-discard.args +index 163b1b0df2..01b9b16da1 100644 +--- a/tests/qemuxml2argvdata/disk-discard.args ++++ b/tests/qemuxml2argvdata/disk-discard.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-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 0d9254e1ae..8f498af524 100644 +--- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args ++++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-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 s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ ++-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-error-policy.args b/tests/qemuxml2argvdata/disk-error-policy.args +index c339203e2e..572becf378 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 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 e8f5ea10df..22328b12d8 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 a624998480..0144203f21 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,7 +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 \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 ec3210cdc8..debeacd06d 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,7 +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 \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args b/tests/qemuxml2argvdata/disk-floppy-tray.args +index e8a4472ebc..4da037e24f 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 83ec46bb9d..361357fc7f 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 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 fbca6c90ec..2829de1d8a 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args b/tests/qemuxml2argvdata/disk-fmt-qcow.args +index 9c24ce384f..13b962f0ff 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 eefa7dc24e..412e6e2bee 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-hostdev-scsi-virtio-iscsi-auth-AES.args b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args +index 47b014aacc..0ede653e67 100644 +--- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args ++++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.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 \ ++-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 c1a0cc7bfc..514483778c 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 939daad00d..26ff069aa9 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 2fc3562b16..29d6ad2e00 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 9297e95127..462e5bd218 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-network-gluster.args b/tests/qemuxml2argvdata/disk-network-gluster.args +index 7664284f7c..3bc62a88dc 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 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 2cd59992ca..7ce5eea77b 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 \ ++-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-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +index 7b4674a588..6fc81f38d2 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args +index 57eaeb40ee..a9eaa88c13 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 53b3821ea7..80410ba330 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 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 3f61f6dc2c..47c52c5ad2 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 \ ++-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-nbd.args b/tests/qemuxml2argvdata/disk-network-nbd.args +index 17576fe932..2f99d71c0e 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 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 5453440ac8..519ed91e11 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 \ ++-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-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-2.5.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args +index 50af3eb653..c999964b8e 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 fb8fc988e8..41b59aa6a9 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 \ ++-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-sheepdog.args b/tests/qemuxml2argvdata/disk-network-sheepdog.args +index cf832062bb..7cdcd81fea 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 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 302ec9b9fd..f917918b4e 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 \ ++-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-source-auth.args b/tests/qemuxml2argvdata/disk-network-source-auth.args +index e68b81fde0..3b277cc9c2 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 279d5c73ec..db96ce0fb8 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 7a504d49be..427c8645ab 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 \ ++-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-tlsx509.args b/tests/qemuxml2argvdata/disk-network-tlsx509.args +index e06582032e..4787c3c0ae 100644 +--- a/tests/qemuxml2argvdata/disk-network-tlsx509.args ++++ b/tests/qemuxml2argvdata/disk-network-tlsx509.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-network-tlsx509.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args +index 06686f801d..176d98a891 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 a2aeb91958..0a5ba79427 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 e59a760b96..da1e0aa609 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 190129ea97..587d962bdc 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 5334882c0b..f82e4d269e 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-order.args b/tests/qemuxml2argvdata/disk-order.args +index d85c4017ed..5eadfe8063 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 6e25779ce0..2bfcedaca8 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 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 f67ebf0069..307423e63b 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-sata-device.args b/tests/qemuxml2argvdata/disk-sata-device.args +index 572ca20eb2..7885f8e1f5 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 b3cf61b112..fa5e5987b8 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 634d929a01..c97c0e720a 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args b/tests/qemuxml2argvdata/disk-scsi-disk-split.args +index a0ef28d777..80b8281fb2 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 8cc1057613..48964a0d52 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 7c92f85f43..bb6b8b9b58 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 9f51c6d906..431ad3cc1b 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 06c71cbab6..3cbe54c154 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args +index bbd10a106a..19edbbc2d7 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 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 224414e15c..1d01dc3065 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +index 869b4c0af0..bd0902c116 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-snapshot.args b/tests/qemuxml2argvdata/disk-snapshot.args +index 9098536356..38311f7b99 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 d55fcf0ff4..3c458d09e5 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 f37a7b3b67..e31a8488f3 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-usb-device-removable.args b/tests/qemuxml2argvdata/disk-usb-device-removable.args +index 61ca1589a2..9bcd05655c 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 515be277cf..bd50d3b642 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 2e881ec314..59ac19b320 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 27bd47166d..ded32e1d2b 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 bd3a1a9135..0ad0cc684d 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 34a07bb31b..0bfc79ad18 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 a37b8a55cd..eaf6545031 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 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 bfd7a92530..929d2528f4 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/disk-virtio.args b/tests/qemuxml2argvdata/disk-virtio.args +index 7c217255c2..8e16deb0b1 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 8641701293..5ba59fd7f7 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 8641701293..5ba59fd7f7 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 fb12878f2e..ef23e1ce7e 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 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 c34f2e78c2..dbd86af31f 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64,kvm-pv-eoi=off \ + -m 214 \ + -overcommit mem-lock=off \ +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 96bfba2dac..ccf27b7ccd 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 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 2ee3ef5031..f19ab543ce 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64,kvm-pv-eoi=on \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/event_idx.args b/tests/qemuxml2argvdata/event_idx.args +index bfeeffd939..ec908167e5 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 d23c575553..a9ca623383 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/libvirt/qemu/-1-instance-00000092/ram \ +diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.args +index 4fbbc8185b..87e17f9868 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 1eeeaec0ce..c1f6aa8b05 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 d75b67916c..c130b1d60e 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.args b/tests/qemuxml2argvdata/fips-enabled.args +index 91b32bd96c..8fd70d9d48 100644 +--- a/tests/qemuxml2argvdata/fips-enabled.args ++++ b/tests/qemuxml2argvdata/fips-enabled.args +@@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=none \ + -name QEMUGuest1 \ + -S \ + -enable-fips \ +--machine pc,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.args b/tests/qemuxml2argvdata/floppy-drive-fat.args +index c654ae598a..11dad13ceb 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 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 c47f2ea717..2c0976d4cf 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args +index d83f6048b1..30e4e1f747 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 4a93ee37cb..ea58c84119 100644 +--- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args ++++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args +index 87bdf4da77..1b55b8d911 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 700ae69203..7e08f5c5a7 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args +index 7c39132ff8..267a2df49c 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxml2argvdata/genid.x86_64-latest.args +index 5bfb8db9f9..171d25d230 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 390a8d16b7..8c5a729335 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args +index 76d7583462..5fda347e15 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 390a8d16b7..8c5a729335 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +index a34f9d43c7..496701d5de 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 c0c354b824..83f40f847a 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 abcebd1774..b88b6f010e 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 9bed352312..a255cd3561 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 843e82935e..fe909610c1 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 843e82935e..fe909610c1 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 1f06d88e04..e2a6794382 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 54b7184376..11f6215525 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 c0d08964d6..799749ecc6 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args +index 76f74c0fc5..962c1d77b9 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 630e620186..66a3c1d6af 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 bc2293d6a0..074ea5e27a 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 e781357277..2ca561a8c4 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 3f6cf4a8e2..6dd8c8f364 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 c46bddf617..18f6973b99 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 4c38960b72..c958f02e01 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 5e3bb6e0b5..20f49768c4 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 12697fc206..baded26feb 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 3c0901d1a5..66f25687ee 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 82a77778c2..5bc6e4943c 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 f9259c7fe7..ed7f016c94 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 17fde4e5a1..58e7b77728 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 7ee7a3777c..9bef206b32 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 32972582e7..2cdcf4f62c 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 7b845de69b..7782159e56 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 8fe87adde8..ea9d18450e 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 5a73408bf9..32dc7082b1 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args +index 7d89329aa2..fd82eab964 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 3ec25996c9..3866aa2b8b 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 f435b9a152..a52763688f 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.args +index c094c0d0f0..ca822a2b45 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 82a77778c2..5bc6e4943c 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 bb12d314b9..a4d33562d8 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 090b644abb..e6af046390 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 201ccccc7f..bd0a8286df 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 0809fdce45..0b63ff5b24 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 58a7549935..3e8add8625 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args +index 207ac5740b..fd1cbe8b52 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 98d4a62c18..ceba02cc26 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 42fae17444..882d5839f6 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 edec271444..f8a95d05fc 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 d8690c010b..fc8b9fda0b 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-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args +index 03e77517b4..e2d65da7f5 100644 +--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args ++++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.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-lsi-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args +index f215fba066..de7af2a61a 100644 +--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args ++++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.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-lsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args +index cf90224e9a..b8bcb6e78e 100644 +--- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args ++++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.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-readonly.args b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args +index 0e481e7464..678cfc74cb 100644 +--- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args ++++ b/tests/qemuxml2argvdata/hostdev-scsi-readonly.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-ccw.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args +index 0e9fdd7c31..c0fbdaf86f 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 3e8b590ea0..c2f05c028f 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 0bda46c4e1..299996666a 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-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args +index 4ce2029adb..1a066d9170 100644 +--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args ++++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.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-virtio-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args +index 050e74a449..34bc6f44c1 100644 +--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args ++++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.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-virtio-scsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args +index 364c4a10a5..7dc984d951 100644 +--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args ++++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.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-subsys-mdev-vfio-ap.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args +index 12bdf84afc..cc87bda8e9 100644 +--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args ++++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu \ + -m 512 \ + -overcommit mem-lock=off \ +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 ed6d92aba7..6813bcde2d 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,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu \ + -m 512 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args +index 1402b23b8c..a65bf208ef 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 6a24db3aea..dac85307b9 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 5a10d45b3b..c02167660e 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 eb17911423..911d9c2382 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 6bf3ef8021..7521d110e4 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.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args +index 963d508066..84bca82631 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 2fc4200c23..eb7831b61e 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-multidomain-many.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args +index 3dd9a25fd5..c687392091 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 d3a762e5d4..2d590a7a0d 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 d7eaa774ca..adb95f4064 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 b2bd39e5a5..6054f78a17 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 014d71c9ec..5977533305 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 bcf6e6bf0e..644ed1f633 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 3184e4ea07..8386164091 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 7cfbce7c7c..d4ab245672 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 654baebf9f..1c4c08478a 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-nodeset.args b/tests/qemuxml2argvdata/hugepages-nodeset.args +index 014d71c9ec..5977533305 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 bbf3c9f67a..1ccc8bd08b 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 e219914bc3..51aaafa508 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 674bb517d1..4238c0ff34 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 7849143e69..9d20de0ba1 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 7b510be6b3..9b0902860d 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 e80a95c84b..eb7cea1049 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 545b86b223..41a1a4b84c 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 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 ea3fc775bb..e5d3a98794 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 41527208ab..9031fa23e1 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64,hv-crash \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +index bdcf33c1bf..e3fc58e1ef 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64,hv-vpindex,hv-synic,hv-stimer,hv-stimer-direct \ + -m 214 \ + -overcommit mem-lock=off \ +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 7382553860..f044b27704 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-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 36d9fc4f90..2529d9acfb 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 fc83eef3aa..8bbaa77e3d 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 8a96f66411..ed4441c612 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 108a8470cb..66e1a56668 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-caching-mode.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +index c232121595..83037cacfa 100644 +--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +@@ -12,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=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split \ ++-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 addb45a0b3..30b61456b1 100644 +--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +@@ -12,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=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split \ ++-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +index 98650baaaa..f92e788824 100644 +--- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +@@ -12,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=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split \ ++-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 eb491e17b4..0120c219df 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 92d25f6d41..91b1c1c757 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 \ ++-machine q35,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args +index 940a5d1f91..46be250fc5 100644 +--- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args ++++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-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,gic-version=2,iommu=smmuv3 \ ++-machine virt,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3 \ ++-accel tcg \ + -cpu cortex-a15 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args +index 402f653dfc..3d115232e5 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 e3dcb1d1b3..1c06690b4a 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 58e764d78a..08d67ab03f 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 009dcc9d72..b364263c55 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 bdc060aaa2..0897bf2db0 100644 +--- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args ++++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu \ + -m 214 \ + -overcommit mem-lock=off \ +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 c366520e09..2b0105ccc4 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata/iothreads.args +index 5bc2350741..29edfc6fd4 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 54d166912e..0ac2aba4f5 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 5753a3eb3f..07ab9d5224 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 \ + -m 214 \ + -realtime mlock=off \ +diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args +index f51fb19f85..a708bf9aef 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 a71d9d68b8..1fb76e52d1 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 cb2eba75ff..8ad951e2c7 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 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 c4cd5f5beb..3499509d54 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64,kvmclock=off,kvm-pv-eoi=off \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args +index 65bea1d0b0..a884e5fde6 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.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args +index 9fad85737a..1f795db2ea 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 e7a29b2e03..087e78106d 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 44e4c5698d..7f85cbb8a2 100644 +--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.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 \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/luks-disks-source.args b/tests/qemuxml2argvdata/luks-disks-source.args +index e2bd559212..c8976845f5 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 47626966f2..1fea806669 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 36fe539012..e2c0f1ab47 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 8d25e49db5..cd27ffef4b 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 2f4dd08c1a..3485b8bb5d 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 d96b2c0262..9469f4e0a3 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 a9577c13d8..dca842f16c 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 a9577c13d8..dca842f16c 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 7fbbe4e6bf..7db11afd2f 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 7fbbe4e6bf..7db11afd2f 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 fa3ccefc35..1ddf4fc6d9 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 6e480fceef..44701f1d64 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 e38898e335..048cdaada1 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 b3d271e161..8e5a21ce7e 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 40d6616940..b1ef8b0742 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 40d6616940..b1ef8b0742 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 4fbb224904..2d8ad62c08 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 4fbb224904..2d8ad62c08 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 056bf815e8..5001b75450 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 056bf815e8..5001b75450 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 f5b822e55c..ee4e24fe8f 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 2c401d9bad..711a2acf06 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 0326bea31c..7445f42caa 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 8f1f041a5f..1f63cc5b03 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 f3f5ddff1d..01d31dc59b 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 9e91135f31..0331772122 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 5d256c42bc..48daa17f7e 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 \ + -mem-prealloc \ +diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +index 5d256c42bc..48daa17f7e 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 \ + -mem-prealloc \ +diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args +index 9ba3f8b7a0..5145416b9d 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 0ac48db399..4c786747fa 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 89138f46c4..a0fa03e67e 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 1a8e7932dc..b0ad0b8ce6 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 ef32c663de..c78fec1972 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 00a78baa92..8966b85095 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.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args +index 92e6c538fb..f5340f7f59 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-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args +index 7f556a6668..549ec0b9d5 100644 +--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args ++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args +@@ -12,7 +12,8 @@ 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,nvdimm=on \ ++-machine pseries,usb=off,dump-guest-core=off,nvdimm=on \ ++-accel tcg \ + -cpu POWER9 \ + -m size=1048576k,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 7088a4f054..b9dce63f40 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 60d6d207c5..764c4e64aa 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.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args +index 91cea9d8bf..f3d6550776 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 c2c80ecf00..008d0b90a5 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 60253f43ec..d57fa14fad 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 60253f43ec..d57fa14fad 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 7f0edb240e..be82a56bd8 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 c977c62ab4..f288778f5c 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 42ca3cbf38..e6a5e4cefd 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 3f7078605c..cf6a8bc38a 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 60253f43ec..d57fa14fad 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 5ddfded151..535f6fcf9b 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 a327c45a8f..66e8de1092 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 b36dfe8512..ef1fe463dd 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 4b99bdd51c..1faca0f398 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 057568bbe0..f8c2d28070 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 5ddfded151..535f6fcf9b 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 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 967fe4c826..05902c5937 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +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 167214fd64..4b542b3422 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=on \ +diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args +index 50bbb36f27..acc986541e 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 abf230fbac..6681a75307 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 1ba2dfbf83..8edd4b31bd 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 0aa6645c4d..3fec63927e 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 ff136626a7..38ae4e9a05 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 ff136626a7..38ae4e9a05 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 a79edee524..aae85bb60a 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 435843bc27..34cc4b529e 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 ff136626a7..38ae4e9a05 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 7c7e5bc3a2..de55ff982b 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 46f28022fd..5de18777e9 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 ed8332ddfe..778c882338 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 cd875f60c9..a10f302cbd 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 bd49544de6..6b56e06e13 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 36b057131f..2382be9bac 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 e8b71a3ded..929db1d6b5 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 b92e520820..500f79c7e9 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 1390298e2e..31b0fbf7a9 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 5f1de305e0..1c3bb5b6f0 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 a8d43b0684..1dc1d1bf0e 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 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-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args +index 691ef39edd..b544e1778d 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 1acc910ad1..3e649e01b5 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 58dcbb510b..89bfb9214d 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 27fa24a64f..07f56ff1f8 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2argvdata/net-virtio-ccw.args +index ed8eb9089c..5c5f000fd9 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 67b0592fab..f785d0b2d4 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 a9ac9687db..23d280e22f 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 32d3b6b541..a1669a177c 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 758da237dd..2dd0877cd7 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 b863943067..38212b3e87 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 19e7260843..79138f0315 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 4beb5ca75f..c008cfdd17 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 3993edfc4b..30ef1043fa 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 7270aafeb7..75c73b54d2 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 7270aafeb7..75c73b54d2 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 7270aafeb7..75c73b54d2 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 7270aafeb7..75c73b54d2 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 7270aafeb7..75c73b54d2 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 7270aafeb7..75c73b54d2 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 babb23b938..0ef138d788 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 a20b40b5c5..c93979deec 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-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args +index 213efe0663..b9a03f9e6a 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 64fdcd7bb1..2308589137 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 7270aafeb7..75c73b54d2 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/os-firmware-bios.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args +index 4391c6eda2..7989aea351 100644 +--- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-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 f8af2100ea..daa3e945ae 100644 +--- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +@@ -23,8 +23,9 @@ 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 \ ++-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 a06213eb19..cc933c0ec4 100644 +--- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +@@ -23,8 +23,9 @@ 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 \ ++-accel kvm \ + -cpu qemu64 \ + -m 8 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args +index fefa205597..8ee930c576 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 bbf3c9f67a..1ccc8bd08b 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 b2aed77ff9..4074d9e708 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 745efc7cf2..864183e246 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 b4adee02bc..7e63273a28 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 51e107e1d0..7330c7c79f 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 c1b1852174..4037b92df0 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 2ab87fb17a..dbbd13fffc 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 b1ea53a468..603164aa64 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 b3383da9a7..ed1f2a40c1 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args +index 69826389f6..7a719328fc 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 2d22f96791..82c613b228 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 76d94144a6..14ed850a65 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 18cc4b9fb0..2e549f2fcb 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 4b26702ef3..1df4d1fcc7 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 64279760dd..804c5d7568 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 056c2a5340..f0a4e6e8d7 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 1dd1695707..b812421653 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 d82e1d047b..7a7a34114f 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 92858a2167..51d2d4194e 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 a241324def..e07346ee67 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 9438366bc5..b198390bc5 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 134be6bcd0..031b91385c 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.args b/tests/qemuxml2argvdata/pcie-root-port.args +index 004010069b..c496dd24c3 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 18d26b4a8e..c072b4e82e 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 a15c7d4573..58bcc78619 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 a479b1494d..2df6c6eb1b 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 9831ee388c..dfa82ae74c 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 4557dc2419..5494d65b0d 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 37ab3eacb1..d7224c010c 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 b0ac523678..f1feeb0e17 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 f3ac10bea2..9a2255ac49 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 c34821c7e8..71bcbe715b 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,7 +12,8 @@ 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 \ ++-accel kvm \ + -cpu POWER8 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 3d02221d3f..cb6da510f7 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,7 +12,8 @@ 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 \ ++-accel kvm \ + -cpu POWER8 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 fac43e4cc1..3dcc3875d2 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,7 +12,8 @@ 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 \ ++-accel kvm \ + -cpu POWER8 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 a2ffca1d30..e5596ac7ce 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,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu POWER7 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 01f84fde88..c871d750e8 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,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu POWER8 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 3738ac7386..37e94ce090 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,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu POWER9 \ + -m 4096 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args +index ba508ca79d..f339e99fd4 100644 +--- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args ++++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-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 pseries,accel=tcg,usb=off,dump-guest-core=off \ ++-machine pseries,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu POWER9 \ + -m 4096 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +index 072f81da60..34c8b32788 100644 +--- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args ++++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-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 pseries,accel=tcg,usb=off,dump-guest-core=off \ ++-machine pseries,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu POWER9 \ + -m 4096 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args +index 49349449cf..3202af2da1 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 d40f8cf201..1c3e3481dc 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 7d6ba64fb8..adc21bcb78 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 3728b4dc22..da53502ab2 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 574e3b164e..13aa5872f2 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 7c853216b6..6a8301da35 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 ece96ee52f..2f90782f81 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 1c643449b5..b623250e5e 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 5949d95113..06805bd1fc 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 9645918e61..60ad5a6c31 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 7aa357a54e..2eaf27a9ad 100644 +--- a/tests/qemuxml2argvdata/pseries-features.args ++++ b/tests/qemuxml2argvdata/pseries-features.args +@@ -10,8 +10,9 @@ 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 \ ++-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 51ec025dce..4df23489dd 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 87b6d928be..8c2520a791 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 5820140065..9fa0a34c41 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 1d9a7b1987..640bffeb81 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 6290a5fe24..4ea01ba664 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 0e8a269ab2..0ef5643052 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 e5e1d94231..b5e88839c2 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 aabd97c087..740ccca6dc 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 574e3b164e..13aa5872f2 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 574e3b164e..13aa5872f2 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 c0725bfce4..3c415951d0 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 ca25e84d0e..e295045eab 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 c0725bfce4..3c415951d0 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 9a5f8c8300..c8295f7065 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 930532527f..d91c38e08c 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 104f0d5491..d18cafe703 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 5de177780a..26dfe86909 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 61246e4672..cc3d0a4916 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 b811c024e8..2fa76dd90d 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 a412593c9a..c62801935d 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 a500e9b4b9..b707cfc0bd 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 7e3c90e467..b9a04ae5f0 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 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 eb449837bf..bb5d26ae0d 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64,kvm-pv-unhalt=off \ + -m 214 \ + -overcommit mem-lock=off \ +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 c5d0095242..2e55d11719 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 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 af14fa05a9..6bda16dc49 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64,kvm-pv-unhalt=on \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args b/tests/qemuxml2argvdata/q35-acpi-nouefi.args +index 09e06c96ea..708fa85f27 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 d00fe5bc1d..92956dea5f 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 90f41509df..522e0ac050 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 b720a6c3da..fb259b6b59 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 de34dff1cf..184e2d9009 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 b3be5171be..1dba0bdf6c 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 4e173501a9..7d07ad91fb 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 e741e849f0..471636eb41 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 ccde17059b..33246239fb 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 86340d3318..567ec9e1e1 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 82e54d1121..acf9ff8068 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 23629eaa79..b88e7ad121 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 ab393428e5..4783cef143 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 dbe9cf9478..10dd8001e4 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 ca4ed91da7..fd3d6c03d7 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 5ca5917fc0..f9fd451397 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 7e4cffa4d0..a289816790 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 fc1592f168..94d622c1fb 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 fc1592f168..94d622c1fb 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 fc1592f168..94d622c1fb 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 fc1592f168..94d622c1fb 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 fc1592f168..94d622c1fb 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 fc1592f168..94d622c1fb 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 74f7b88761..c3da15c1bf 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 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 7864f90402..2c4b7ee7ee 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args +index 1ddc18b7c5..f3153ddd49 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 e31f37e112..3990dcbddf 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 cc0a751483..98f302fabd 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 ac3d16f3c3..ff43c7e2c4 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 f8e2154f8f..7140a6c79c 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 9a595dc4ee..4758f0ca2b 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 0b91972149..274c6e2e29 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 1631e46b1c..8b153e0274 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 573d953602..966163108f 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 573d953602..966163108f 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 0c2567df6c..6662ec6fa5 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,7 +12,8 @@ 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 \ ++-accel kvm \ + -cpu host \ + -m 256 \ + -overcommit mem-lock=off \ +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 0386019418..5613501342 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,7 +12,8 @@ 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 \ ++-accel kvm \ + -cpu z13.2-base,aen=on,aefsi=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,\ + sthyi=on,edat=on,ri=on,edat2=on,vx=on,ipter=on,ap=on,esop=on,apft=on,apqci=on,\ + cte=on,bpb=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=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 d30c30f648..e6db9da9b5 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,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu \ + -m 256 \ + -overcommit mem-lock=off \ +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 c7bd0c3840..bcbd565350 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,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu \ + -m 256 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args b/tests/qemuxml2argvdata/s390-panic-missing.args +index ef24f8f90c..6f5a8616f9 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 60ddab9e1d..b623b601c7 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 e6103ced32..3642983f03 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 cb454ef47c..89c59a0c53 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 cb454ef47c..89c59a0c53 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 8f72b20b0b..4c2b8b29c9 100644 +--- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args ++++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-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 s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ ++-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu \ + -m 4096 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +index 95caf9e9ed..127cfe9e70 100644 +--- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args ++++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-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 s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \ ++-machine s390-ccw-virtio,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu \ + -m 4096 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args +index 60253f43ec..d57fa14fad 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 60253f43ec..d57fa14fad 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 60253f43ec..d57fa14fad 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 b561a77139..70c5718515 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 60253f43ec..d57fa14fad 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 60253f43ec..d57fa14fad 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 60253f43ec..d57fa14fad 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 60253f43ec..d57fa14fad 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 60253f43ec..d57fa14fad 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 60253f43ec..d57fa14fad 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 239c13167d..b0710273a3 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 96053f22c3..61c8564a9e 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 435b9eb689..865c34017a 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 35334297ff..76f5e4ab94 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 31800b30ff..d2848ad0f4 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 4d6d6e376c..2be9165af0 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 60253f43ec..d57fa14fad 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 6e3d4e4ea0..8245e61a1a 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 dd91391343..fb77881703 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 a372863fa7..e6417b42a4 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 c08869bd49..da268de274 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 c84e58eef3..c4470a68a5 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 c84e58eef3..c4470a68a5 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 051c8abc14..adc0dcc64c 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 27fda92418..b586186596 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 26998323ff..019d87fd20 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 05d42adda1..1d8b72d1e7 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args +index f5a5bab576..24cf2c305c 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 6ed86b7448..a25d2bf456 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 f2f3c3e95d..9fd8d78a51 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 7e9442045d..1bc304beb3 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 9381649668..d3db94180b 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 eecc454343..5a3f74c5d5 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 7e9442045d..1bc304beb3 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 983648a21f..145ad8447a 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 bac4418803..fc919b5d88 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 7eb54497ef..13de57bcca 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 4f1e3242ed..fef42efd3e 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args +index 8ded1cb085..ab4e1a11da 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 632e9d8e34..636f5a9f67 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 dbf714c976..73297766d7 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 ce159a7054..7fdd798125 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 7ed0c1e507..60d21b56c7 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/tpm-emulator-spapr.ppc64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args +index 00018e579f..8ed45647dd 100644 +--- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args ++++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu POWER9 \ + -m 2048 \ + -overcommit mem-lock=off \ +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 2455e14cfe..709fe016eb 100644 +--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu64 \ + -m 2048 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args +index 2455e14cfe..709fe016eb 100644 +--- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu64 \ + -m 2048 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args +index 2455e14cfe..709fe016eb 100644 +--- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu64 \ + -m 2048 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args +index 5508e4defb..6a2a23995d 100644 +--- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu64 \ + -m 2048 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args +index 60edf86dbd..9b17deec9b 100644 +--- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu64 \ + -m 2048 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +index 53dab283cc..d2f56b591c 100644 +--- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +@@ -12,7 +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.10,accel=tcg,usb=off,smm=on,dump-guest-core=off \ ++-machine pc-q35-2.10,usb=off,smm=on,dump-guest-core=off \ ++-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 9b4f99c042..192feedb6a 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 ef7a60a7d6..eb86c4aa86 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 d93bd4f1ad..b87275f9bb 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 a23d0c4710..0a8ac4f8bc 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 4aa1388409..94f63a270e 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 b944dcb78e..2877a247c3 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 fbfc88bede..6328ed3835 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 24b5217455..f3aa614565 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 dee4c843be..7c09765a6a 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 b1f2478e72..b625b0937e 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 a2c46c00f7..a8470ed394 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 caddab712d..fe3c7cdd68 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 a3a01b7e74..471abf3a9b 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 6000e89bbf..59a985969b 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 bd3c573a86..05b814f269 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 480968883d..4cf2b358fc 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 5f04bf088d..b2af594919 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 9f6b49310d..ea22cb685d 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 89dcbfaaa1..af09b4e9d2 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 d801505f98..96bfdd814c 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 a8a90a81cb..0b1f851f4e 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 d6abba6817..c95510a1f9 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args +index d4f1e0dd0e..3685ab5828 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 d68ff5f90f..498f0fd5fa 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 9098cc6d9a..92d3246aaf 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 abaf54cef3..60b67814f5 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 88e540bc3c..10d937f553 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 7ceb679646..27e0d337a1 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 a7df45a7f0..e24c2ae46c 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 39190b8d3e..9d52e96785 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 e083b872c5..cda34fafb7 100644 +--- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/vhost-vsock-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-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 \ ++-accel tcg \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +index 17b5ded6b8..4d60936a26 100644 +--- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args ++++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +index 81a6b8cb42..4a847f91c2 100644 +--- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args ++++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +@@ -12,7 +12,8 @@ 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 \ ++-accel tcg \ + -cpu qemu \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args +index 8b3538a56a..a231af44b2 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +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 b7fef1fe08..0837e6322b 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args +index 4ffc2295d0..01c7158d6e 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 193ff21414..f8f5205895 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 aef42cc1c8..4208aed8b2 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 f12cef8549..03342d7cd0 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args +index 575a6d4cfd..a59b886550 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 74cab50ba5..b68698579d 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 830b5f9c3e..e3a117cb91 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 8c38697fe7..15f032c9ec 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 1fdaf7e02e..8031eebac9 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 3c47329c8d..d6b7270bd6 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 d651b69902..f701f9f1a8 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args +index 6fb728658a..c4a04d900e 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 6fe792f46d..1fc280f9a8 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 1024 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args +index c267f4bf67..5056cbacb1 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 132d67ed89..d1ef8d0656 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 cf21cafcef..91e3341727 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 154bc1c2b7..13c76aafdc 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 45c7701ac1..c6b4a0edb3 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 050d989bad..5591c893c4 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 7a5df40546..ab8bbf5487 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 860eaf0e6b..a011f4495e 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 8852351ef0..229acadcd1 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 42760eba60..87252656b3 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 cb87552342..e8d8595525 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-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args +index d26952c181..f221c8d4d1 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 c89997af6b..6a612f17cd 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 7df1512b9b..813a8d312a 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 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 0d751ea7ae..726720311e 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 \ ++-machine q35,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/virtio-options.args b/tests/qemuxml2argvdata/virtio-options.args +index 33ecd8f4e8..e5b74600b3 100644 +--- a/tests/qemuxml2argvdata/virtio-options.args ++++ b/tests/qemuxml2argvdata/virtio-options.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/virtio-rng-builtin.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args +index fe01d661e0..a13907b94c 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2argvdata/virtio-rng-ccw.args +index 31e8b8ab31..8b03b0de77 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 c21e0176e2..afbb59fab2 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 842d18de6c..d266bc9529 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 37fb988b75..59055b384e 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args +index b07549c4ec..23021833eb 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 c70eba02ed..e5781855f0 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 dbe014849d..a05a2a665d 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 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 0bd0da05d0..bfbce56426 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 \ ++-machine q35,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args +index e4b1bbeb5f..bb711a41fc 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 5e5e33db7a..df6692006d 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 0790e7d937..5db373d13e 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 9d69a49c73..ebd3f4b9b3 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 9109a713e0..2f934aa868 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 bfd901929c..b7b3b971f9 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 871ac6f069..f078c45efb 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 74715f9517..09d326d14a 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,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-i440fx-4.2,accel=kvm,usb=off,dump-guest-core=off \ ++-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 145864b896..8ef93cd19f 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,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-q35-4.2,accel=kvm,usb=off,dump-guest-core=off \ ++-machine pc-q35-4.2,usb=off,dump-guest-core=off \ ++-accel kvm \ + -cpu qemu64 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 21d5b358bc..623b91b28d 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,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-i440fx-4.2,accel=tcg,usb=off,dump-guest-core=off \ ++-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 9afac1778b..5495982da1 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,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-q35-4.2,accel=tcg,usb=off,dump-guest-core=off \ ++-machine pc-q35-4.2,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 b6c06961d7..bdee3df0d2 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 0fa7134198..89e12facc2 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 5a6fbe65df..0ba598e58e 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 \ ++-machine q35,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 4096 \ + -overcommit mem-lock=off \ +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 8a8728e59c..a4a90ae592 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 \ ++-machine q35,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 4096 \ + -overcommit mem-lock=off \ +-- +2.27.0 + diff --git a/qemu-implement-vhost-user-blk-support.patch b/qemu-implement-vhost-user-blk-support.patch new file mode 100644 index 0000000..05aceed --- /dev/null +++ b/qemu-implement-vhost-user-blk-support.patch @@ -0,0 +1,566 @@ +From e07709c7275349eac376660c08bacc6d18f28ff8 Mon Sep 17 00:00:00 2001 +From: Luo Yifan +Date: Wed, 30 Nov 2022 18:13:37 +0800 +Subject: [PATCH 17/24] qemu: implement vhost-user-blk support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Implements QEMU support for vhost-user-blk together with live +hotplug/unplug. + +Signed-off-by: Pavel Hrdina +Reviewed-by: Ján Tomko +Reviewed-by: Peter Krempa +(cherry picked from commit d763466edc6e8d4965fb42092c6e8f4296acf6c6) +Signed-off-by: Luo Yifan +--- + src/qemu/qemu_block.c | 40 ++++++++ + src/qemu/qemu_block.h | 7 ++ + src/qemu/qemu_command.c | 93 +++++++++++++++++-- + src/qemu/qemu_command.h | 6 ++ + src/qemu/qemu_domain.c | 13 +++ + src/qemu/qemu_driver.c | 66 +++++++++++++ + src/qemu/qemu_hotplug.c | 12 ++- + .../disk-vhostuser.x86_64-latest.args | 40 ++++++++ + tests/qemuxml2argvtest.c | 1 + + 9 files changed, 268 insertions(+), 10 deletions(-) + create mode 100644 tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args + +diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c +index 8bd6238238..0b7f2f6874 100644 +--- a/src/qemu/qemu_block.c ++++ b/src/qemu/qemu_block.c +@@ -1553,6 +1553,8 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data) + VIR_FREE(data->httpcookiesecretAlias); + VIR_FREE(data->driveCmd); + VIR_FREE(data->driveAlias); ++ VIR_FREE(data->chardevAlias); ++ VIR_FREE(data->chardevCmd); + VIR_FREE(data); + } + +@@ -1719,6 +1721,13 @@ qemuBlockStorageSourceAttachApply(qemuMonitorPtr mon, + data->driveAdded = true; + } + ++ if (data->chardevDef) { ++ if (qemuMonitorAttachCharDev(mon, data->chardevAlias, data->chardevDef) < 0) ++ return -1; ++ ++ data->chardevAdded = true; ++ } ++ + return 0; + } + +@@ -1741,6 +1750,13 @@ qemuBlockStorageSourceAttachRollback(qemuMonitorPtr mon, + + virErrorPreserveLast(&orig_err); + ++ if (data->chardevAdded) { ++ if (qemuMonitorDetachCharDev(mon, data->chardevAlias) < 0) { ++ VIR_WARN("Unable to remove chardev %s after failed " "qemuMonitorAddDevice", ++ data->chardevAlias); ++ } ++ } ++ + if (data->driveAdded) { + if (qemuMonitorDriveDel(mon, data->driveAlias) < 0) + VIR_WARN("Unable to remove drive %s (%s) after failed " +@@ -1904,6 +1920,30 @@ qemuBlockStorageSourceChainDetachPrepareDrive(virStorageSourcePtr src, + return g_steal_pointer(&data); + } + ++/** ++ * qemuBlockStorageSourceChainDetachPrepareChardev ++ * @src: storage source chain to remove ++ * ++ * Prepares qemuBlockStorageSourceChainDataPtr for detaching @src and its ++ * backingStore if -chardev was used. ++ */ ++qemuBlockStorageSourceChainDataPtr ++qemuBlockStorageSourceChainDetachPrepareChardev(char *chardevAlias) ++{ ++ g_autoptr(qemuBlockStorageSourceAttachData) backend = NULL; ++ g_autoptr(qemuBlockStorageSourceChainData) data = NULL; ++ ++ data = g_new0(qemuBlockStorageSourceChainData, 1); ++ backend = g_new0(qemuBlockStorageSourceAttachData, 1); ++ ++ backend->chardevAlias = chardevAlias; ++ backend->chardevAdded = true; ++ ++ if (VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, backend) < 0) ++ return NULL; ++ ++ return g_steal_pointer(&data); ++} + + /** + * qemuBlockStorageSourceChainAttach: +diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h +index 2ad2ce1a1f..862572e028 100644 +--- a/src/qemu/qemu_block.h ++++ b/src/qemu/qemu_block.h +@@ -94,6 +94,11 @@ struct qemuBlockStorageSourceAttachData { + char *driveAlias; + bool driveAdded; + ++ virDomainChrSourceDefPtr chardevDef; ++ char *chardevAlias; ++ char *chardevCmd; ++ bool chardevAdded; ++ + virJSONValuePtr authsecretProps; + char *authsecretAlias; + +@@ -153,6 +158,8 @@ qemuBlockStorageSourceChainDetachPrepareBlockdev(virStorageSourcePtr src); + qemuBlockStorageSourceChainDataPtr + qemuBlockStorageSourceChainDetachPrepareDrive(virStorageSourcePtr src, + char *driveAlias); ++qemuBlockStorageSourceChainDataPtr ++qemuBlockStorageSourceChainDetachPrepareChardev(char *chardevAlias); + + int + qemuBlockStorageSourceChainAttach(qemuMonitorPtr mon, +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index bc62843783..4b12be6ede 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -2152,9 +2152,16 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, + break; + + case VIR_DOMAIN_DISK_BUS_VIRTIO: +- if (qemuBuildVirtioDevStr(&opt, "virtio-blk", qemuCaps, +- VIR_DOMAIN_DEVICE_DISK, disk) < 0) { +- return NULL; ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ if (qemuBuildVirtioDevStr(&opt, "vhost-user-blk", qemuCaps, ++ VIR_DOMAIN_DEVICE_DISK, disk) < 0) { ++ return NULL; ++ } ++ } else { ++ if (qemuBuildVirtioDevStr(&opt, "virtio-blk", qemuCaps, ++ VIR_DOMAIN_DEVICE_DISK, disk) < 0) { ++ return NULL; ++ } + } + + if (disk->iothread) +@@ -2231,11 +2238,17 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, + virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SHARE_RW)) + virBufferAddLit(&opt, ",share-rw=on"); + +- if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &backendAlias) < 0) +- return NULL; ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ backendAlias = qemuDomainGetVhostUserChrAlias(disk->info.alias); + +- if (backendAlias) +- virBufferAsprintf(&opt, ",drive=%s", backendAlias); ++ virBufferAsprintf(&opt, ",chardev=%s", backendAlias); ++ } else { ++ if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &backendAlias) < 0) ++ return NULL; ++ ++ if (backendAlias) ++ virBufferAsprintf(&opt, ",drive=%s", backendAlias); ++ } + + virBufferAsprintf(&opt, ",id=%s", disk->info.alias); + if (bootindex) +@@ -2453,6 +2466,9 @@ qemuBuildBlockStorageSourceAttachDataCommandline(virCommandPtr cmd, + if (data->driveCmd) + virCommandAddArgList(cmd, "-drive", data->driveCmd, NULL); + ++ if (data->chardevCmd) ++ virCommandAddArgList(cmd, "-chardev", data->chardevCmd, NULL); ++ + if (data->storageProps) { + if (!(tmp = virJSONValueToString(data->storageProps, false))) + return -1; +@@ -2492,7 +2508,10 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd, + g_autofree char *copyOnReadPropsStr = NULL; + size_t i; + +- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk))) ++ return -1; ++ } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) { + if (virStorageSourceIsEmpty(disk->src)) + return 0; + +@@ -10437,6 +10456,39 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, + } + + ++/** ++ * qemuBuildStorageSourceAttachPrepareChardev: ++ * @src: disk source to prepare ++ * ++ * Prepare qemuBlockStorageSourceAttachDataPtr for vhost-user disk ++ * to be used with -chardev. ++ */ ++qemuBlockStorageSourceAttachDataPtr ++qemuBuildStorageSourceAttachPrepareChardev(virDomainDiskDefPtr disk) ++{ ++ g_autoptr(qemuBlockStorageSourceAttachData) data = NULL; ++ g_auto(virBuffer) chardev = VIR_BUFFER_INITIALIZER; ++ ++ data = g_new0(qemuBlockStorageSourceAttachData, 1); ++ ++ data->chardevDef = disk->src->vhostuser; ++ data->chardevAlias = qemuDomainGetVhostUserChrAlias(disk->info.alias); ++ ++ virBufferAddLit(&chardev, "socket"); ++ virBufferAsprintf(&chardev, ",id=%s", data->chardevAlias); ++ virBufferAddLit(&chardev, ",path="); ++ virQEMUBuildBufferEscapeComma(&chardev, disk->src->vhostuser->data.nix.path); ++ ++ qemuBuildChrChardevReconnectStr(&chardev, ++ &disk->src->vhostuser->data.nix.reconnect); ++ ++ if (!(data->chardevCmd = virBufferContentAndReset(&chardev))) ++ return NULL; ++ ++ return g_steal_pointer(&data); ++} ++ ++ + /** + * qemuBuildStorageSourceAttachPrepareCommon: + * @src: storage source +@@ -10513,6 +10565,31 @@ qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDefPtr disk, + } + + ++/** ++ * qemuBuildStorageSourceChainAttachPrepareChardev: ++ * @src: disk definition ++ * ++ * Prepares qemuBlockStorageSourceChainDataPtr for attaching a vhost-user ++ * disk's backend via -chardev. ++ */ ++qemuBlockStorageSourceChainDataPtr ++qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDefPtr disk) ++{ ++ g_autoptr(qemuBlockStorageSourceAttachData) elem = NULL; ++ g_autoptr(qemuBlockStorageSourceChainData) data = NULL; ++ ++ data = g_new0(qemuBlockStorageSourceChainData, 1); ++ ++ if (!(elem = qemuBuildStorageSourceAttachPrepareChardev(disk))) ++ return NULL; ++ ++ if (VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, elem) < 0) ++ return NULL; ++ ++ return g_steal_pointer(&data); ++} ++ ++ + static int + qemuBuildStorageSourceChainAttachPrepareBlockdevOne(qemuBlockStorageSourceChainData *data, + virStorageSourcePtr src, +diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h +index 4b1c2103c5..283aaf358c 100644 +--- a/src/qemu/qemu_command.h ++++ b/src/qemu/qemu_command.h +@@ -115,6 +115,10 @@ qemuBlockStorageSourceAttachDataPtr + qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, + const virDomainDef *def, + virQEMUCapsPtr qemuCaps); ++ ++qemuBlockStorageSourceAttachDataPtr ++qemuBuildStorageSourceAttachPrepareChardev(virDomainDiskDefPtr disk); ++ + int + qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src, + qemuBlockStorageSourceAttachDataPtr data, +@@ -126,6 +130,8 @@ qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDefPtr disk, + const virDomainDef *def, + virQEMUCapsPtr qemuCaps); + ++qemuBlockStorageSourceChainDataPtr ++qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDefPtr disk); + + qemuBlockStorageSourceChainDataPtr + qemuBuildStorageSourceChainAttachPrepareBlockdev(virStorageSourcePtr top, +diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c +index c315717c8a..b2ac1d37cc 100644 +--- a/src/qemu/qemu_domain.c ++++ b/src/qemu/qemu_domain.c +@@ -7250,6 +7250,14 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk, + return -1; + } + ++ if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER) { ++ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_USER_BLK)) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("vhostuser disk is not supported with this QEMU binary")); ++ return -1; ++ } ++ } ++ + for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) { + if (qemuDomainValidateStorageSource(n, qemuCaps) < 0) + return -1; +@@ -16767,6 +16775,11 @@ qemuDomainPrepareDiskSource(virDomainDiskDefPtr disk, + qemuDomainObjPrivatePtr priv, + virQEMUDriverConfigPtr cfg) + { ++ /* Nothing to prepare as it will use -chardev instead ++ * of -blockdev/-drive option. */ ++ if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER) ++ return 0; ++ + qemuDomainPrepareDiskCachemode(disk); + + /* set default format for storage pool based disks */ +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index b2ad021e4d..1791e3c902 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -10707,6 +10707,12 @@ qemuDomainBlockResize(virDomainPtr dom, + goto endjob; + } + ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", ++ _("block resize is not supported for vhostuser disk")); ++ goto endjob; ++ } ++ + /* qcow2 and qed must be sized on 512 byte blocks/sectors, + * so adjust size if necessary to round up. + */ +@@ -10798,6 +10804,12 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, + goto cleanup; + } + ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", ++ _("block stats are not supported for vhostuser disk")); ++ goto cleanup; ++ } ++ + if (blockdev) { + entryname = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; + } else { +@@ -10854,6 +10866,10 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, + disk = vm->def->disks[i]; + entryname = disk->info.alias; + ++ /* No stats to report for vhost-user disk */ ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) ++ continue; ++ + if (blockdev) + entryname = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; + +@@ -11483,6 +11499,12 @@ qemuDomainBlockPeek(virDomainPtr dom, + if (!(disk = qemuDomainDiskByName(vm->def, path))) + goto cleanup; + ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", ++ _("peeking is not supported for vhostuser disk")); ++ goto cleanup; ++ } ++ + if (disk->src->format != VIR_STORAGE_FILE_RAW) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("peeking is only supported for disk with 'raw' format not '%s'"), +@@ -11840,6 +11862,12 @@ qemuDomainGetBlockInfo(virDomainPtr dom, + goto endjob; + } + ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", ++ _("block info is not supported for vhostuser disk")); ++ goto endjob; ++ } ++ + if (virStorageSourceIsEmpty(disk->src)) { + virReportError(VIR_ERR_INVALID_ARG, + _("disk '%s' does not currently have a source assigned"), +@@ -18882,6 +18910,19 @@ typedef enum { + } qemuBlockIoTuneSetFlags; + + ++static bool ++qemuDomainDiskBlockIoTuneIsSupported(virStorageSourcePtr src) ++{ ++ if (virStorageSourceGetActualType(src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", ++ _("a block I/O throttling is not supported for vhostuser disk")); ++ return false; ++ } ++ ++ return true; ++} ++ ++ + /* If the user didn't specify bytes limits, inherit previous values; + * likewise if the user didn't specify iops limits. */ + static int +@@ -19250,6 +19291,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, + if (!(disk = qemuDomainDiskByName(def, path))) + goto endjob; + ++ if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src)) ++ goto endjob; ++ + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { + qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; + } else { +@@ -19257,6 +19301,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, + goto endjob; + } + ++ if (!qemuDomainDiskBlockIoTuneIsSupported(conf_disk->src)) ++ goto endjob; ++ + cur_info = qemuDomainFindGroupBlockIoTune(def, disk, &info); + + if (qemuDomainSetBlockIoTuneDefaults(&info, cur_info, +@@ -19440,6 +19487,9 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, + if (!(disk = qemuDomainDiskByName(def, path))) + goto endjob; + ++ if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src)) ++ goto endjob; ++ + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { + qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; + } else { +@@ -19461,6 +19511,10 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, + path); + goto endjob; + } ++ ++ if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src)) ++ goto endjob; ++ + reply = disk->blkdeviotune; + + /* Group name needs to be copied since qemuMonitorGetBlockIoThrottle +@@ -21389,6 +21443,12 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefPtr disk, + VIR_INFO("optional disk '%s' source file is missing, " + "skip getting stats", disk->dst); + ++ return qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr, ++ params); ++ } ++ ++ /* vhost-user disk doesn't support getting block stats */ ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { + if (qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr, + params) < 0) { + return -1; +@@ -22638,6 +22698,12 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, + if (!(src = qemuDomainGetStorageSourceByDevstr(dev, vm->def))) + goto endjob; + ++ if (virStorageSourceGetActualType(src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", ++ _("setting device threshold is not supported for vhostuser disk")); ++ goto endjob; ++ } ++ + if (!src->nodestorage && + qemuBlockNodeNamesDetect(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) + goto endjob; +diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c +index c9347bac04..cb571c3161 100644 +--- a/src/qemu/qemu_hotplug.c ++++ b/src/qemu/qemu_hotplug.c +@@ -702,7 +702,10 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, + if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) + goto cleanup; + +- if (blockdev) { ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk))) ++ goto cleanup; ++ } else if (blockdev) { + if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON) { + if (!(corProps = qemuBlockStorageGetCopyOnReadProps(disk))) + goto cleanup; +@@ -4280,7 +4283,12 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, + disk->info.alias, vm, vm->def->name); + + +- if (blockdev) { ++ if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { ++ char *chardevAlias = qemuDomainGetVhostUserChrAlias(disk->info.alias); ++ ++ if (!(diskBackend = qemuBlockStorageSourceChainDetachPrepareChardev(chardevAlias))) ++ goto cleanup; ++ } else if (blockdev) { + corAlias = g_strdup(diskPriv->nodeCopyOnRead); + + if (diskPriv->blockjob) { +diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +new file mode 100644 +index 0000000000..0a2b579e21 +--- /dev/null ++++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +@@ -0,0 +1,40 @@ ++LC_ALL=C \ ++PATH=/bin \ ++HOME=/tmp/lib/domain--1-QEMUGuest1 \ ++USER=test \ ++LOGNAME=test \ ++XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ ++XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ ++XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ ++QEMU_AUDIO_DRV=none \ ++/usr/bin/qemu-system-x86_64 \ ++-name guest=QEMUGuest1,debug-threads=on \ ++-S \ ++-object secret,id=masterKey0,format=raw,\ ++file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ ++-machine pc,accel=tcg,usb=off,dump-guest-core=off \ ++-cpu qemu64 \ ++-m 214 \ ++-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 \ ++-chardev socket,id=chr-vu-virtio-disk0,path=/tmp/vhost1.sock \ ++-device vhost-user-blk-pci,bus=pci.0,addr=0x2,chardev=chr-vu-virtio-disk0,\ ++id=virtio-disk0,bootindex=1 \ ++-chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \ ++-device vhost-user-blk-pci,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,\ ++id=virtio-disk1 \ ++-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ ++-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ ++resourcecontrol=deny \ ++-msg timestamp=on +diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c +index e07d6cf398..7b117f5984 100644 +--- a/tests/qemuxml2argvtest.c ++++ b/tests/qemuxml2argvtest.c +@@ -1209,6 +1209,7 @@ mymain(void) + VIR_FREE(driver.config->vxhsTLSx509certdir); + DO_TEST("disk-no-boot", NONE); + DO_TEST_CAPS_LATEST("disk-nvme"); ++ DO_TEST_CAPS_LATEST("disk-vhostuser"); + DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", + QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport"); +-- +2.27.0 + diff --git a/qemu_alias-introduce-qemuDomainGetVhostUserAlias-hel.patch b/qemu_alias-introduce-qemuDomainGetVhostUserAlias-hel.patch new file mode 100644 index 0000000..62c789e --- /dev/null +++ b/qemu_alias-introduce-qemuDomainGetVhostUserAlias-hel.patch @@ -0,0 +1,89 @@ +From 3c0064480e35b794992cb66ed904d60b5d143d9a Mon Sep 17 00:00:00 2001 +From: Luo Yifan +Date: Wed, 30 Nov 2022 18:13:36 +0800 +Subject: [PATCH 13/24] qemu_alias: introduce qemuDomainGetVhostUserAlias + helper +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Pavel Hrdina +Reviewed-by: Ján Tomko +Reviewed-by: Peter Krempa +(cherry picked from commit 6799cc3ada6830c5e4beac0cb770671466d7768a) +Signed-off-by: Luo Yifan +--- + src/qemu/qemu_alias.c | 6 ++++++ + src/qemu/qemu_alias.h | 2 ++ + src/qemu/qemu_command.c | 8 +++++--- + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c +index b0ea62af39..cfc6985c5a 100644 +--- a/src/qemu/qemu_alias.c ++++ b/src/qemu/qemu_alias.c +@@ -836,3 +836,9 @@ qemuDomainGetDBusVMStateAlias(void) + { + return "dbus-vmstate0"; + } ++ ++char * ++qemuDomainGetVhostUserChrAlias(const char *devalias) ++{ ++ return g_strdup_printf("chr-vu-%s", devalias); ++} +diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h +index 239747beb1..fc4bdf35fa 100644 +--- a/src/qemu/qemu_alias.h ++++ b/src/qemu/qemu_alias.h +@@ -97,3 +97,5 @@ const char *qemuDomainGetManagedPRAlias(void); + char *qemuDomainGetUnmanagedPRAlias(const char *parentalias); + + const char *qemuDomainGetDBusVMStateAlias(void); ++ ++char *qemuDomainGetVhostUserChrAlias(const char *devalias); +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index 7bd24f042c..9157008b73 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -2633,7 +2633,7 @@ qemuBuildVHostUserFsCommandLine(virCommandPtr cmd, + g_autofree char *chardev_alias = NULL; + g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER; + +- chardev_alias = g_strdup_printf("chr-vu-%s", fs->info.alias); ++ chardev_alias = qemuDomainGetVhostUserChrAlias(fs->info.alias); + + virCommandAddArg(cmd, "-chardev"); + virBufferAddLit(&opt, "socket"); +@@ -4603,9 +4603,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, + virBufferAsprintf(&buf, ",max_outputs=%u", video->heads); + } + } else if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) { ++ g_autofree char *alias = qemuDomainGetVhostUserChrAlias(video->info.alias); + if (video->heads) + virBufferAsprintf(&buf, ",max_outputs=%u", video->heads); +- virBufferAsprintf(&buf, ",chardev=chr-vu-%s", video->info.alias); ++ virBufferAsprintf(&buf, ",chardev=%s", alias); + } else if (video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS)) { + if (video->heads) +@@ -4724,6 +4725,7 @@ qemuBuildVhostUserChardevStr(const char *alias, + int *fd, + virCommandPtr cmd) + { ++ g_autofree char *chardev_alias = qemuDomainGetVhostUserChrAlias(alias); + char *chardev = NULL; + + if (*fd == -1) { +@@ -4732,7 +4734,7 @@ qemuBuildVhostUserChardevStr(const char *alias, + return NULL; + } + +- chardev = g_strdup_printf("socket,id=chr-vu-%s,fd=%d", alias, *fd); ++ chardev = g_strdup_printf("socket,id=%s,fd=%d", chardev_alias, *fd); + + virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); + *fd = -1; +-- +2.27.0 + diff --git a/qemu_capabilities-Fix-incorrect-alignment.patch b/qemu_capabilities-Fix-incorrect-alignment.patch new file mode 100644 index 0000000..ceb157d --- /dev/null +++ b/qemu_capabilities-Fix-incorrect-alignment.patch @@ -0,0 +1,53 @@ +From a5c093b432f5b195e2ceab61ee03e5e2f246c13f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= + +Date: Mon, 5 Dec 2022 06:23:29 -0500 +Subject: [PATCH 1/7] qemu_capabilities: Fix incorrect alignment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Hyman Huang(黄勇) +--- + src/qemu/qemu_capabilities.c | 8 ++++---- + src/qemu/qemu_capabilities.h | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c +index 239c34393f..d78d8f1431 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -569,10 +569,10 @@ VIR_ENUM_IMPL(virQEMUCaps, + "blockdev-reopen", + "storage.werror", + +- "migration-param.bandwidth", +- "migration-param.downtime", +- "migration-param.xbzrle-cache-size", +- ++ /* 360 */ ++ "migration-param.bandwidth", ++ "migration-param.downtime", ++ "migration-param.xbzrle-cache-size", + "object.qapified", + "vhost-user-blk", + ); +diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h +index a4e90d8dd5..165cacca3c 100644 +--- a/src/qemu/qemu_capabilities.h ++++ b/src/qemu/qemu_capabilities.h +@@ -550,10 +550,10 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ + QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */ + QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */ + ++ /* 360 */ + QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */ + QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */ + QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */ +- + QEMU_CAPS_OBJECT_QAPIFIED, /* parameters for object-add are formally described */ + QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */ + +-- +2.27.0 + diff --git a/qemu_capabilities-Introduce-QEMU_CAPS_CALC_DIRTY_RAT.patch b/qemu_capabilities-Introduce-QEMU_CAPS_CALC_DIRTY_RAT.patch new file mode 100644 index 0000000..ddac303 --- /dev/null +++ b/qemu_capabilities-Introduce-QEMU_CAPS_CALC_DIRTY_RAT.patch @@ -0,0 +1,59 @@ +From 14088d9c72f7b2d383fcc8a74f3f8ada913f5703 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= + +Date: Mon, 5 Dec 2022 06:34:56 -0500 +Subject: [PATCH 3/7] qemu_capabilities: Introduce QEMU_CAPS_CALC_DIRTY_RATE + capability +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +calc-dirty-rate command was introduced since qemu >=5.2.0. +Introduce QEMU_CAPS_CALC_DIRTY_RATE capability definition. + +Signed-off-by: Hyman Huang(黄勇) +Reviewed-by: Michal Privoznik +--- + src/qemu/qemu_capabilities.c | 4 ++++ + src/qemu/qemu_capabilities.h | 3 +++ + 2 files changed, 7 insertions(+) + +diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c +index d78d8f1431..c9b0a6c191 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -575,6 +575,9 @@ VIR_ENUM_IMPL(virQEMUCaps, + "migration-param.xbzrle-cache-size", + "object.qapified", + "vhost-user-blk", ++ ++ /* 365 */ ++ "calc-dirty-rate", + ); + + +@@ -1144,6 +1147,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { + { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE }, + { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, + { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON }, ++ { "calc-dirty-rate", QEMU_CAPS_CALC_DIRTY_RATE }, + }; + + struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { +diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h +index 165cacca3c..6245072fc3 100644 +--- a/src/qemu/qemu_capabilities.h ++++ b/src/qemu/qemu_capabilities.h +@@ -557,6 +557,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ + QEMU_CAPS_OBJECT_QAPIFIED, /* parameters for object-add are formally described */ + QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */ + ++ /* 365 */ ++ QEMU_CAPS_CALC_DIRTY_RATE, /* accepts calc-dirty-rate */ ++ + QEMU_CAPS_LAST /* this must always be the last item */ + } virQEMUCapsFlags; + +-- +2.27.0 + diff --git a/qemu_capabilities-Introduce-QEMU_CAPS_DIRTYRATE_MODE.patch b/qemu_capabilities-Introduce-QEMU_CAPS_DIRTYRATE_MODE.patch new file mode 100644 index 0000000..fdf6a9e --- /dev/null +++ b/qemu_capabilities-Introduce-QEMU_CAPS_DIRTYRATE_MODE.patch @@ -0,0 +1,55 @@ +From 5f7ef309cdd7237f945f43a29dab50fc61a4d1d0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= + +Date: Mon, 5 Dec 2022 06:54:11 -0500 +Subject: [PATCH 5/7] qemu_capabilities: Introduce QEMU_CAPS_DIRTYRATE_MODE + capability +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +mode option of calc-dirty-rate command since qemu >=6.2.0. +Introduce QEMU_CAPS_DIRTYRATE_MODE capability definition. + +Signed-off-by: Hyman Huang(黄勇) +Reviewed-by: Michal Privoznik +--- + src/qemu/qemu_capabilities.c | 2 ++ + src/qemu/qemu_capabilities.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c +index c9b0a6c191..2e9f2025ba 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -578,6 +578,7 @@ VIR_ENUM_IMPL(virQEMUCaps, + + /* 365 */ + "calc-dirty-rate", ++ "dirtyrate-param.mode", + ); + + +@@ -1160,6 +1161,7 @@ struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { + { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE }, + { "BLOCK_WRITE_THRESHOLD", QEMU_CAPS_BLOCK_WRITE_THRESHOLD }, + { "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED }, ++ { "calc-dirty-rate/arg-type/mode", QEMU_CAPS_DIRTYRATE_MODE }, + }; + + struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { +diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h +index 6245072fc3..00682eb52c 100644 +--- a/src/qemu/qemu_capabilities.h ++++ b/src/qemu/qemu_capabilities.h +@@ -559,6 +559,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ + + /* 365 */ + QEMU_CAPS_CALC_DIRTY_RATE, /* accepts calc-dirty-rate */ ++ QEMU_CAPS_DIRTYRATE_MODE , /* calc-dirty-rate accepts mode parameter */ + + QEMU_CAPS_LAST /* this must always be the last item */ + } virQEMUCapsFlags; +-- +2.27.0 + diff --git a/qemu_capabilities-introduce-vhost-user-blk-capabilit.patch b/qemu_capabilities-introduce-vhost-user-blk-capabilit.patch new file mode 100644 index 0000000..8bb632f --- /dev/null +++ b/qemu_capabilities-introduce-vhost-user-blk-capabilit.patch @@ -0,0 +1,378 @@ +From 8814b1949fd108c82e800abd40e48f4fe331908d Mon Sep 17 00:00:00 2001 +From: Luo Yifan +Date: Wed, 30 Nov 2022 18:13:36 +0800 +Subject: [PATCH 16/24] qemu_capabilities: introduce vhost-user-blk capability +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Pavel Hrdina +Reviewed-by: Ján Tomko +Reviewed-by: Peter Krempa +(cherry picked from commit c8b0d5b0ad21925729ba88fa297d3b74a57ffa04) +Signed-off-by: Luo Yifan +--- + src/qemu/qemu_capabilities.c | 2 ++ + src/qemu/qemu_capabilities.h | 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_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.x86_64.xml | 1 + + 27 files changed, 28 insertions(+) + +diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c +index 790b67add3..239c34393f 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -574,6 +574,7 @@ VIR_ENUM_IMPL(virQEMUCaps, + "migration-param.xbzrle-cache-size", + + "object.qapified", ++ "vhost-user-blk", + ); + + +@@ -1296,6 +1297,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { + { "rng-builtin", QEMU_CAPS_OBJECT_RNG_BUILTIN }, + { "tpm-spapr", QEMU_CAPS_DEVICE_TPM_SPAPR }, + { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS }, ++ { "vhost-user-blk", QEMU_CAPS_DEVICE_VHOST_USER_BLK }, + }; + + static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = { +diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h +index ffb366f84a..a4e90d8dd5 100644 +--- a/src/qemu/qemu_capabilities.h ++++ b/src/qemu/qemu_capabilities.h +@@ -555,6 +555,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ + QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */ + + QEMU_CAPS_OBJECT_QAPIFIED, /* parameters for object-add are formally described */ ++ QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */ + + QEMU_CAPS_LAST /* this must always be the last item */ + } virQEMUCapsFlags; +diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +index fddbfebddd..17efe68fca 100644 +--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +@@ -159,6 +159,7 @@ + + + ++ + 2012000 + 0 + 61700289 +diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +index 148b928520..8de40ac2f3 100644 +--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +@@ -157,6 +157,7 @@ + + + ++ + 2011090 + 0 + 42900289 +diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +index 2b1301d234..047e40e8f5 100644 +--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml ++++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +@@ -129,6 +129,7 @@ + + + ++ + 2012000 + 0 + 39100289 +diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +index 125346ffd7..8e85160640 100644 +--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +@@ -201,6 +201,7 @@ + + + ++ + 2011090 + 0 + 43100289 +diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +index b4b9d7ee01..13d8630fdb 100644 +--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +@@ -159,6 +159,7 @@ + + + ++ + 2012050 + 0 + 42900239 +diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +index 14550b8c7f..8428d86d81 100644 +--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml ++++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml +@@ -99,6 +99,7 @@ + + + ++ + 3000000 + 0 + 0 +diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +index 1479b2bb2d..90b95a6ac7 100644 +--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml ++++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml +@@ -99,6 +99,7 @@ + + + ++ + 3000000 + 0 + 0 +diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +index 96984d2bc3..a34621af95 100644 +--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml ++++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml +@@ -132,6 +132,7 @@ + + + ++ + 3000000 + 0 + 39100239 +diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +index f936f502c3..d1fe99c084 100644 +--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +@@ -207,6 +207,7 @@ + + + ++ + 3000000 + 0 + 43100239 +diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +index e1bc4beddb..b1cabb4b25 100644 +--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +@@ -164,6 +164,7 @@ + + + ++ + 3000091 + 0 + 42900240 +diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +index f462022fb5..189ff2eccc 100644 +--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +@@ -210,6 +210,7 @@ + + + ++ + 3000092 + 0 + 43100240 +diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +index 963c991d5e..51dadfb6b5 100644 +--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +@@ -173,6 +173,7 @@ + + + ++ + 4000000 + 0 + 61700240 +diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +index 2062fd0a90..6110f43f72 100644 +--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +@@ -178,6 +178,7 @@ + + + ++ + 4000000 + 0 + 42900240 +diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +index 3bd809f824..7dce580f7a 100644 +--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml ++++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +@@ -174,6 +174,7 @@ + + + ++ + 4000000 + 0 + 0 +diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +index b0ad30460b..8e19ca0d2b 100644 +--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml ++++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +@@ -174,6 +174,7 @@ + + + ++ + 4000000 + 0 + 0 +diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +index 44e527f570..4bb9269619 100644 +--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml ++++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +@@ -140,6 +140,7 @@ + + + ++ + 4000000 + 0 + 39100240 +diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +index ab43924eaa..c5e5ad831d 100644 +--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +@@ -215,6 +215,7 @@ + + + ++ + 4000000 + 0 + 43100240 +diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +index aff2c6fcad..2088a7ad87 100644 +--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +@@ -221,6 +221,7 @@ + + + ++ + 4001000 + 0 + 43100241 +diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +index 6aa36bac54..90b538c0d2 100644 +--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +@@ -183,6 +183,7 @@ + + + ++ + 4001050 + 0 + 61700242 +diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +index 871dc41579..a78fe3b8cd 100644 +--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +@@ -183,6 +183,7 @@ + + + ++ + 4001050 + 0 + 42900242 +diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +index d007ae65d6..2a2b52e081 100644 +--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml ++++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +@@ -142,6 +142,7 @@ + + + ++ + 4001050 + 0 + 39100242 +diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +index 383aa10f49..2efef26fdf 100644 +--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +@@ -227,6 +227,7 @@ + + + ++ + 4002000 + 0 + 43100242 +diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +index af282f33c1..e4b06b850b 100644 +--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +@@ -188,6 +188,7 @@ + + + ++ + 4002050 + 0 + 61700241 +diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +index 6842b3c28a..236107fec8 100644 +--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +@@ -193,6 +193,7 @@ + + + ++ + 4002050 + 0 + 42900241 +diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +index 577b96e6fa..9f7c960556 100644 +--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml ++++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +@@ -230,6 +230,7 @@ + + + ++ + 4002050 + 0 + 43100241 +-- +2.27.0 + diff --git a/qemu_command-Don-t-validate-accelerator-when-buildin.patch b/qemu_command-Don-t-validate-accelerator-when-buildin.patch new file mode 100644 index 0000000..6a94023 --- /dev/null +++ b/qemu_command-Don-t-validate-accelerator-when-buildin.patch @@ -0,0 +1,48 @@ +From d048a83b990b08cc3709d6c4a505877533a4d189 Mon Sep 17 00:00:00 2001 +From: Michal Privoznik +Date: Fri, 5 Nov 2021 09:33:45 +0100 +Subject: [PATCH 1/2] qemu_command: Don't validate accelerator when building + cmd line +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The domain accelerator was validated in qemuValidateDomainDef() +which calls virQEMUCapsIsVirtTypeSupported() which reports proper +error if QEMU is not capable of KVM/TCG. There is no point in +doing the validation again when building command line. + +cherry-pick from 69f2f632994c8f8b51f0d0e4be0f674054619654 + +Signed-off-by: Michal Privoznik +Signed-off-by: Hyman Huang(黄勇) +Tested-by: Kashyap Chamarthy +Reviewed-by: Peter Krempa +--- + src/qemu/qemu_command.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index 42f6e10b33..b009890e35 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -7084,15 +7084,8 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, + 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; ++ break; + } + + /* To avoid the collision of creating USB controllers when calling +-- +2.27.0 + diff --git a/qemu_command-remove-redundant-scsi-option-in-vhost-u.patch b/qemu_command-remove-redundant-scsi-option-in-vhost-u.patch new file mode 100644 index 0000000..89c71de --- /dev/null +++ b/qemu_command-remove-redundant-scsi-option-in-vhost-u.patch @@ -0,0 +1,32 @@ +From e9bfac2ed7631cca625d18f0a4a4a2644e2f14c6 Mon Sep 17 00:00:00 2001 +From: Luo Yifan +Date: Wed, 30 Nov 2022 18:13:37 +0800 +Subject: [PATCH 18/24] qemu_command: remove redundant scsi option in + vhost-user-blk + +There is no scsi property for qemu vhost-user-blk device, so we disable +formatting scsi property for vhost-user-blk device, and leave the property for +vhost-blk device as is. + +Signed-off-by: Luo Yifan +--- + src/qemu/qemu_command.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c +index 4b12be6ede..1e44291a8a 100644 +--- a/src/qemu/qemu_command.c ++++ b/src/qemu/qemu_command.c +@@ -2173,7 +2173,8 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, + virBufferAsprintf(&opt, ",event_idx=%s", + virTristateSwitchTypeToString(disk->event_idx)); + } +- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI)) { ++ if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_VHOST_USER && ++ virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI)) { + /* if sg_io is true but the scsi option isn't supported, + * that means it's just always on in this version of qemu. + */ +-- +2.27.0 + diff --git a/qemu_driver-Acquire-MODIFY-job-in-qemuDomainStartDir.patch b/qemu_driver-Acquire-MODIFY-job-in-qemuDomainStartDir.patch new file mode 100644 index 0000000..7cdc5d4 --- /dev/null +++ b/qemu_driver-Acquire-MODIFY-job-in-qemuDomainStartDir.patch @@ -0,0 +1,31 @@ +From 3030fc4e45964c3f7dec3dfe1646be703a4a398e Mon Sep 17 00:00:00 2001 +From: Michal Privoznik +Date: Mon, 29 Mar 2021 13:53:50 +0200 +Subject: [PATCH 2/7] qemu_driver: Acquire MODIFY job in + qemuDomainStartDirtyRateCalc() + +This API talks to QEMU and changes its internal state. Therefore, +it should acquire QEMU_JOB_MODIFY instead of QEMU_JOB_QUERY. + +Signed-off-by: Michal Privoznik +Reviewed-by: Jiri Denemark +--- + src/qemu/qemu_driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 1791e3c902..62806da86a 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -23332,7 +23332,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, + if (virDomainStartDirtyRateCalcEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + +- if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) ++ if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { +-- +2.27.0 + diff --git a/qemu_driver-Add-mode-parameter-to-qemuDomainStartDir.patch b/qemu_driver-Add-mode-parameter-to-qemuDomainStartDir.patch new file mode 100644 index 0000000..69a395f --- /dev/null +++ b/qemu_driver-Add-mode-parameter-to-qemuDomainStartDir.patch @@ -0,0 +1,146 @@ +From 56e4777e883bb3c11f4951848080104a2098277f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= + +Date: Mon, 5 Dec 2022 07:05:23 -0500 +Subject: [PATCH 7/7] qemu_driver: Add mode parameter to + qemuDomainStartDirtyRateCalc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add mode parameter to qemuDomainStartDirtyRateCalc API, 'mode' +option of 'calc-dirty-rate' command was introduced since +qemu >= 6.2. + +Signed-off-by: Hyman Huang(黄勇) +Reviewed-by: Michal Privoznik +--- + src/qemu/qemu_driver.c | 3 ++- + src/qemu/qemu_monitor.c | 5 +++-- + src/qemu/qemu_monitor.h | 17 ++++++++++++++++- + src/qemu/qemu_monitor_json.c | 14 +++++++++++++- + src/qemu/qemu_monitor_json.h | 3 ++- + 5 files changed, 36 insertions(+), 6 deletions(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 19d32b5fa3..8b19be46f1 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -23312,6 +23312,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, + virQEMUDriverPtr driver = dom->conn->privateData; + virDomainObjPtr vm; + qemuDomainObjPrivatePtr priv; ++ qemuMonitorDirtyRateCalcMode mode = QEMU_MONITOR_DIRTYRATE_CALC_MODE_PAGE_SAMPLING; + int ret = -1; + + virCheckFlags(0, -1); +@@ -23354,7 +23355,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, + VIR_DEBUG("Calculate dirty rate in next %d seconds", seconds); + + qemuDomainObjEnterMonitor(driver, vm); +- ret = qemuMonitorStartDirtyRateCalc(priv->mon, seconds); ++ ret = qemuMonitorStartDirtyRateCalc(priv->mon, seconds, mode); + + if (qemuDomainObjExitMonitor(driver, vm) < 0) + ret = -1; +diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c +index 05855c0ae9..04592fdcd5 100644 +--- a/src/qemu/qemu_monitor.c ++++ b/src/qemu/qemu_monitor.c +@@ -4646,13 +4646,14 @@ qemuMonitorTransactionBackup(virJSONValuePtr actions, + + int + qemuMonitorStartDirtyRateCalc(qemuMonitorPtr mon, +- int seconds) ++ int seconds, ++ qemuMonitorDirtyRateCalcMode mode) + { + VIR_DEBUG("seconds=%d", seconds); + + QEMU_CHECK_MONITOR(mon); + +- return qemuMonitorJSONStartDirtyRateCalc(mon, seconds); ++ return qemuMonitorJSONStartDirtyRateCalc(mon, seconds, mode); + } + + +diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h +index 9c797d5ff5..4f9b70d820 100644 +--- a/src/qemu/qemu_monitor.h ++++ b/src/qemu/qemu_monitor.h +@@ -1426,9 +1426,24 @@ qemuMonitorTransactionBackup(virJSONValuePtr actions, + const char *bitmap, + qemuMonitorTransactionBackupSyncMode syncmode); + ++/** ++ * qemuMonitorDirtyRateCalcMode: ++ * ++ * Dirty page rate calculation mode used during measurement. ++ */ ++typedef enum { ++ QEMU_MONITOR_DIRTYRATE_CALC_MODE_PAGE_SAMPLING = 0, ++ QEMU_MONITOR_DIRTYRATE_CALC_MODE_DIRTY_BITMAP, ++ QEMU_MONITOR_DIRTYRATE_CALC_MODE_DIRTY_RING, ++ QEMU_MONITOR_DIRTYRATE_CALC_MODE_LAST, ++} qemuMonitorDirtyRateCalcMode; ++ ++VIR_ENUM_DECL(qemuMonitorDirtyRateCalcMode); ++ + int + qemuMonitorStartDirtyRateCalc(qemuMonitorPtr mon, +- int seconds); ++ int seconds, ++ qemuMonitorDirtyRateCalcMode mode); + + typedef struct _qemuMonitorDirtyRateInfo qemuMonitorDirtyRateInfo; + typedef qemuMonitorDirtyRateInfo *qemuMonitorDirtyRateInfoPtr; +diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c +index 3ec7fc84f5..a1617cdfed 100644 +--- a/src/qemu/qemu_monitor_json.c ++++ b/src/qemu/qemu_monitor_json.c +@@ -9375,15 +9375,27 @@ qemuMonitorJSONGetJobInfo(qemuMonitorPtr mon, + return 0; + } + ++VIR_ENUM_IMPL(qemuMonitorDirtyRateCalcMode, ++ QEMU_MONITOR_DIRTYRATE_CALC_MODE_LAST, ++ "page-sampling", ++ "dirty-bitmap", ++ "dirty-ring"); ++ + int + qemuMonitorJSONStartDirtyRateCalc(qemuMonitorPtr mon, +- int seconds) ++ int seconds, ++ qemuMonitorDirtyRateCalcMode mode) + { + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; ++ const char *modestr = NULL; ++ ++ if (mode != QEMU_MONITOR_DIRTYRATE_CALC_MODE_PAGE_SAMPLING) ++ modestr = qemuMonitorDirtyRateCalcModeTypeToString(mode); + + if (!(cmd = qemuMonitorJSONMakeCommand("calc-dirty-rate", + "i:calc-time", seconds, ++ "S:mode", modestr, + NULL))) + return -1; + +diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h +index 531ff59a00..3fc67c4668 100644 +--- a/src/qemu/qemu_monitor_json.h ++++ b/src/qemu/qemu_monitor_json.h +@@ -694,7 +694,8 @@ int qemuMonitorJSONSetDBusVMStateIdList(qemuMonitorPtr mon, + + int + qemuMonitorJSONStartDirtyRateCalc(qemuMonitorPtr mon, +- int seconds); ++ int seconds, ++ qemuMonitorDirtyRateCalcMode mode); + + int + qemuMonitorJSONQueryDirtyRate(qemuMonitorPtr mon, +-- +2.27.0 + diff --git a/qemu_driver-Probe-capability-before-calculating-dirt.patch b/qemu_driver-Probe-capability-before-calculating-dirt.patch new file mode 100644 index 0000000..29157b5 --- /dev/null +++ b/qemu_driver-Probe-capability-before-calculating-dirt.patch @@ -0,0 +1,52 @@ +From 7889fb1123cbe6aca437797005b8b18b3d5ae93a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= + +Date: Sun, 20 Feb 2022 21:28:09 +0800 +Subject: [PATCH 4/7] qemu_driver: Probe capability before calculating dirty + page rate +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Probing QEMU_CAPS_CALC_DIRTY_RATE capability in advance +in case of failure when calculating dirty page rate. + +Signed-off-by: Hyman Huang(黄勇) +Signed-off-by: Michal Privoznik +Reviewed-by: Michal Privoznik +--- + src/qemu/qemu_driver.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index 62806da86a..19d32b5fa3 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -23332,6 +23332,16 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, + if (virDomainStartDirtyRateCalcEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + ++ if (virDomainObjCheckActive(vm) < 0) ++ goto cleanup; ++ ++ priv = vm->privateData; ++ if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CALC_DIRTY_RATE)) { ++ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", ++ _("QEMU does not support calculating dirty page rate")); ++ goto cleanup; ++ } ++ + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + +@@ -23343,7 +23353,6 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, + + VIR_DEBUG("Calculate dirty rate in next %d seconds", seconds); + +- priv = vm->privateData; + qemuDomainObjEnterMonitor(driver, vm); + ret = qemuMonitorStartDirtyRateCalc(priv->mon, seconds); + +-- +2.27.0 + diff --git a/security_util-Don-t-error-on-macOS-when-getting-sett.patch b/security_util-Don-t-error-on-macOS-when-getting-sett.patch new file mode 100644 index 0000000..2b66973 --- /dev/null +++ b/security_util-Don-t-error-on-macOS-when-getting-sett.patch @@ -0,0 +1,70 @@ +From 4d7194ab0b86772ea1a25eaf0e5e7e69fa2ba5e9 Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Wed, 30 Nov 2022 07:32:05 +0000 +Subject: [PATCH 10/24] security_util: Don't error on macOS when + getting/setting/moving XATTRs There are three internal APIs implemented in + this security_util file: virSecurityGetRememberedLabel(), + virSecuritySetRememberedLabel() and virSecurityMoveRememberedLabel() for + getting, setting and moving remembered seclabel. All three have a special + return value of -2 when XATTRs are not supported (for whatever reason) and + callers are expected to handle it gracefully. However, after my commit of + v5.7.0-rc1~115 it may happen that one of the three functions returned -1 even + though XATTRs are not supported (and thus -2 should have been returned). + +Fixes: 7cfb7aab573a031880a1f4fd20747843fea109ba +Signed-off-by: Michal Privoznik +Reviewed-by: Roman Bolshakov +Reviewed-by: Andrea Bolognani + +Signed-off-by: tangbin +(cherry-pick from d337543f06e43006869310adc3c0e60d76516ca9) +--- + src/security/security_util.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/security/security_util.c b/src/security/security_util.c +index 4f661fd75e..5503f18ffb 100644 +--- a/src/security/security_util.c ++++ b/src/security/security_util.c +@@ -272,8 +272,11 @@ virSecurityGetRememberedLabel(const char *name, + + *label = NULL; + +- if (!(ref_name = virSecurityGetRefCountAttrName(name))) ++ if (!(ref_name = virSecurityGetRefCountAttrName(name))) { ++ if (errno == ENOSYS) ++ return -2; + return -1; ++ } + + if (virFileGetXAttrQuiet(path, ref_name, &value) < 0) { + if (errno == ENOSYS || errno == ENODATA || errno == ENOTSUP) +@@ -367,8 +370,11 @@ virSecuritySetRememberedLabel(const char *name, + g_autofree char *value = NULL; + unsigned int refcount = 0; + +- if (!(ref_name = virSecurityGetRefCountAttrName(name))) ++ if (!(ref_name = virSecurityGetRefCountAttrName(name))) { ++ if (errno == ENOSYS) ++ return -2; + return -1; ++ } + + if (virFileGetXAttrQuiet(path, ref_name, &value) < 0) { + if (errno == ENOSYS || errno == ENOTSUP) { +@@ -455,8 +461,11 @@ virSecurityMoveRememberedLabel(const char *name, + + if (!(ref_name = virSecurityGetRefCountAttrName(name)) || + !(attr_name = virSecurityGetAttrName(name)) || +- !(timestamp_name = virSecurityGetTimestampAttrName(name))) ++ !(timestamp_name = virSecurityGetTimestampAttrName(name))) { ++ if (errno == ENOSYS) ++ return -2; + return -1; ++ } + + if (virFileGetXAttrQuiet(src, ref_name, &ref_value) < 0) { + if (errno == ENOSYS || errno == ENOTSUP) { +-- +2.27.0 + diff --git a/storagepoolxml2argvtest-Reorder-gluster-arguments.patch b/storagepoolxml2argvtest-Reorder-gluster-arguments.patch new file mode 100644 index 0000000..2a83465 --- /dev/null +++ b/storagepoolxml2argvtest-Reorder-gluster-arguments.patch @@ -0,0 +1,38 @@ +From 46d828475950bc3efbfe15a0e60571b7b40e1a62 Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Tue, 29 Nov 2022 09:58:35 +0000 +Subject: [PATCH 07/24] storagepoolxml2argvtest: Reorder gluster arguments + Commit f00cde7f1133 changed order of mount arguments in + virStorageBackendFileSystemMountGlusterArgs() and introduced per-OS mount + options and new test data. Old test data was left unmodified with prior order + of arguments. That causes a test failure on all OSes but Linux and FreeBSD, + i.e. on macOS: + + 15) Storage Pool XML-2-argv pool-netfs-gluster + ... + In + '/Users/roolebo/dev/libvirt/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv': + Offset 39 + Expect [-o direct-io-mode=1 /mnt/gluster] + Actual [/mnt/gluster -o direct-io-mode=1] + +Fixes: f00cde7f1133 ("storage: Add default mount options for fs/netfs storage pools") +Signed-off-by: Roman Bolshakov +Reviewed-by: Andrea Bolognani + +Signed-off-by: tangbin +(cherry-pick from 040de3fe4643a2e859f22e31415e479e99e52347) +--- + tests/storagepoolxml2argvdata/pool-netfs-gluster.argv | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv b/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv +index 4303d514ef..97be9cbeb3 100644 +--- a/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv ++++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv +@@ -1 +1 @@ +-mount -t glusterfs example.com:/volume -o direct-io-mode=1 /mnt/gluster ++mount -t glusterfs example.com:/volume /mnt/gluster -o direct-io-mode=1 +-- +2.27.0 + diff --git a/tests-Fix-false-positive-in-testConfRoundTrip.patch b/tests-Fix-false-positive-in-testConfRoundTrip.patch new file mode 100644 index 0000000..61e402f --- /dev/null +++ b/tests-Fix-false-positive-in-testConfRoundTrip.patch @@ -0,0 +1,37 @@ +From 5b813b4629554c6c7d85e14fe1b5927ebc99ffb3 Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Tue, 29 Nov 2022 08:50:42 +0000 +Subject: [PATCH 03/24] tests: Fix false positive in testConfRoundTrip + testConfRoundTrip would return 0 (success) if virConfWriteMem succeeded and + virTestCompareToFile failed. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Tim Wiederhake +Reviewed-by: Ján Tomko +Signed-off-by: Ján Tomko + +Signed-off-by: tangbin +(cherry-pick from 4b53ce9fa7a387b7df6821aeade5a95bf0141ba5) +--- + tests/virconftest.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/tests/virconftest.c b/tests/virconftest.c +index 83077342a9..d8f0cb137a 100644 +--- a/tests/virconftest.c ++++ b/tests/virconftest.c +@@ -51,8 +51,7 @@ static int testConfRoundTrip(const void *opaque) + fprintf(stderr, "Failed to process %s\n", srcfile); + goto cleanup; + } +- ret = virConfWriteMem(buffer, &len, conf); +- if (ret < 0) { ++ if (virConfWriteMem(buffer, &len, conf) < 0) { + fprintf(stderr, "Failed to serialize %s back\n", srcfile); + goto cleanup; + } +-- +2.27.0 + diff --git a/tests-Fix-lstat-mock-initialization-on-macOS.patch b/tests-Fix-lstat-mock-initialization-on-macOS.patch new file mode 100644 index 0000000..c67376e --- /dev/null +++ b/tests-Fix-lstat-mock-initialization-on-macOS.patch @@ -0,0 +1,32 @@ +From 94ce004ea840aed0c8159502a6a7bd2b0dd3f4a7 Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Tue, 29 Nov 2022 09:42:43 +0000 +Subject: [PATCH 06/24] tests: Fix lstat() mock initialization on macOS There + is a typo that prevents initialization of real_lstat. + +Fixes: d6b17edd5163 ("tests: Lookup extended stat/lstat in mocks") +Signed-off-by: Roman Bolshakov +Reviewed-by: Michal Privoznik + +Signed-off-by: tangbin +(cherry-pick from 2c0b3db3c7901f99eed8d95a652b176c9b04b45d) +--- + tests/virmockstathelpers.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c +index 5118ffc731..9cd6f5edb8 100644 +--- a/tests/virmockstathelpers.c ++++ b/tests/virmockstathelpers.c +@@ -169,7 +169,7 @@ static void virMockStatInit(void) + #endif + #ifdef MOCK_LSTAT + # ifdef __APPLE__ +- VIR_MOCK_REAL_INIT_ALIASED(stat, "lstat$INODE64"); ++ VIR_MOCK_REAL_INIT_ALIASED(lstat, "lstat$INODE64"); + # else + VIR_MOCK_REAL_INIT(lstat); + # endif +-- +2.27.0 + diff --git a/tests-Fix-vhostuser-args-file.patch b/tests-Fix-vhostuser-args-file.patch new file mode 100644 index 0000000..734ef39 --- /dev/null +++ b/tests-Fix-vhostuser-args-file.patch @@ -0,0 +1,31 @@ +From e1626a91423572d025f5647174798f257e9f9ce1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= + +Date: Tue, 6 Dec 2022 06:05:38 -0500 +Subject: [PATCH] tests: Fix vhostuser args file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Hyman Huang(黄勇) +--- + tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +index 0a2b579e21..a143b7cdc6 100644 +--- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args ++++ b/tests/qemuxml2argvdata/disk-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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +-- +2.27.0 + diff --git a/tests-qemuxml2argvdata-qtests-switch-to-accel.patch b/tests-qemuxml2argvdata-qtests-switch-to-accel.patch new file mode 100644 index 0000000..eddeb18 --- /dev/null +++ b/tests-qemuxml2argvdata-qtests-switch-to-accel.patch @@ -0,0 +1,314 @@ +From bc412bc2ab8afacaab05e1e393b7a92c773a9f64 Mon Sep 17 00:00:00 2001 +From: chenhuiying +Date: Tue, 6 Dec 2022 18:47:30 +0800 +Subject: [PATCH] tests: qemuxml2argvdata qtests switch to -accel + +fix "qemu: Switch to -accel" + +Signed-off-by: yezengruan +--- + tests/qemuxml2argvdata/aarch64-gic-default-both.args | 3 ++- + tests/qemuxml2argvdata/aarch64-gic-default-v2.args | 3 ++- + tests/qemuxml2argvdata/aarch64-gic-default-v3.args | 3 ++- + tests/qemuxml2argvdata/aarch64-gic-default.args | 3 ++- + tests/qemuxml2argvdata/aarch64-gic-none-both.args | 3 ++- + tests/qemuxml2argvdata/aarch64-gic-none-v2.args | 3 ++- + tests/qemuxml2argvdata/aarch64-gic-none-v3.args | 3 ++- + tests/qemuxml2argvdata/aarch64-gic-none.args | 3 ++- + tests/qemuxml2argvdata/cpu-check-full.args | 3 ++- + tests/qemuxml2argvdata/cpu-check-partial.args | 3 ++- + .../disk-backing-chains-index.x86_64-2.12.0.args | 3 ++- + .../disk-backing-chains-index.x86_64-latest.args | 3 ++- + tests/qemuxml2argvdata/mach-virt-console-native.args | 3 ++- + tests/qemuxml2argvdata/mach-virt-serial+console-native.args | 3 ++- + tests/qemuxml2argvdata/mach-virt-serial-compat.args | 3 ++- + tests/qemuxml2argvdata/pci-rom-disabled-invalid.args | 3 ++- + tests/qemuxml2argvdata/pseries-console-native.args | 3 ++- + tests/qemuxml2argvdata/pseries-serial+console-native.args | 3 ++- + tests/qemuxml2argvdata/pseries-serial-compat.args | 3 ++- + tests/qemuxml2argvdata/user-aliases2.args | 3 ++- + 20 files changed, 40 insertions(+), 20 deletions(-) + +diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/qemuxml2argvdata/aarch64-gic-default-both.args +index 2049250..9d28764 100644 +--- a/tests/qemuxml2argvdata/aarch64-gic-default-both.args ++++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.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-gic-default-v2.args b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args +index 6cf5839..9d6f2de 100644 +--- a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args ++++ b/tests/qemuxml2argvdata/aarch64-gic-default-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-default-v3.args b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args +index 2049250..9d28764 100644 +--- a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args ++++ b/tests/qemuxml2argvdata/aarch64-gic-default-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-gic-default.args b/tests/qemuxml2argvdata/aarch64-gic-default.args +index 6cf5839..9d6f2de 100644 +--- a/tests/qemuxml2argvdata/aarch64-gic-default.args ++++ b/tests/qemuxml2argvdata/aarch64-gic-default.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-none-both.args b/tests/qemuxml2argvdata/aarch64-gic-none-both.args +index 2049250..9d28764 100644 +--- a/tests/qemuxml2argvdata/aarch64-gic-none-both.args ++++ b/tests/qemuxml2argvdata/aarch64-gic-none-both.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-gic-none-v2.args b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args +index 6cf5839..9d6f2de 100644 +--- a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args ++++ b/tests/qemuxml2argvdata/aarch64-gic-none-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-none-v3.args b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args +index 2049250..9d28764 100644 +--- a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args ++++ b/tests/qemuxml2argvdata/aarch64-gic-none-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-gic-none.args b/tests/qemuxml2argvdata/aarch64-gic-none.args +index 6cf5839..9d6f2de 100644 +--- a/tests/qemuxml2argvdata/aarch64-gic-none.args ++++ b/tests/qemuxml2argvdata/aarch64-gic-none.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/cpu-check-full.args b/tests/qemuxml2argvdata/cpu-check-full.args +index 1e4af63..71891fd 100644 +--- a/tests/qemuxml2argvdata/cpu-check-full.args ++++ b/tests/qemuxml2argvdata/cpu-check-full.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-partial.args b/tests/qemuxml2argvdata/cpu-check-partial.args +index 1e4af63..71891fd 100644 +--- a/tests/qemuxml2argvdata/cpu-check-partial.args ++++ b/tests/qemuxml2argvdata/cpu-check-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 \ + -m 214 \ + -realtime mlock=off \ +diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args +index 4769133..bd87945 100644 +--- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args ++++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args +@@ -12,7 +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-index.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args +index 6c19da9..9148864 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 \ ++-machine pc,usb=off,dump-guest-core=off \ ++-accel tcg \ + -cpu qemu64 \ + -m 214 \ + -overcommit mem-lock=off \ +diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/qemuxml2argvdata/mach-virt-console-native.args +index 8d25e49..cd27ffe 100644 +--- a/tests/qemuxml2argvdata/mach-virt-console-native.args ++++ b/tests/qemuxml2argvdata/mach-virt-console-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+console-native.args b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args +index 8d25e49..cd27ffe 100644 +--- a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args ++++ b/tests/qemuxml2argvdata/mach-virt-serial+console-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-compat.args b/tests/qemuxml2argvdata/mach-virt-serial-compat.args +index 8d25e49..cd27ffe 100644 +--- a/tests/qemuxml2argvdata/mach-virt-serial-compat.args ++++ b/tests/qemuxml2argvdata/mach-virt-serial-compat.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/pci-rom-disabled-invalid.args b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args +index 1dd1695..b812421 100644 +--- a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args ++++ b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.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/pseries-console-native.args b/tests/qemuxml2argvdata/pseries-console-native.args +index 9a5f8c8..c8295f7 100644 +--- a/tests/qemuxml2argvdata/pseries-console-native.args ++++ b/tests/qemuxml2argvdata/pseries-console-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+console-native.args b/tests/qemuxml2argvdata/pseries-serial+console-native.args +index 9a5f8c8..c8295f7 100644 +--- a/tests/qemuxml2argvdata/pseries-serial+console-native.args ++++ b/tests/qemuxml2argvdata/pseries-serial+console-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-compat.args b/tests/qemuxml2argvdata/pseries-serial-compat.args +index 9a5f8c8..c8295f7 100644 +--- a/tests/qemuxml2argvdata/pseries-serial-compat.args ++++ b/tests/qemuxml2argvdata/pseries-serial-compat.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/user-aliases2.args b/tests/qemuxml2argvdata/user-aliases2.args +index cfc396c..aecaa24 100644 +--- a/tests/qemuxml2argvdata/user-aliases2.args ++++ b/tests/qemuxml2argvdata/user-aliases2.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 \ +-- +2.27.0 + diff --git a/vbox_network-fix-possible-memory-leak-in-vboxNetwork.patch b/vbox_network-fix-possible-memory-leak-in-vboxNetwork.patch new file mode 100644 index 0000000..cff67fa --- /dev/null +++ b/vbox_network-fix-possible-memory-leak-in-vboxNetwork.patch @@ -0,0 +1,47 @@ +From ecac0391e48796b570d540212629205889cab421 Mon Sep 17 00:00:00 2001 +From: wangmeiyang +Date: Thu, 1 Dec 2022 09:21:05 +0800 +Subject: [PATCH 22/24] vbox_network: fix possible memory leak in + vboxNetworkDefineCreateXML() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +virNetworkDef was not freed if the function failed in the first +two ifs, causing a possible memory leak. + +cherry-pick from ef83940524c1138dde616004be6cad5095b94001 + +Signed-off-by: Kristina Hanicova +Signed-off-by: Ján Tomko +Signed-off-by: Meiyang Wang +Reviewed-by: Ján Tomko +--- + src/vbox/vbox_network.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c +index 19b4d23ed8..dbee9a6f55 100644 +--- a/src/vbox/vbox_network.c ++++ b/src/vbox/vbox_network.c +@@ -375,7 +375,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) + PRUnichar *networkNameUtf16 = NULL; + char *networkNameUtf8 = NULL; + IHostNetworkInterface *networkInterface = NULL; +- virNetworkDefPtr def = virNetworkDefParseString(xml, NULL); ++ virNetworkDef *def = NULL; + virNetworkIPDefPtr ipdef = NULL; + unsigned char uuid[VIR_UUID_BUFLEN]; + vboxIID vboxnetiid; +@@ -393,7 +393,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start) + + VBOX_IID_INITIALIZE(&vboxnetiid); + +- if ((!def) || ++ if (!(def = virNetworkDefParseString(xml, NULL)) || + (def->forward.type != VIR_NETWORK_FORWARD_NONE) || + (def->nips == 0 || !def->ips)) + goto cleanup; +-- +2.27.0 + diff --git a/virCgroupKillRecursive-Return-1-on-failure-condition.patch b/virCgroupKillRecursive-Return-1-on-failure-condition.patch new file mode 100644 index 0000000..00c765c --- /dev/null +++ b/virCgroupKillRecursive-Return-1-on-failure-condition.patch @@ -0,0 +1,33 @@ +From 420abccb9e834938a5f03726559f044fb0aa426b Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Tue, 29 Nov 2022 09:36:57 +0000 +Subject: [PATCH 05/24] virCgroupKillRecursive: Return -1 on failure condition + virCgroupKillRecursive sneakily initializes 'ret' to 0 rather than the usual + -1. 401030499bf moved an error condition but didn't actually modify 'ret' + return the proper error code. + +Fixes: 401030499bf +Signed-off-by: Peter Krempa +Reviewed-by: Pavel Hrdina + +Signed-off-by: tangbin +(cherry-pick from 0778cff2aedd1da142562c396d482335df18e620) +--- + src/util/vircgroup.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c +index 70d85200cb..f52a8cc843 100644 +--- a/src/util/vircgroup.c ++++ b/src/util/vircgroup.c +@@ -2613,6 +2613,7 @@ virCgroupKillRecursive(virCgroupPtr group, int signum) + if (!backends || !backendAvailable) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("no cgroup backend available")); ++ ret = -1; + goto cleanup; + } + +-- +2.27.0 + diff --git a/virsh-cmdScreenshot-fix-cbdata-passing-to-virshStrea.patch b/virsh-cmdScreenshot-fix-cbdata-passing-to-virshStrea.patch new file mode 100644 index 0000000..bb935d8 --- /dev/null +++ b/virsh-cmdScreenshot-fix-cbdata-passing-to-virshStrea.patch @@ -0,0 +1,52 @@ +From 9fb4749f7ee4bbc75e0ad571a87abd76a0ae1b81 Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Tue, 29 Nov 2022 08:15:11 +0000 +Subject: [PATCH 01/24] virsh: cmdScreenshot: fix cbdata passing to + virshStreamSink The changes for sparse stream support started passing + virshStreamCallbackDataPtr to virshStreamSink instead of passing a simple + file descriptor, but forgot to adjust all the callers. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix it in cmdScreenshot as well. + +https://bugzilla.redhat.com/show_bug.cgi?id=1875195 + +Signed-off-by: Ján Tomko +Fixes: 9e745a97171e10f050962c166082439d6724e245 +Reviewed-by: Martin Kletzander + +Signed-off-by: tangbin +(cherry-pick from 3144e881b137123b0326157ce6dc23ca649c9270) +--- + tools/virsh-domain.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c +index 7033232015..c043ad3ce5 100644 +--- a/tools/virsh-domain.c ++++ b/tools/virsh-domain.c +@@ -5632,6 +5632,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) + bool generated = false; + char *mime = NULL; + virshControlPtr priv = ctl->privData; ++ virshStreamCallbackData cbdata; + + if (vshCommandOptStringReq(ctl, cmd, "file", (const char **) &file) < 0) + return false; +@@ -5667,7 +5668,10 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) + created = true; + } + +- if (virStreamRecvAll(st, virshStreamSink, &fd) < 0) { ++ cbdata.ctl = ctl; ++ cbdata.fd = fd; ++ ++ if (virStreamRecvAll(st, virshStreamSink, &cbdata) < 0) { + vshError(ctl, _("could not receive data from domain %s"), name); + goto cleanup; + } +-- +2.27.0 + diff --git a/virsh-domain-fix-mistake-in-cmdMigrateSetMaxDowntime.patch b/virsh-domain-fix-mistake-in-cmdMigrateSetMaxDowntime.patch new file mode 100644 index 0000000..7fb9063 --- /dev/null +++ b/virsh-domain-fix-mistake-in-cmdMigrateSetMaxDowntime.patch @@ -0,0 +1,38 @@ +From 59d5adb4620c57743d88dda8e1ac2d20ce7bd9d3 Mon Sep 17 00:00:00 2001 +From: wangmeiyang +Date: Wed, 30 Nov 2022 20:17:09 +0800 +Subject: [PATCH 21/24] virsh: domain: fix mistake in + cmdMigrateSetMaxDowntime() + +If there was added a new return value indicating success to the +function virDomainMigrateSetMaxDowntime() in the future, because +of the way the function is called it would be treated it as an +error state and would return false (indicating failure). This +patch fixes it, so that the call of the function follows the same +pattern as is currently set in libvirt. + +cherry-pick from 0987edbedf96fc920a73213fdad1ad9a119cbee7 + +Signed-off-by: Kristina Hanicova +Signed-off-by: Meiyang Wang +Reviewed-by: Michal Privoznik +--- + tools/virsh-domain.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c +index c043ad3ce5..6dd56168e3 100644 +--- a/tools/virsh-domain.c ++++ b/tools/virsh-domain.c +@@ -11221,7 +11221,7 @@ cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd) + goto done; + } + +- if (virDomainMigrateSetMaxDowntime(dom, downtime, 0)) ++ if (virDomainMigrateSetMaxDowntime(dom, downtime, 0) < 0) + goto done; + + ret = true; +-- +2.27.0 + diff --git a/vsh-Fix-completion-error-in-case-of-multiple-mac-add.patch b/vsh-Fix-completion-error-in-case-of-multiple-mac-add.patch new file mode 100644 index 0000000..6256b5c --- /dev/null +++ b/vsh-Fix-completion-error-in-case-of-multiple-mac-add.patch @@ -0,0 +1,54 @@ +From 35d3169072522ad6a2bd6f046fde7881c2837c74 Mon Sep 17 00:00:00 2001 +From: tangbinzy +Date: Wed, 30 Nov 2022 08:25:26 +0000 +Subject: [PATCH 11/24] vsh: Fix completion error in case of multiple mac + addresses We know that the bash completer automatically handle colon by + preceding it with an escape character backslash. While our bash autompletion + file vsh completes multiple items, In case there're multiple items which have + same prefix and the content of completion items contain colon(say mac + address), The vsh needs to correctly hands the backslash which are added by + bash completer, Otherwise the completion won't be successful. This patch + fixes this problem. + +e.g.: + + # virsh domiflist --domain VM + Interface Type Source Model MAC +------------------------------------------------------------- + vnet0 network default virtio 52:54:00:fb:7b:f5 + vnet1 bridge br0 virtio 52:54:00:80:1b:21 + +Before: + # virsh detach-interface --domain VM --mac + # virsh detach-interface --domain VM --mac 52\:54\:00\: + +After: + # virsh detach-interface --domain VM --mac + # virsh detach-interface --domain VM --mac 52\:54\:00\: + 52:54:00:80:1b:21 52:54:00:fb:7b:f5 + # virsh detach-interface --domain VM --mac 52\:54\:00\: + +Signed-off-by: Lin Ma +Reviewed-by: Michal Privoznik + +Signed-off-by: tangbin +(cherry-pick from 8a4343a4366580644bde3ba9b6a21bf740503416) +--- + tools/bash-completion/vsh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/bash-completion/vsh b/tools/bash-completion/vsh +index 363097c601..ca9d37a7ff 100644 +--- a/tools/bash-completion/vsh ++++ b/tools/bash-completion/vsh +@@ -39,6 +39,7 @@ _vsh_complete() + fi + + INPUT=( "${COMP_WORDS[@]:$i:$COMP_CWORD}" ) ++ INPUT[-1]=${INPUT[-1]//\\:/:} + + # Uncomment these lines for easy debug. + # echo; +-- +2.27.0 + -- Gitee