diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml
index 7055c7a812..652061b606 100644
--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
@@ -34,14 +34,14 @@
hvm
32
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
pc-0.11
pc
pc-0.10
isapc
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-i686
pc-0.11
pc
pc-0.10
@@ -67,7 +67,7 @@
isapc
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
pc-0.11
pc
pc-0.10
diff --git a/tests/capabilityschemadata/caps-test2.xml b/tests/capabilityschemadata/caps-test2.xml
index e676395916..6a45e4569b 100644
--- a/tests/capabilityschemadata/caps-test2.xml
+++ b/tests/capabilityschemadata/caps-test2.xml
@@ -53,7 +53,7 @@
isapc
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
pc-1.2
pc
pc-1.1
@@ -95,7 +95,7 @@
isapc
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
pc-1.2
pc
pc-1.1
diff --git a/tests/domainschemadata/backing-chains.xml b/tests/domainschemadata/backing-chains.xml
index 84df1dbd30..7fd3013474 100644
--- a/tests/domainschemadata/backing-chains.xml
+++ b/tests/domainschemadata/backing-chains.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/domainschemadata/qemu-simple-description-title.xml b/tests/domainschemadata/qemu-simple-description-title.xml
index 365801db08..d402cf0ab1 100644
--- a/tests/domainschemadata/qemu-simple-description-title.xml
+++ b/tests/domainschemadata/qemu-simple-description-title.xml
@@ -22,6 +22,6 @@
restart
restart
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/domainschemadata/timers.xml b/tests/domainschemadata/timers.xml
index 0bfb456971..8af431a807 100644
--- a/tests/domainschemadata/timers.xml
+++ b/tests/domainschemadata/timers.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml
index 297ca7fa81..a6eb5df987 100644
--- a/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml
+++ b/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml
@@ -39,7 +39,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml b/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml
index e2e7a40192..d620c3b116 100644
--- a/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml
+++ b/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml
@@ -29,7 +29,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/domainsnapshotxml2xmlout/full_domain.xml b/tests/domainsnapshotxml2xmlout/full_domain.xml
index 0b0b7e0cb5..a943d174f8 100644
--- a/tests/domainsnapshotxml2xmlout/full_domain.xml
+++ b/tests/domainsnapshotxml2xmlout/full_domain.xml
@@ -22,7 +22,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/domainsnapshotxml2xmlout/metadata.xml
index f0d8d07941..d09444a76d 100644
--- a/tests/domainsnapshotxml2xmlout/metadata.xml
+++ b/tests/domainsnapshotxml2xmlout/metadata.xml
@@ -26,7 +26,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-disk-virtio.xml b/tests/genericxml2xmlindata/generic-disk-virtio.xml
index 458c55d8f3..5731465a54 100644
--- a/tests/genericxml2xmlindata/generic-disk-virtio.xml
+++ b/tests/genericxml2xmlindata/generic-disk-virtio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-listen-back-compat-mismatch.xml b/tests/genericxml2xmlindata/generic-graphics-listen-back-compat-mismatch.xml
index eee3fed101..31589f6a49 100644
--- a/tests/genericxml2xmlindata/generic-graphics-listen-back-compat-mismatch.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-listen-back-compat-mismatch.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-listen-back-compat.xml b/tests/genericxml2xmlindata/generic-graphics-listen-back-compat.xml
index c60fb6e145..2b90bc4af4 100644
--- a/tests/genericxml2xmlindata/generic-graphics-listen-back-compat.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-listen-back-compat.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml
index 748e7f489d..c4641d9d9a 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-autoport-no.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-attr-only.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-listen-attr-only.xml
index f27eaa29f0..72f805e33a 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-attr-only.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-listen-attr-only.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-minimal.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-minimal.xml
index 8bbf5dfb00..2a4855e8e1 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-minimal.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-minimal.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address.xml
index 8bbf5dfb00..2a4855e8e1 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-manual-port.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-manual-port.xml
index 580c27da1f..a7514baff9 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-manual-port.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-manual-port.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-minimal.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-minimal.xml
index 4ffba85c2e..6b9abf9855 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-minimal.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-minimal.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml
index a32c20bcdc..50e2d13bf1 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-address.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml
index 980b64cab5..f56d65c398 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket-mismatch.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml
index ea3efca3bb..ab1c68bcbb 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-attr-listen-socket.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-listen.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-listen.xml
index 5f82abcd92..9e316b09de 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-socket-listen.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket-listen.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmlindata/generic-graphics-vnc-socket.xml b/tests/genericxml2xmlindata/generic-graphics-vnc-socket.xml
index cc26a33a1a..57fd1220d8 100644
--- a/tests/genericxml2xmlindata/generic-graphics-vnc-socket.xml
+++ b/tests/genericxml2xmlindata/generic-graphics-vnc-socket.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-disk-virtio.xml b/tests/genericxml2xmloutdata/generic-disk-virtio.xml
index 458c55d8f3..5731465a54 100644
--- a/tests/genericxml2xmloutdata/generic-disk-virtio.xml
+++ b/tests/genericxml2xmloutdata/generic-disk-virtio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-graphics-listen-back-compat.xml b/tests/genericxml2xmloutdata/generic-graphics-listen-back-compat.xml
index aa00d34a64..5dfffae3bb 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-listen-back-compat.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-listen-back-compat.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-attr-only.xml b/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-attr-only.xml
index ee4909b163..3d0c035434 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-attr-only.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-attr-only.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-minimal.xml b/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-minimal.xml
index ee4909b163..3d0c035434 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-minimal.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-minimal.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address.xml b/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address.xml
index ee4909b163..3d0c035434 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-manual-port.xml b/tests/genericxml2xmloutdata/generic-graphics-vnc-manual-port.xml
index 73010576f8..b18d8eb828 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-manual-port.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-manual-port.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-minimal.xml b/tests/genericxml2xmloutdata/generic-graphics-vnc-minimal.xml
index 73010576f8..b18d8eb828 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-minimal.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-minimal.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml
index f205e13125..aa2314a227 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-address.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml
index f205e13125..aa2314a227 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-attr-listen-socket.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml
index cb4e5ac8d3..bdcdfdc7cf 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml
index cb4e5ac8d3..bdcdfdc7cf 100644
--- a/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml
+++ b/tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuagentdata/qemuagent-fsinfo.xml b/tests/qemuagentdata/qemuagent-fsinfo.xml
index 9638feb5fb..d27d627b57 100644
--- a/tests/qemuagentdata/qemuagent-fsinfo.xml
+++ b/tests/qemuagentdata/qemuagent-fsinfo.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.args b/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.args
index f100d91c23..6a7e0e2867 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml b/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml
index f4a471aae1..55f6abc236 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.args b/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.args
index c085c82f88..b5172d08c8 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml b/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml
index 9bf4414b6e..7e32ae69a1 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.args b/tests/qemuargv2xmldata/qemuargv2xml-boot-network.args
index 92c4073e0e..22607075b4 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-network.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml b/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml
index b7e5ddef3b..19e99e2f77 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.args b/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.args
index 53dc4ef049..2527918e17 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml b/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml
index b039541231..0d8b61a0cd 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.args b/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.args
index 22d477646c..1fb74e47fa 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml b/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml
index 9beaf06ad3..c283fd7f00 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.args b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.args
index 1adfde1ccf..eba5b21760 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml
index 5a17374990..f512844427 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.args
index 10431aa6cd..4d518aa4f7 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml
index ea7653bf19..4b2a25e290 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.args
index caa730ca53..2e90073081 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml
index f8a7c779bf..d35e615683 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.args
index 182735712c..2781775981 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml
index 12d27d6f34..cef9ad5a28 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.args
index 2d7084e146..ade4af275f 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml
index ab7a9ed18c..37765ca7b1 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.args
index d49d408701..60a899252d 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml
index 08198f59b7..a4513711c0 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args
index 4d616e8c46..d72586d854 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml
index 544524b53a..5b0eaf3b69 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.args
index f810d4fb83..6109c23610 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml
index 70c5576460..a1c61a0266 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.args
index 2750f79f32..7d6a15cff6 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml
index 8ee2360205..b1a2b1ade4 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.args
index dced3ce2a9..5ed51f837b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml
index a18fda7b91..444792562c 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.args
index 7a25b1f3f0..8ea2ab2fbf 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml
index 38f3877ee8..fb896f05e6 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.args
index 7c22fb1668..20c3422d6d 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml
index f3afc3f037..ddc806e39f 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.args
index 48c3467ce2..79e192401f 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml
index d8eefcb0da..4ac347a21d 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.args
index aa480e3a7c..7480d11400 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml
index d14710faf1..f33a8c5d4d 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args
index deec7a70c1..8a487622af 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml
index 160fd9d4bd..21e29d4955 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args
index 44c95066b0..1530e894f2 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml
index 36da19e89c..1773b460bb 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.args
index 08edce1fe6..62cc5c0fe7 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml
index 05c731585c..23542fa1dd 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.args
index 2d5a9c3f9a..b0fdda2684 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml
index 74ec7589fa..d694a038eb 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.args
index 19deae4247..7a08d909fa 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml
index 25a4fb8daa..c7e5aa209b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.args
index 64f5ed5fff..accac3f55a 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml
index 979caf5b75..0fa308375f 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.args
index d6aae50568..19c115fc5b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml
index fc08eb3152..edd1b85633 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.args
index 4540deb423..0d8d7d7d5b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml
index 9c2e959c10..fb0c8379fa 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.args
index d33818f106..6727e85634 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml
index c3ef946825..3f30296c0b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.args
index 5ecac548d2..ead74e3110 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.args
@@ -6,7 +6,7 @@ LOGNAME=test \
QEMU_AUDIO_DRV=none \
CEPH_ARGS=-m \
mon1.example.org:6321,mon2.example.org:6322,mon3.example.org:6322 \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml
index 928a30c67f..e77237b311 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args
index bb78b454f4..4172a665fa 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml
index 331b6b9a87..8597267dc5 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.args
index bc6e497430..73ffd6dc85 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml
index fd4e505400..ab5d94c404 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.args
index c9aee83187..ee4c6fe78a 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml
index 0f789e2b8d..79c7160691 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.args
index d7a23028c8..edcba6b644 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml
index ff31982253..1967e4fcd8 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-many.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-many.args
index ee446a5617..fc539b7764 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-many.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-many.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml
index 834708c20f..439864eb59 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.args
index f41f8b4478..327c766f66 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml
index 8bf3990876..a66e3c82c1 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-usb.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.args
index 1cb71f7f86..b1e080f384 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml
index fb8ab06051..3b8081afff 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.args b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.args
index d1a3d07026..c778329609 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.args
@@ -5,7 +5,7 @@ USER=test \
LOGNAME=test \
XAUTHORITY=/root/.Xauthority \
DISPLAY=:0.1 \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml
index 5ff9913c9c..7d0d5dbcca 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.args b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.args
index 77088a8def..35ed8c6ef0 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.args
@@ -5,7 +5,7 @@ USER=test \
LOGNAME=test \
XAUTHORITY=/root/.Xauthority \
DISPLAY=:0.1 \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml
index f99a829611..4e89683c69 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.args b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.args
index 8d1dff5c19..5c22589f61 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml
index eaf69979b5..ca9e6a65af 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
index 8dce0bb9d1..a3141bd81b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
@@ -5,7 +5,7 @@ USER=test \
LOGNAME=test \
SASL_CONF_PATH=/root/.sasl2 \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml
index 7f66e5e9b7..003bd6a0b2 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.args b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.args
index ca30fdf361..fb4ee2c03c 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
index efd2601408..d71907f2a6 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
index 165a60cbde..33e20cc6fc 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
@@ -5,7 +5,7 @@ USER=test \
LOGNAME=test \
SASL_CONF_PATH=/root/.sasl2 \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml
index 7f66e5e9b7..003bd6a0b2 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.args b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.args
index 74eedc48f7..56563926bf 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml
index bafbcc2dd7..c21ccbc113 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.args b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.args
index a22809528a..780d4dcfea 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml
index 430d4402f1..7e815a6aed 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.args b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.args
index 4b157293df..4d24ce3b75 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest2 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml
index 111f659452..d6b9ce1d25 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.args b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.args
index bc986139ed..31baa50130 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.xml b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.xml
index d4a3f4154c..14514c9e7a 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.args b/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.args
index a9f13e01e3..aebba47a63 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml b/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml
index c71c65d871..41315b49f2 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hyperv.args b/tests/qemuargv2xmldata/qemuargv2xml-hyperv.args
index a6f37e3228..bb175a6dc6 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-hyperv.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-hyperv.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml b/tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml
index 53ce6420cb..3a7e381f36 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml
@@ -21,7 +21,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.args b/tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.args
index be5b4b8a8a..3f332cc7ac 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.xml b/tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.xml
index 83aeb03585..8c44bd12c2 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.args b/tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.args
index 3c0be91c28..90e667be54 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.xml b/tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.xml
index cf1a018198..0bdb42a815 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.args b/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.args
index ff9f1dcad5..2e9ad729e9 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml b/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml
index 3f21de315d..8af14fc7ee 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml
@@ -19,7 +19,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.args b/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.args
index 1bb74fe0cb..17e6d07b06 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.args
@@ -4,10 +4,10 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/kvm \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
--M pc \
+-M pc,accel=kvm \
-cpu qemu32,-kvmclock \
-m 214 \
-smp 6 \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml b/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml
index 888dd9e7e3..e960a2fb2b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml
@@ -18,7 +18,7 @@
restart
destroy
- /usr/bin/kvm
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.args
index 571eb602c5..44b3b3205c 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,dump-guest-core=off \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml
index 13c4ffe48c..766b10ff77 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.args
index 4415e951de..313c42d408 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,dump-guest-core=on \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml
index 05da1dc4c4..d4f45b5f0f 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args
index 90da94d46e..f405215766 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml
index d4091f7708..d84104937b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-mem-scale.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-migrate.args b/tests/qemuargv2xmldata/qemuargv2xml-migrate.args
index 8967a60cc1..d9dc1f62ea 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-migrate.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-migrate.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-migrate.xml b/tests/qemuargv2xmldata/qemuargv2xml-migrate.xml
index 9beaf06ad3..c283fd7f00 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-migrate.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-migrate.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.args b/tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.args
index 124fde980e..a18f9c8a81 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml
index 3752878260..aa4a9c0cef 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.args b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.args
index edd300d4cd..aca607bcb1 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml
index 9c08695779..3c1d123992 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml
@@ -16,7 +16,7 @@
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.args b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.args
index d757d5b4e3..9c466be7fc 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml
index 1697d00a54..4c64b520bc 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml
@@ -17,7 +17,7 @@
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.args b/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.args
index 22e83dc41c..6f62b15905 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml
index 5d9148fbd4..6b0801944c 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml
@@ -16,7 +16,7 @@
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.args b/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.args
index 2923d61c0b..cef4808969 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml
index 0456fa1f89..43d0399382 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml
@@ -13,7 +13,7 @@
destroy
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.args b/tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.args
index 124fde980e..a18f9c8a81 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml b/tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml
index 3752878260..aa4a9c0cef 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args
index 6032ed3176..4d74ae400e 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml
index 113bd19d7e..fa9a892dbc 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args
index 5a8da4d109..89eb4c13d4 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml
index 54194d78ff..57c4be83f1 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-user.args b/tests/qemuargv2xmldata/qemuargv2xml-net-user.args
index a6ac1ed18a..965c1bc94a 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-net-user.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-net-user.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-user.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-user.xml
index 133f5f11fb..039c1ed9b3 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-net-user.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-net-user.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-virtio.args b/tests/qemuargv2xmldata/qemuargv2xml-net-virtio.args
index 275c251245..4c161b5214 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-net-virtio.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-net-virtio.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml
index 7d8ff10f72..b7510a2df4 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.args b/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.args
index 423c078466..8ea25b7778 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.xml b/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.xml
index 9beaf06ad3..c283fd7f00 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga-display.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.args b/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.args
index 5f284e0e03..f770067f68 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.xml b/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.xml
index 9beaf06ad3..c283fd7f00 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.args b/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.args
index b5d1f2d732..db804431e5 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,mem-merge=off \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml b/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml
index b627d70f34..81b4a039b2 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.args b/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.args
index 54b5bb66e9..153d575be0 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml b/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml
index e4c4437c9e..82c1f9a5d8 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.args b/tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.args
index 19dafccf1f..4da7e40b08 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.xml b/tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.xml
index 5d6711791d..cc5bd18800 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.args b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.args
index c7f5ee8f68..52437e3d60 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml
index 21654d76a9..ccc90e9fce 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.args b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.args
index d09350ab36..159a2bda43 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml
index dd0b7d8cb9..215b9a7bb4 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-restore-v2.args b/tests/qemuargv2xmldata/qemuargv2xml-restore-v2.args
index b3366b85bf..947117728b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-restore-v2.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-restore-v2.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml b/tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml
index 9beaf06ad3..c283fd7f00 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.args b/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.args
index 9b759882b5..3182ce0bf3 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml
index eb46e9f70b..aac814d59f 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-file.args b/tests/qemuargv2xmldata/qemuargv2xml-serial-file.args
index 796b245985..afb1e0ca49 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-file.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-file.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml
index be03983133..64819a48ae 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-many.args b/tests/qemuargv2xmldata/qemuargv2xml-serial-many.args
index d23cb320fc..27fe413e99 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-many.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-many.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml
index 82737e4518..e00afe317f 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.args b/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.args
index 1adfde1ccf..eba5b21760 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml
index 5a17374990..f512844427 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.args b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.args
index a44caa1926..5d0d2a1bca 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml
index 316b9c4840..c35a4ca73a 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.args b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.args
index e08ad0f3d0..7428c86347 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml
index 492679a386..0d218f5482 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.args b/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.args
index b40adbf2c9..c6d9e1b8a5 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml
index 31a34ca477..f7069d541f 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.args b/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.args
index 80961d02a4..592673c0f1 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml
index 5a15fc7bb4..14fc8fc7c9 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.args b/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.args
index 1acbbbc0e1..dab722502b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml
index 8dca85187f..95aa1c7b9b 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-smp.args b/tests/qemuargv2xmldata/qemuargv2xml-smp.args
index ebaa83e142..9fa9c5e88d 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-smp.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-smp.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-smp.xml b/tests/qemuargv2xmldata/qemuargv2xml-smp.xml
index 1a525691ad..a987437921 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-smp.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-smp.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-sound.args b/tests/qemuargv2xmldata/qemuargv2xml-sound.args
index bc005d098e..778114d307 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-sound.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-sound.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-sound.xml b/tests/qemuargv2xmldata/qemuargv2xml-sound.xml
index 6d60d1e2bf..1f852b0cc5 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-sound.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-sound.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-watchdog.args b/tests/qemuargv2xmldata/qemuargv2xml-watchdog.args
index cb4033718a..0fe69c454c 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-watchdog.args
+++ b/tests/qemuargv2xmldata/qemuargv2xml-watchdog.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml b/tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml
index 29e1b0cc54..c29c3e1c54 100644
--- a/tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml
+++ b/tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml
index eb04e42b6b..cc0322762a 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml
@@ -15,6 +15,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
index bd792eaae5..1a769235a3 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
@@ -50,7 +50,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
index da40fec89a..662ed67390 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
@@ -50,7 +50,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml
index eb04e42b6b..cc0322762a 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml
@@ -15,6 +15,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
index bda1bc579a..cfb44cc433 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
@@ -50,7 +50,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
index 8621b62b76..866a81a2d7 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
@@ -50,7 +50,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-domain.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-domain.xml
index 1c2a5b1313..ef0e39397b 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-domain.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-domain.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
index 5c1d18b8fc..6457f4056b 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
@@ -26,7 +26,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
index 50fd9eab61..a025033e84 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
@@ -26,7 +26,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-domain.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-domain.xml
index 1c2a5b1313..ef0e39397b 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-domain.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-domain.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
index 75e8335587..58c088de88 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
@@ -26,7 +26,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
index a21db6f3b1..8adcb71041 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
@@ -26,7 +26,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml
index 1c2a5b1313..ef0e39397b 100644
--- a/tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml
+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
index 1ccbf2b519..f635e37b82 100644
--- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
index 5286267e7b..b52f049fb0 100644
--- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml
index 2c449f1d49..728af3391e 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml
index 47fc9708ac..051273ccf6 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
index 2a27e11dc8..cd03d0e09b 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
index 1683174f08..519d8161f7 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
index 7d2c3ab970..7be75f977b 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
index 0821028620..a83f1b5d73 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
index a262b9f254..0a51993cc1 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
index a262b9f254..0a51993cc1 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
index 2a27e11dc8..cd03d0e09b 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
index 17a0dc2285..d4434a18c7 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
index 2fbdee472f..493a615fd3 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
index cd686e678a..3609819ea3 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
index 8954fb5898..b88b220e33 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
index 8d09fee265..11ffd9fba8 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
index ac3fa4f420..9736f6bda7 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml
index 2c449f1d49..728af3391e 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
index 47fc9708ac..051273ccf6 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
index 3f14e70a1b..67cf41ad6b 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml
index b2c9a073a8..8f90ba21d7 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
index b2ea144389..63eb770078 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
index 2b11f21516..c12d18f716 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live.xml
index 66bc2af239..22fb2440c1 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml b/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml
index 04f497633b..341025c477 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml
index 34971fecee..3435dadbcf 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
index bfb189cd99..d3bec1ec8b 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
@@ -38,7 +38,7 @@
restart
restart
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml
index 0c61ee5cf1..19933bcf2d 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-440fx-wrong-root.xml b/tests/qemuxml2argvdata/qemuxml2argv-440fx-wrong-root.xml
index 93fef08214..8e4802d557 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-440fx-wrong-root.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-440fx-wrong-root.xml
@@ -17,7 +17,7 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
index c9eb68a7ca..4c35991717 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-aarch64 \
+/usr/bin/qemu-system-arm \
-name armtest \
-S \
-M virt \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.xml
index c145b5f246..0df5e4c926 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.xml
@@ -21,7 +21,7 @@
restart
restart
- /usr/bin/qemu-system-aarch64
+ /usr/bin/qemu-system-arm
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args
index 2f8c51610b..f145e3698b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/opt/qemu-installed/bin/qemu-system-aarch64 \
+/usr/bin/qemu-system-aarch64 \
-name aarch64-vgpu \
-S \
-M virt \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml
index d9a0128932..3695ebef70 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-video-virtio-gpu-pci.xml
@@ -11,7 +11,7 @@
cortex-a57
- /opt/qemu-installed/bin/qemu-system-aarch64
+ /usr/bin/qemu-system-aarch64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args b/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args
index e7f62d3012..9c6e9940c1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml b/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml
index 9b8f590016..824cc15b1b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml
@@ -19,7 +19,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-autoindex.args b/tests/qemuxml2argvdata/qemuxml2argv-autoindex.args
index fc14dc4062..67ec3f92a7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-autoindex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-autoindex.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/libexec/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name q35-test \
-S \
-M q35 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml b/tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml
index 1fb8c372c0..71b7a0eb23 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args
index c8bb7260fd..383b62061d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
-S \
-M s390-ccw \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.xml b/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.xml
index 248b609c5d..fe7c76037f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
index 7875e14a75..b36fca941a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml
index 441b489419..8922f09002 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args
index 2060ad2190..df85fb8f10 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.xml
index bc7c6f3675..59afb74a43 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args
index 57ac6003c2..01801d7288 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.xml b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.xml
index 3c25ad58bc..25c34ac94c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
index 9b63b680f4..438148cb83 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.xml b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.xml
index c47c9bfaec..d4ab2368ca 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
index 9b63b680f4..438148cb83 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml
index 9ea2f18ffc..8443ac28ff 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-os-interleave.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-os-interleave.xml
index 0c3b925e2a..8e2286e519 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-os-interleave.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-os-interleave.xml
@@ -19,7 +19,7 @@
restart
restart
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args
index c5fe72bd56..7be3398532 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name test-bios \
-S \
-machine pc-q35-2.5,accel=tcg,smm=on \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml
index 0ddddfe393..f250557348 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml
@@ -20,7 +20,7 @@
restart
restart
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
index 92e6362596..13e52afabc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name test-bios \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml
index 0eee88c588..d3a2465f87 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml
@@ -19,7 +19,7 @@
restart
restart
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args
index fdd9a4e1e1..2ee28c45aa 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name test-bios \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml
index 52acba4099..a9481e7b5a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml
@@ -16,7 +16,7 @@
restart
restart
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args
index b5a5cc0f9c..5a50729449 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.xml
index e2a9999ee8..c70d3b2afd 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-group-num.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.args
index b656aeae51..f5874b9b45 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml
index c740751dbe..f2e7528d98 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max-length.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
index 58c15c86db..66df02dafd 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml
index ac4a0c05a5..55e118fcd3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
index 11833e63fb..008e51fa41 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml
index 1e1c0e5bd0..ef5651c535 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
index 4ed60f8da2..dbb8ee2d7f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml
index 3b8080dde0..48fd37dba2 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml
@@ -32,7 +32,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
index 4ed60f8da2..dbb8ee2d7f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml
index f7efcb9301..a0b7b034d3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
index 32de47b4d2..afbe9faf3c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
index 9c0e667f7c..584323facc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
index c18873e7f9..9b71af3def 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml
index b20013b702..6b2bcd8b87 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
index 45da3870fd..15e8667816 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml
index b20013b702..6b2bcd8b87 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-dev+order.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-dev+order.xml
index ad3d88ce13..28490b5239 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-dev+order.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-dev+order.xml
@@ -15,7 +15,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
index caaf75892e..cb9f82421c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc-q35-2.4 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.xml
index b94ad85994..af685d9c98 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
index 2c5387074f..f280cf7dc4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
index 390bc67404..5731302348 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
index 81fa346364..e263950b8d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml
index 38df8feeb2..8d9c1ae7d1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
index ef59ff70b1..2f3f157399 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml
index 38df8feeb2..8d9c1ae7d1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-with-timeout.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-with-timeout.xml
index 0f9bd0a628..19850da21f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-with-timeout.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
index ef59ff70b1..2f3f157399 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml
index 8727c180bc..09d4268d23 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args
index 4641c1e562..35c62091a3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.xml
index 831933eca1..83b49abddc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout-invalid.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout-invalid.xml
index 6c1f2d795f..e0c81ae10f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout-invalid.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout-invalid.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
index a16bc296f3..ed43b16995 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.xml
index 82e366c79b..09232cb28e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
index f56a9d5b2b..f9f03abe7f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml
index 831933eca1..83b49abddc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
index a258c8a933..e429441297 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml
index 5e029bdab4..acfcd45a40 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml
@@ -17,7 +17,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
index bf57a6e750..35a8bdda6c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
index ad421dae9f..f0cb4bc7a1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
index 348c1105d5..ae271a320b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml
index 4a6fbd4a3a..a8e094e854 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml
@@ -12,7 +12,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
index 6238dca6e0..fbbacbb1b0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml
index b20013b702..6b2bcd8b87 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
index 10ae65ec9d..fdb5aec4c0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc-q35-2.4 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.xml b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.xml
index b94ad85994..af685d9c98 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
index f70b9534ce..f3f81b2f30 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml
index b5e5c231ed..240356d7c6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
index 81d4c7e599..4bbdaecf32 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml
index 3269793f01..95d0c20647 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml
@@ -12,7 +12,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
index 1dc068eea7..1af132e777 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml
index 3269793f01..95d0c20647 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml
@@ -12,7 +12,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
index 1a0053578f..18ac47b63c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml
index a94084c8fc..042b94fa81 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
index 5d75d3d8c2..5f9ae478bd 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.xml
index 0da249217b..d84d990236 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
index 229e31e8fc..d87331ad35 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.xml
index 5592c8f538..32d4b8b1bd 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
index fe7d5423f3..1d1501b393 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.xml
index 74badedc81..fc06dba501 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
index 7a0cf87c1b..ea3238058f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.xml
index 044b36968b..00ed2c63d5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
index 3e7fd52261..2b7296531a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml
index cef04453d6..cd0c0ab256 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.xml
@@ -12,7 +12,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
index 3f0d4e2180..16d2e4a4b3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml
index 4ca270d55c..fdeb847da3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-chardev-label.xml b/tests/qemuxml2argvdata/qemuxml2argv-chardev-label.xml
index 09094aff1d..05a480bc8d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-chardev-label.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-chardev-label.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
index c47e2dbe0f..89dbb3b66e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.xml
index 1fe968b666..94d2dd0333 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.xml
@@ -23,7 +23,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
index 8535d12307..758d28492f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.args
@@ -5,7 +5,7 @@ USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
TZ=Europe/Paris \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml
index 85e6e98b53..626b9efcc0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
index e978689a56..55d95e3d28 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.xml
index 3aed49fa44..6ae8b809e1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.xml
@@ -17,7 +17,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
index 82482a9eff..17d6f97f81 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.xml
index 91d57b9543..c29b761b28 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
index 5a015a8f3a..958ebc8e7a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
index 642d2764ff..551459114a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args
index cd38855b50..c076b86b0b 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/kvm \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.xml
index c54af6a5a6..76eead99ad 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.xml
@@ -18,7 +18,7 @@
restart
destroy
- /usr/bin/kvm
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
index 3c210455ae..a19de04ae7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml
index 9da4df0de3..bddb259630 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
index a8716a22da..0560d3f413 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml
index e57e884e6d..d3e6396cbf 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
index bb7dbff308..5cde8aa453 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml
index 0c33317c56..1789e003c8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
index 0e7f26a2c2..ff7678ebcc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml
index 1d8ed54dd1..939e3aeff2 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
index 1a63b9ab7b..b92fde74e0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
index 3eaeffab83..359511a690 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml
index ded204a4fc..74f12409ec 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
index 17f60550cd..839210c8d4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
-S \
-M s390-virtio \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.xml
index 7d28b557f8..5a41772909 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-sclp.xml
@@ -12,7 +12,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
index 73868d4366..f0aaecba06 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
-S \
-M s390-ccw \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.xml
index 855a9d2cdb..fc300db20e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.xml
@@ -11,7 +11,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
index abe3e3b01b..58a8a1fa06 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml
index 31d2793fdb..c26a9c294f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
index 06ef1b76cd..dafc88b3f8 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-s390x \
-name QEMUGuest1 \
-S \
-M s390-virtio \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml
index 221232de11..2150e79829 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml
@@ -11,7 +11,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
index 4cc7023810..a2f87aace6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml
index 812e5dde50..b9c9c5785f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
index 3361383386..60bdb37286 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=spice \
-/usr/libexec/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name fdr \
-S \
-M rhel6.1.0 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml
index 2ae14f6620..5aedadcfcb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml
@@ -21,7 +21,7 @@
restart
restart
- /usr/libexec/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args
index 783a4ab196..b4784e61c3 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.xml
index 9ef24cd521..70ef4ac528 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args
index ef0e68b147..27ec8dbc74 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml
index 3af49f979e..52f1358caf 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args
index e089a745b3..9910c0cadc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml
index 6a6722d6e5..f4ff931f03 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml
@@ -18,6 +18,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args
index 2e74a67039..8aeab23d16 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml
index 00617ebd6f..a870807c21 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml
@@ -18,6 +18,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args
index 24d9f53067..a014974094 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.xml
index 314cdf52a4..60feb93c42 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none.xml
@@ -14,6 +14,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args
index b6a5d4dd45..2cb937b4d7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.xml
index 286d2d5d78..516896d174 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-none2.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args
index decf7fdd4a..eeffae5da4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.xml
index 3dd45a704b..65bbb46b72 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial.xml
@@ -14,6 +14,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args
index bd4cefaebb..2cb937b4d7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.xml
index 6c7690a955..a05d9c3492 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-default-partial2.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.xml
index 653c2aaade..90c43b441d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-full.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args
index bd4cefaebb..2cb937b4d7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.xml
index 6320746262..4ef953e813 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-none.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.xml
index 8e7850df88..338412bae4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-check-partial.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml
index 2a79826b3a..cf4d252084 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-empty.xml
@@ -15,7 +15,7 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args
index db14ac4dc7..4f40d61170 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.xml
index 59d50d378e..62ba7134af 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.xml
@@ -21,7 +21,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args
index ce964a6734..0e82ac27d6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.xml
index c2c494bab0..fde0f354bb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.xml
@@ -21,7 +21,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args
index 4a7f174696..98bd5d6e25 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml
index ebf5830c88..40893e4022 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml
@@ -23,6 +23,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args
index 628be8324d..4b09702437 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml
index f51f9edfbb..4cd1d18216 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml
@@ -30,6 +30,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args
index 628be8324d..4b09702437 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml
index 7fa77c56b1..4239796f31 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml
@@ -30,6 +30,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args
index 6afcc584ac..70c00077cc 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml
index 85642e9a9f..f1a843b7e0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml
@@ -20,6 +20,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args
index 6eead4baef..5095617003 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml
index 98689f3a60..5435ab2847 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args
index 7ae4ac5ad4..3338f64270 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.xml
index 7e3f617b85..21697eda0f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.xml
@@ -14,6 +14,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args
index 26b838ef1e..ba73426567 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml
index a1136e2765..206eecb87d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml
@@ -14,6 +14,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-features.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-features.xml
index 530cc9aa64..22034eae5d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-features.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-features.xml
@@ -24,7 +24,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml
index d0219d5dbe..baf2bdf827 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args
index b0f8f5202b..ea249db490 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.xml
index a33362f251..bf9c188023 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args
index a57ef9ad4f..eeffae5da4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml
index 7e3f617b85..21697eda0f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml
@@ -14,6 +14,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
index fa960c38e5..09548c1b4e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.xml
index fceb6a6d6d..639dd5f6d9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.xml
@@ -23,7 +23,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args
index aa73f89013..a014974094 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml
index f1233e1ee5..60feb93c42 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml
@@ -14,6 +14,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.args
index 035f250195..c7b6d26943 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.xml
index 58718aac1c..99987ba15a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-hotplug-startup.xml
@@ -24,6 +24,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args
index 6e50dc1c94..6b524cfdd5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml
index 003a1edfba..25d3ee757a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml
@@ -18,7 +18,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args
index decf7fdd4a..ca2331e703 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml
index 5879d35479..cedd7c658c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args
index d9821b6aa5..65fc5e2212 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml
index fe6739c282..e6fbaebfe0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml
@@ -20,6 +20,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml
index abb0e9c2d2..8163c4c369 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml
@@ -20,6 +20,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args
index 5ff7a43a2a..7cef2dd2ad 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml
index 08662d0927..b022384e97 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.xml
@@ -20,7 +20,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml
index ad3160741c..e209150a55 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml
@@ -21,6 +21,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml
index 244a6154bf..7e05916f78 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.xml
@@ -20,7 +20,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args
index 2613649a8b..8cf90965c9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.xml
index fbdc5e60cf..ee6b6aa870 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-no-memory-element.xml
@@ -19,6 +19,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args
index 2613649a8b..8cf90965c9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml
index 20120e956c..b21941d51a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml
@@ -20,6 +20,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args
index 2613649a8b..8cf90965c9 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml
index a90e7a209e..b85b19f5e0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml
@@ -20,6 +20,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml
index ea2dc8166f..e2b9e9014d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml
@@ -20,6 +20,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml
index 7652a97ef3..469710c419 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml
@@ -14,6 +14,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args
index 0b4ce4c68c..43dc13f448 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-s390x \
-name guest1 \
-S \
-M s390-ccw-virtio \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.xml
index 47279c4d69..a18e7e0b4f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-features.xml
@@ -17,7 +17,7 @@
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args
index 48850b8ca2..0f7c08f5b6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-s390x \
-name guest1 \
-S \
-M s390-ccw-virtio \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.xml
index de55f22c9b..78d07a1c89 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-s390-zEC12.xml
@@ -15,7 +15,7 @@
zEC12
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-s390x
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args
index e011095409..20032555ec 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml
index 84c77eac14..f17c75b6af 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml
@@ -33,6 +33,6 @@
restart
destroy
- /usr/bin/qemu-kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args
index eb001c1e21..9eaa76a2ed 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml
index 6f70aa3597..9d77d10a5c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args
index 53764ff112..1f5f2f7e08 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml
index ab561fdd3c..9d9701914a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml
@@ -17,6 +17,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args
index eb001c1e21..9eaa76a2ed 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml
index 6f70aa3597..9d77d10a5c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.args
index 50223fab2b..32e3d4430d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.xml
index 72afe6cd27..adb118c527 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-tsc-frequency.xml
@@ -24,7 +24,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreads.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreads.xml
index 00d8bf0120..311a1d3604 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreads.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreads.xml
@@ -25,7 +25,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-toomuch.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-toomuch.xml
index 7cae303278..830177e603 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-toomuch.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-toomuch.xml
@@ -25,7 +25,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-zeropriority.xml
index 47580c91ca..3d049e31a5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-zeropriority.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched-zeropriority.xml
@@ -24,7 +24,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched.xml
index 0a3ffc7c71..56cb434e4a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreadsched.xml
@@ -25,7 +25,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-vcpusched-overlap.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-vcpusched-overlap.xml
index cbbe7dc18b..2c1667a633 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-vcpusched-overlap.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-vcpusched-overlap.xml
@@ -24,7 +24,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
index d732b04980..0e48316d16 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.xml
index 1e7f3bcd53..cb03330cc6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.xml
@@ -21,7 +21,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args
index d732b04980..0e48316d16 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml
index e6ef51dc27..b67c71c0e6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml
@@ -25,7 +25,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args b/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args
index b57f143fc6..b1f3fc5ddf 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1,debug-threads=on \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.xml b/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.xml
index bfdd1aa5ca..9ef92f8feb 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-debug-threads.xml
@@ -18,7 +18,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml
index 78892480fa..8ed66fdcc0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args
index b0d1f04a88..068e810857 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml
index bbf5d55b7f..b1cab775a0 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-backing-chains.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-backing-chains.xml
index b80b9d2bbc..703c60c439 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-backing-chains.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-backing-chains.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
index 9367a960ea..f7c5c9cb2f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml
index 2b400c3d61..ea5c861773 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
index 1477bbb8f7..9f9576413d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
index 705c493fac..7de5a6ebf5 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args
index 16b9a001ac..8562c24874 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc-1.2 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml
index 660dedf921..df41e58326 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/bin/kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args
index 2c1481868b..0961339a5c 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc-1.2 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml
index b4a0f52690..57049a2665 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/bin/kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args
index 3c60478b2a..2367acf183 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc-1.2 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml
index 8c9bc8af43..8a1286cb1d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/bin/kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args
index 3934842756..05d827e2d1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc-1.2 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml
index b8a60eddf3..41b5a89b6d 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/bin/kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args
index e5b46dad4d..fead6f38b1 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/kvm \
+/usr/bin/qemu-system-x86_64 \
-name QEMUGuest1 \
-S \
-M pc-1.2 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml
index b311237cb6..e2cb4a006a 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.xml
@@ -18,7 +18,7 @@
restart
restart
- /usr/bin/kvm
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
index 0231d03b37..bb2aaae661 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
-S \
-M pc \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.xml
index f1a045ceba..77e64448f6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu
+ /usr/bin/qemu-system-i686
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
index 0655ee2f6f..5fdd938d8f 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args
@@ -4,7 +4,7 @@ HOME=/home/test \
USER=test \
LOGNAME=test \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
+/usr/bin/qemu-system-x86_64 \
-name test \
-S \
-M pc-0.13 \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.xml
index 4d4c5d7157..28e865b212 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.xml
@@ -15,7 +15,7 @@
restart
restart
-