diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml
index 4b3895dbd1..65c3bba7c4 100644
--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
@@ -35,14 +35,14 @@
hvm
32
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
pc-0.11
pc
pc-0.10
isapc
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
pc-0.11
pc
pc-0.10
diff --git a/tests/domainschemadata/backing-chains.xml b/tests/domainschemadata/backing-chains.xml
index 7fd3013474..908eba5c1a 100644
--- a/tests/domainschemadata/backing-chains.xml
+++ b/tests/domainschemadata/backing-chains.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/domainschemadata/timers.xml b/tests/domainschemadata/timers.xml
index 8af431a807..75131bd7c1 100644
--- a/tests/domainschemadata/timers.xml
+++ b/tests/domainschemadata/timers.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/cachetune-cdp.xml b/tests/genericxml2xmlindata/cachetune-cdp.xml
index 9f4c13906e..10ab8a9f92 100644
--- a/tests/genericxml2xmlindata/cachetune-cdp.xml
+++ b/tests/genericxml2xmlindata/cachetune-cdp.xml
@@ -28,7 +28,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml b/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml
index 82c9176cba..108d401a63 100644
--- a/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml
+++ b/tests/genericxml2xmlindata/cachetune-colliding-allocs.xml
@@ -19,7 +19,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml b/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml
index d481fb55c0..a8a6ee272f 100644
--- a/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml
+++ b/tests/genericxml2xmlindata/cachetune-colliding-monitor.xml
@@ -19,7 +19,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml b/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml
index a0f37028c9..73ba041815 100644
--- a/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml
+++ b/tests/genericxml2xmlindata/cachetune-colliding-tunes.xml
@@ -21,7 +21,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/cachetune-colliding-types.xml b/tests/genericxml2xmlindata/cachetune-colliding-types.xml
index c229eccee4..5ce9274693 100644
--- a/tests/genericxml2xmlindata/cachetune-colliding-types.xml
+++ b/tests/genericxml2xmlindata/cachetune-colliding-types.xml
@@ -19,7 +19,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/cachetune-extra-tunes.xml b/tests/genericxml2xmlindata/cachetune-extra-tunes.xml
index d3b01a8ecd..07ef372749 100644
--- a/tests/genericxml2xmlindata/cachetune-extra-tunes.xml
+++ b/tests/genericxml2xmlindata/cachetune-extra-tunes.xml
@@ -22,7 +22,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/cachetune-small.xml b/tests/genericxml2xmlindata/cachetune-small.xml
index 748be086c3..ac511d3a19 100644
--- a/tests/genericxml2xmlindata/cachetune-small.xml
+++ b/tests/genericxml2xmlindata/cachetune-small.xml
@@ -25,7 +25,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/cachetune.xml b/tests/genericxml2xmlindata/cachetune.xml
index 645cab7771..8f9d19b4de 100644
--- a/tests/genericxml2xmlindata/cachetune.xml
+++ b/tests/genericxml2xmlindata/cachetune.xml
@@ -22,7 +22,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml b/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml
index 3fce6c4d37..a76e640e02 100644
--- a/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml
+++ b/tests/genericxml2xmlindata/chardev-reconnect-invalid-mode.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml b/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml
index 010dc6cc80..d24033057b 100644
--- a/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml
+++ b/tests/genericxml2xmlindata/chardev-reconnect-missing-timeout.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-reconnect.xml b/tests/genericxml2xmlindata/chardev-reconnect.xml
index 1bd69ecc73..f72c0e3fde 100644
--- a/tests/genericxml2xmlindata/chardev-reconnect.xml
+++ b/tests/genericxml2xmlindata/chardev-reconnect.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml b/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml
index 523c34f29b..80604cae5d 100644
--- a/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml
+++ b/tests/genericxml2xmlindata/chardev-tcp-missing-host.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml b/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml
index 880f07436a..83f487ef77 100644
--- a/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml
+++ b/tests/genericxml2xmlindata/chardev-tcp-missing-service.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml b/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml
index bb8592aa4f..14782f5b78 100644
--- a/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml
+++ b/tests/genericxml2xmlindata/chardev-tcp-multiple-source.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-tcp.xml b/tests/genericxml2xmlindata/chardev-tcp.xml
index e59c572a12..c48da37ba8 100644
--- a/tests/genericxml2xmlindata/chardev-tcp.xml
+++ b/tests/genericxml2xmlindata/chardev-tcp.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml b/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml
index c7ed52b457..cff4b4526f 100644
--- a/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml
+++ b/tests/genericxml2xmlindata/chardev-udp-missing-connect-service.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml b/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml
index 2b87a1bfaa..b918b1980d 100644
--- a/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml
+++ b/tests/genericxml2xmlindata/chardev-udp-multiple-source.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-udp.xml b/tests/genericxml2xmlindata/chardev-udp.xml
index 34441ae68e..75437d5871 100644
--- a/tests/genericxml2xmlindata/chardev-udp.xml
+++ b/tests/genericxml2xmlindata/chardev-udp.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml
index f0d6f3d60a..223f635384 100644
--- a/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml
+++ b/tests/genericxml2xmlindata/chardev-unix-redirdev-missing-path.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml
index fb45c044f8..4519cf24c4 100644
--- a/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml
+++ b/tests/genericxml2xmlindata/chardev-unix-rng-missing-path.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml b/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml
index 451c8aa660..9faad81302 100644
--- a/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml
+++ b/tests/genericxml2xmlindata/chardev-unix-smartcard-missing-path.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/chardev-unix.xml b/tests/genericxml2xmlindata/chardev-unix.xml
index bc715a3ae8..ab93498b81 100644
--- a/tests/genericxml2xmlindata/chardev-unix.xml
+++ b/tests/genericxml2xmlindata/chardev-unix.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/disk-network-http.xml b/tests/genericxml2xmlindata/disk-network-http.xml
index ec4520c7b2..fde1222fd0 100644
--- a/tests/genericxml2xmlindata/disk-network-http.xml
+++ b/tests/genericxml2xmlindata/disk-network-http.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/disk-virtio.xml b/tests/genericxml2xmlindata/disk-virtio.xml
index 5731465a54..75fcd153b4 100644
--- a/tests/genericxml2xmlindata/disk-virtio.xml
+++ b/tests/genericxml2xmlindata/disk-virtio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml b/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml
index 31589f6a49..9b598d329b 100644
--- a/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml
+++ b/tests/genericxml2xmlindata/graphics-listen-back-compat-mismatch.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-listen-back-compat.xml b/tests/genericxml2xmlindata/graphics-listen-back-compat.xml
index 2b90bc4af4..15d21148b8 100644
--- a/tests/genericxml2xmlindata/graphics-listen-back-compat.xml
+++ b/tests/genericxml2xmlindata/graphics-listen-back-compat.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml b/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml
index c4641d9d9a..0f9b475cd0 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-autoport-no.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml
index 72f805e33a..958bc1f45b 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-listen-attr-only.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml
index 2a4855e8e1..d6823d2079 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-listen-element-minimal.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml b/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml
index 2a4855e8e1..d6823d2079 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-listen-element-with-address.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml b/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml
index a7514baff9..b6411044f5 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-manual-port.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-minimal.xml b/tests/genericxml2xmlindata/graphics-vnc-minimal.xml
index 6b9abf9855..14094a8f9c 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-minimal.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-minimal.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml
index 50e2d13bf1..8f3af8b996 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-address.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml
index f56d65c398..18d829f209 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket-mismatch.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml
index ab1c68bcbb..d9154558a9 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-socket-attr-listen-socket.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml b/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml
index 9e316b09de..49d7d65632 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-socket-listen.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/graphics-vnc-socket.xml b/tests/genericxml2xmlindata/graphics-vnc-socket.xml
index 57fd1220d8..5dc57ec252 100644
--- a/tests/genericxml2xmlindata/graphics-vnc-socket.xml
+++ b/tests/genericxml2xmlindata/graphics-vnc-socket.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml b/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml
index 9b8ebaa084..bd42de5f1c 100644
--- a/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml
+++ b/tests/genericxml2xmlindata/memorytune-colliding-allocs.xml
@@ -19,7 +19,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml b/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml
index 5416870de2..db2c1f6c56 100644
--- a/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml
+++ b/tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml
@@ -21,7 +21,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmlindata/memorytune.xml b/tests/genericxml2xmlindata/memorytune.xml
index 7486b542c5..187409e525 100644
--- a/tests/genericxml2xmlindata/memorytune.xml
+++ b/tests/genericxml2xmlindata/memorytune.xml
@@ -26,7 +26,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml b/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml
index db85af08da..6992197d2d 100644
--- a/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml
+++ b/tests/genericxml2xmloutdata/cachetune-extra-tunes.xml
@@ -19,7 +19,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/chardev-reconnect.xml b/tests/genericxml2xmloutdata/chardev-reconnect.xml
index d0e2cd23da..0a521249a8 100644
--- a/tests/genericxml2xmloutdata/chardev-reconnect.xml
+++ b/tests/genericxml2xmloutdata/chardev-reconnect.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/chardev-tcp.xml b/tests/genericxml2xmloutdata/chardev-tcp.xml
index ef217c0abb..a1aadf0dc8 100644
--- a/tests/genericxml2xmloutdata/chardev-tcp.xml
+++ b/tests/genericxml2xmloutdata/chardev-tcp.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/chardev-udp.xml b/tests/genericxml2xmloutdata/chardev-udp.xml
index c9b3e5550c..fc9a5c0b45 100644
--- a/tests/genericxml2xmloutdata/chardev-udp.xml
+++ b/tests/genericxml2xmloutdata/chardev-udp.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/chardev-unix.xml b/tests/genericxml2xmloutdata/chardev-unix.xml
index c797cbff8a..7af2237441 100644
--- a/tests/genericxml2xmloutdata/chardev-unix.xml
+++ b/tests/genericxml2xmloutdata/chardev-unix.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/disk-virtio.xml b/tests/genericxml2xmloutdata/disk-virtio.xml
index 5731465a54..75fcd153b4 100644
--- a/tests/genericxml2xmloutdata/disk-virtio.xml
+++ b/tests/genericxml2xmloutdata/disk-virtio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml b/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml
index 5dfffae3bb..91fa2e7eea 100644
--- a/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml
+++ b/tests/genericxml2xmloutdata/graphics-listen-back-compat.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml
index 3d0c035434..dcf8659eb3 100644
--- a/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-listen-attr-only.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml
index 3d0c035434..dcf8659eb3 100644
--- a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-minimal.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml
index 3d0c035434..dcf8659eb3 100644
--- a/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-listen-element-with-address.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml b/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml
index b18d8eb828..a969d92372 100644
--- a/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-manual-port.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml b/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml
index b18d8eb828..a969d92372 100644
--- a/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-minimal.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml
index aa2314a227..7ccd280e71 100644
--- a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-address.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml
index aa2314a227..7ccd280e71 100644
--- a/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-socket-attr-listen-socket.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml
index bdcdfdc7cf..897d9e448a 100644
--- a/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-socket-listen.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/genericxml2xmloutdata/graphics-vnc-socket.xml b/tests/genericxml2xmloutdata/graphics-vnc-socket.xml
index bdcdfdc7cf..897d9e448a 100644
--- a/tests/genericxml2xmloutdata/graphics-vnc-socket.xml
+++ b/tests/genericxml2xmloutdata/graphics-vnc-socket.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuagentdata/fsinfo.xml b/tests/qemuagentdata/fsinfo.xml
index d27d627b57..233968fc29 100644
--- a/tests/qemuagentdata/fsinfo.xml
+++ b/tests/qemuagentdata/fsinfo.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml
index a518c58915..2b6d8298c2 100644
--- a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml
+++ b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml
@@ -24,7 +24,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml
index df14c97836..427df0b4cf 100644
--- a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml
+++ b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml
@@ -24,7 +24,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemudomaincheckpointxml2xmlout/redefine.xml b/tests/qemudomaincheckpointxml2xmlout/redefine.xml
index 823ae1ee2d..524360fb4c 100644
--- a/tests/qemudomaincheckpointxml2xmlout/redefine.xml
+++ b/tests/qemudomaincheckpointxml2xmlout/redefine.xml
@@ -22,7 +22,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
index a9adbdc2a3..12bc6d953e 100644
--- a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
@@ -39,7 +39,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
index 415fa0aed3..c165e1f81d 100644
--- a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
@@ -29,7 +29,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
index ff3f08950b..080f6d50a3 100644
--- a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
@@ -22,7 +22,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemudomainsnapshotxml2xmlout/metadata.xml b/tests/qemudomainsnapshotxml2xmlout/metadata.xml
index 1e50494cb5..e5fa60819c 100644
--- a/tests/qemudomainsnapshotxml2xmlout/metadata.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/metadata.xml
@@ -26,7 +26,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml b/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml
index 341025c477..ad77405266 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-disk-cdrom.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-listen-network.xml
index 3435dadbcf..2323521f5e 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-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
index d3bec1ec8b..0ca19e9610 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-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml
index 19933bcf2d..657b6ccbed 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
index abd9f62965..bcef338fda 100644
--- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
+++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
@@ -39,7 +39,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
index 4195880aac..b72a7b93e3 100644
--- a/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
+++ b/tests/qemuxml2argvdata/440fx-ide-address-conflict.xml
@@ -12,7 +12,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/440fx-wrong-root.xml b/tests/qemuxml2argvdata/440fx-wrong-root.xml
index 8e4802d557..3bd79311f4 100644
--- a/tests/qemuxml2argvdata/440fx-wrong-root.xml
+++ b/tests/qemuxml2argvdata/440fx-wrong-root.xml
@@ -17,7 +17,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args
index 3a1f010e3e..60253f43ec 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.xml b/tests/qemuxml2argvdata/balloon-device-auto.xml
index 8922f09002..ddfc605bd4 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.xml
+++ b/tests/qemuxml2argvdata/balloon-device-auto.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index 619f78bab4..e81db15972 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
index 59afb74a43..ecf73abe05 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 04fc761c5f..3aa255187b 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.xml b/tests/qemuxml2argvdata/balloon-device-deflate.xml
index 25c34ac94c..dc443bcea9 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.xml
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args
index 170fe6a551..8a6cc8dec5 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/balloon-device-period.xml b/tests/qemuxml2argvdata/balloon-device-period.xml
index d4ab2368ca..8094e7a308 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.xml
+++ b/tests/qemuxml2argvdata/balloon-device-period.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args
index 170fe6a551..8a6cc8dec5 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/balloon-device.xml b/tests/qemuxml2argvdata/balloon-device.xml
index 8443ac28ff..3c1c04a455 100644
--- a/tests/qemuxml2argvdata/balloon-device.xml
+++ b/tests/qemuxml2argvdata/balloon-device.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index 2edfc1d38e..6b636575b1 100644
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name test-bios \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/bios.xml b/tests/qemuxml2argvdata/bios.xml
index a9481e7b5a..82092c1893 100644
--- a/tests/qemuxml2argvdata/bios.xml
+++ b/tests/qemuxml2argvdata/bios.xml
@@ -16,7 +16,7 @@
restart
restart
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
index 63500e9d03..dfa7155b1e 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
index c70d3b2afd..c82430a1e9 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
index 12f699aeb8..5d301a465d 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
index f2e7528d98..83fea5c567 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.args b/tests/qemuxml2argvdata/blkdeviotune-max.args
index 623894a633..4548443377 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.xml b/tests/qemuxml2argvdata/blkdeviotune-max.xml
index 55e118fcd3..3c604c2837 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/blkdeviotune.xml b/tests/qemuxml2argvdata/blkdeviotune.xml
index ef5651c535..268b4fb3af 100644
--- a/tests/qemuxml2argvdata/blkdeviotune.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args
index 3a1f010e3e..60253f43ec 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/blkiotune-device.xml b/tests/qemuxml2argvdata/blkiotune-device.xml
index 48fd37dba2..9fdc25b767 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.xml
+++ b/tests/qemuxml2argvdata/blkiotune-device.xml
@@ -32,7 +32,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args
index 3a1f010e3e..60253f43ec 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/blkiotune.xml b/tests/qemuxml2argvdata/blkiotune.xml
index a0b7b034d3..9c224f1035 100644
--- a/tests/qemuxml2argvdata/blkiotune.xml
+++ b/tests/qemuxml2argvdata/blkiotune.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args
index 1f9acd0a01..c5d66e7b82 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-cdrom.xml b/tests/qemuxml2argvdata/boot-cdrom.xml
index 584323facc..374c8c38ce 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.xml
+++ b/tests/qemuxml2argvdata/boot-cdrom.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args
index e473a53153..0fbfc3c242 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-complex.xml b/tests/qemuxml2argvdata/boot-complex.xml
index 6b2bcd8b87..959acfb4ca 100644
--- a/tests/qemuxml2argvdata/boot-complex.xml
+++ b/tests/qemuxml2argvdata/boot-complex.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-dev+order.xml b/tests/qemuxml2argvdata/boot-dev+order.xml
index 28490b5239..e4bb3b1f48 100644
--- a/tests/qemuxml2argvdata/boot-dev+order.xml
+++ b/tests/qemuxml2argvdata/boot-dev+order.xml
@@ -15,7 +15,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args
index f68f51e4f4..a2b70dc96a 100644
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-floppy.xml b/tests/qemuxml2argvdata/boot-floppy.xml
index 5731302348..324c9c81d8 100644
--- a/tests/qemuxml2argvdata/boot-floppy.xml
+++ b/tests/qemuxml2argvdata/boot-floppy.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 22a87e5cda..f3e2c97537 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml b/tests/qemuxml2argvdata/boot-menu-disable-drive.xml
index 8d9c1ae7d1..e33b61f13f 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.xml
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml b/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
index 19850da21f..a7ae02fda0 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2argvdata/boot-menu-disable-with-timeout.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args
index 22a87e5cda..f3e2c97537 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.xml b/tests/qemuxml2argvdata/boot-menu-disable.xml
index 09d4268d23..6a61f088d9 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.xml
+++ b/tests/qemuxml2argvdata/boot-menu-disable.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
index e0c81ae10f..5af6f5bb95 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout-invalid.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index 5fa7c31b2a..4df0ae4624 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
index 09232cb28e..e467aedd1e 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args
index b95aa3688c..83b4fbde44 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.xml b/tests/qemuxml2argvdata/boot-menu-enable.xml
index 83b49abddc..5f2f4aedb4 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.xml
+++ b/tests/qemuxml2argvdata/boot-menu-enable.xml
@@ -14,7 +14,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args
index b95aa3688c..83b4fbde44 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-multi.xml b/tests/qemuxml2argvdata/boot-multi.xml
index acfcd45a40..83f8e6aa23 100644
--- a/tests/qemuxml2argvdata/boot-multi.xml
+++ b/tests/qemuxml2argvdata/boot-multi.xml
@@ -17,7 +17,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args
index 100928275f..9ca3f75df3 100644
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-network.xml b/tests/qemuxml2argvdata/boot-network.xml
index f0cb4bc7a1..6233605ac5 100644
--- a/tests/qemuxml2argvdata/boot-network.xml
+++ b/tests/qemuxml2argvdata/boot-network.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args
index f2c862968a..57d4b88989 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-order.xml b/tests/qemuxml2argvdata/boot-order.xml
index a8e094e854..6a95658ad2 100644
--- a/tests/qemuxml2argvdata/boot-order.xml
+++ b/tests/qemuxml2argvdata/boot-order.xml
@@ -12,7 +12,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/boot-strict.args b/tests/qemuxml2argvdata/boot-strict.args
index 3da9d70654..827814cbb9 100644
--- a/tests/qemuxml2argvdata/boot-strict.args
+++ b/tests/qemuxml2argvdata/boot-strict.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/boot-strict.xml b/tests/qemuxml2argvdata/boot-strict.xml
index 6b2bcd8b87..959acfb4ca 100644
--- a/tests/qemuxml2argvdata/boot-strict.xml
+++ b/tests/qemuxml2argvdata/boot-strict.xml
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args
index 18f3a5b410..0338d0c5e3 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.xml b/tests/qemuxml2argvdata/channel-guestfwd.xml
index 240356d7c6..e463c2d970 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.xml
+++ b/tests/qemuxml2argvdata/channel-guestfwd.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args
index c7845d6ca0..adb7707270 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=spice \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.xml b/tests/qemuxml2argvdata/channel-spicevmc.xml
index 95d0c20647..de5029f306 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.xml
+++ b/tests/qemuxml2argvdata/channel-spicevmc.xml
@@ -12,7 +12,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args
index 0c439728fb..e7d6531021 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.xml b/tests/qemuxml2argvdata/channel-virtio-auto.xml
index 042b94fa81..080a9faf95 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index 23d90f5f0d..9daac162d0 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
index d84d990236..2daec88dc9 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index 56125fae06..67d1662096 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
index 32d4b8b1bd..45402468c8 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args
index abc3b797e8..f3e0f591be 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.xml b/tests/qemuxml2argvdata/channel-virtio-default.xml
index fc06dba501..aab9ce1a97 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-default.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args
index d99b75b9be..38a9f41b1e 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.xml b/tests/qemuxml2argvdata/channel-virtio-state.xml
index 00ed2c63d5..006ba1d048 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-state.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args
index ecc06941cb..fd42b897fd 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.xml b/tests/qemuxml2argvdata/channel-virtio-unix.xml
index cd0c0ab256..a34551a9e0 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.xml
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.xml
@@ -12,7 +12,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args
index 44dd32a210..1d22c3633f 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio.xml b/tests/qemuxml2argvdata/channel-virtio.xml
index fdeb847da3..0bf7b04d50 100644
--- a/tests/qemuxml2argvdata/channel-virtio.xml
+++ b/tests/qemuxml2argvdata/channel-virtio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
index 3cb67ecdcc..9f62ae7545 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
+++ b/tests/qemuxml2argvdata/chardev-reconnect-generated-path.xml
@@ -8,7 +8,7 @@
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
index 73dac66816..d3308b4afe 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
+++ b/tests/qemuxml2argvdata/chardev-reconnect-invalid-timeout.xml
@@ -8,7 +8,7 @@
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args
index 84e760aba0..851052d5a5 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.xml b/tests/qemuxml2argvdata/chardev-reconnect.xml
index 41ee248db3..13a4b18bff 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.xml
+++ b/tests/qemuxml2argvdata/chardev-reconnect.xml
@@ -8,7 +8,7 @@
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args
index ca872b96e7..4cf109a0e8 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/clock-catchup.xml b/tests/qemuxml2argvdata/clock-catchup.xml
index 94d2dd0333..8c22afe1c8 100644
--- a/tests/qemuxml2argvdata/clock-catchup.xml
+++ b/tests/qemuxml2argvdata/clock-catchup.xml
@@ -23,7 +23,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args
index b08811f884..f814906c01 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
TZ=Europe/Paris \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/clock-france.xml b/tests/qemuxml2argvdata/clock-france.xml
index 626b9efcc0..be9231e92f 100644
--- a/tests/qemuxml2argvdata/clock-france.xml
+++ b/tests/qemuxml2argvdata/clock-france.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args
index 64c8ca111e..89e510e977 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.xml b/tests/qemuxml2argvdata/clock-hpet-off.xml
index 6ae8b809e1..4b573464f7 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.xml
+++ b/tests/qemuxml2argvdata/clock-hpet-off.xml
@@ -17,7 +17,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index ade15a2b7e..4b78d2ac23 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
index c29b761b28..9924f865c3 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args
index cfbf59c3c5..e6f80f0085 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/clock-localtime.xml b/tests/qemuxml2argvdata/clock-localtime.xml
index 551459114a..d5f848b9e7 100644
--- a/tests/qemuxml2argvdata/clock-localtime.xml
+++ b/tests/qemuxml2argvdata/clock-localtime.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index d75585bf0f..cb96ffbef3 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
index 76eead99ad..14400f5d7b 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.xml
@@ -18,7 +18,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args
index a9bd75becf..e38898e335 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/clock-utc.xml b/tests/qemuxml2argvdata/clock-utc.xml
index bddb259630..7e26f2ed52 100644
--- a/tests/qemuxml2argvdata/clock-utc.xml
+++ b/tests/qemuxml2argvdata/clock-utc.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args
index afe7c48dc5..9fd990da1f 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/clock-variable.xml b/tests/qemuxml2argvdata/clock-variable.xml
index d3e6396cbf..1cb936a712 100644
--- a/tests/qemuxml2argvdata/clock-variable.xml
+++ b/tests/qemuxml2argvdata/clock-variable.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args
index 683399d307..4d6d6e376c 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/console-compat-auto.xml b/tests/qemuxml2argvdata/console-compat-auto.xml
index 1789e003c8..2355747451 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.xml
+++ b/tests/qemuxml2argvdata/console-compat-auto.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args
index 683399d307..4d6d6e376c 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.xml b/tests/qemuxml2argvdata/console-compat-chardev.xml
index 939e3aeff2..4acf635bd4 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.xml
+++ b/tests/qemuxml2argvdata/console-compat-chardev.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args
index 539c5a05bc..8a6d72fb6e 100644
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/console-compat.xml b/tests/qemuxml2argvdata/console-compat.xml
index 359511a690..a932b9c4b6 100644
--- a/tests/qemuxml2argvdata/console-compat.xml
+++ b/tests/qemuxml2argvdata/console-compat.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/console-compat2.xml b/tests/qemuxml2argvdata/console-compat2.xml
index 74f12409ec..16160dcc3b 100644
--- a/tests/qemuxml2argvdata/console-compat2.xml
+++ b/tests/qemuxml2argvdata/console-compat2.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args
index baa538d697..ec81652e20 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/console-virtio-many.xml b/tests/qemuxml2argvdata/console-virtio-many.xml
index c26a9c294f..a455a39751 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.xml
+++ b/tests/qemuxml2argvdata/console-virtio-many.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args
index 61115cd1b2..30a47a915b 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/console-virtio.xml b/tests/qemuxml2argvdata/console-virtio.xml
index b9c9c5785f..77fd040b39 100644
--- a/tests/qemuxml2argvdata/console-virtio.xml
+++ b/tests/qemuxml2argvdata/console-virtio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
index 1647cfdd97..9d7bf325ca 100644
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,\
diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.xml b/tests/qemuxml2argvdata/controller-virtio-scsi.xml
index 844e4ad397..2474c3bec5 100644
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
index 57fad2b666..786f9b693c 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
index 62ba7134af..657de0482a 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
@@ -21,7 +21,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
index 04836db5fd..90bacb0224 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
index fde0f354bb..bc8934f260 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
@@ -21,7 +21,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cpu-host-model-features.xml b/tests/qemuxml2argvdata/cpu-host-model-features.xml
index 22034eae5d..5de4c0cde1 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-features.xml
+++ b/tests/qemuxml2argvdata/cpu-host-model-features.xml
@@ -24,7 +24,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index cbe333ee64..a4de9d3de9 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml b/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
index 639dd5f6d9..bb4dd87f65 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.xml
@@ -23,7 +23,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args
index 10990429d9..39d368a359 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.xml b/tests/qemuxml2argvdata/cpu-kvmclock.xml
index 25d3ee757a..2be6066f89 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.xml
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.xml
@@ -18,7 +18,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args
index 94a560b6e7..8246efd563 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=kvm,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.xml b/tests/qemuxml2argvdata/cpu-minimum1.xml
index cedd7c658c..806bf2efb2 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.xml
+++ b/tests/qemuxml2argvdata/cpu-minimum1.xml
@@ -16,6 +16,6 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cputune-iothreads.xml b/tests/qemuxml2argvdata/cputune-iothreads.xml
index 311a1d3604..d55d85c07d 100644
--- a/tests/qemuxml2argvdata/cputune-iothreads.xml
+++ b/tests/qemuxml2argvdata/cputune-iothreads.xml
@@ -25,7 +25,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml b/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
index 830177e603..dd9a664939 100644
--- a/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
+++ b/tests/qemuxml2argvdata/cputune-iothreadsched-toomuch.xml
@@ -25,7 +25,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml
index 3d049e31a5..1144e0f132 100644
--- a/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml
+++ b/tests/qemuxml2argvdata/cputune-iothreadsched-zeropriority.xml
@@ -24,7 +24,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cputune-iothreadsched.xml b/tests/qemuxml2argvdata/cputune-iothreadsched.xml
index 56cb434e4a..73bcec602e 100644
--- a/tests/qemuxml2argvdata/cputune-iothreadsched.xml
+++ b/tests/qemuxml2argvdata/cputune-iothreadsched.xml
@@ -25,7 +25,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml b/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
index 2c1667a633..4e07f17ad8 100644
--- a/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
+++ b/tests/qemuxml2argvdata/cputune-vcpusched-overlap.xml
@@ -24,7 +24,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 3d71d03b9c..7270aafeb7 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.xml b/tests/qemuxml2argvdata/cputune-zero-shares.xml
index cb03330cc6..0b1369fe05 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.xml
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.xml
@@ -21,7 +21,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 3d71d03b9c..7270aafeb7 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/cputune.xml b/tests/qemuxml2argvdata/cputune.xml
index b67c71c0e6..d7a5db0bb6 100644
--- a/tests/qemuxml2argvdata/cputune.xml
+++ b/tests/qemuxml2argvdata/cputune.xml
@@ -25,7 +25,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/debug-threads.args b/tests/qemuxml2argvdata/debug-threads.args
index 23637be1ac..d73625e94e 100644
--- a/tests/qemuxml2argvdata/debug-threads.args
+++ b/tests/qemuxml2argvdata/debug-threads.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1,debug-threads=on \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/debug-threads.xml b/tests/qemuxml2argvdata/debug-threads.xml
index 9ef92f8feb..8701906357 100644
--- a/tests/qemuxml2argvdata/debug-threads.xml
+++ b/tests/qemuxml2argvdata/debug-threads.xml
@@ -18,7 +18,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/disk-active-commit.xml b/tests/qemuxml2argvdata/disk-active-commit.xml
index 8ed66fdcc0..28e59dcd85 100644
--- a/tests/qemuxml2argvdata/disk-active-commit.xml
+++ b/tests/qemuxml2argvdata/disk-active-commit.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/disk-address-conflict.xml b/tests/qemuxml2argvdata/disk-address-conflict.xml
index 3500d373f7..eeec87d70f 100644
--- a/tests/qemuxml2argvdata/disk-address-conflict.xml
+++ b/tests/qemuxml2argvdata/disk-address-conflict.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
index 55ddfcbdf3..1b4dffc84c 100644
--- a/tests/qemuxml2argvdata/disk-aio.args
+++ b/tests/qemuxml2argvdata/disk-aio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
index 9148b98ba5..f8a89493f6 100644
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,\
diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
index a424e58a48..b30edf4dbe 100644
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,\
diff --git a/tests/qemuxml2argvdata/disk-aio.xml b/tests/qemuxml2argvdata/disk-aio.xml
index b1cab775a0..02ac3aadc6 100644
--- a/tests/qemuxml2argvdata/disk-aio.xml
+++ b/tests/qemuxml2argvdata/disk-aio.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml b/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
index 591819fbb6..019ba45135 100644
--- a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
+++ b/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.xml b/tests/qemuxml2argvdata/disk-backing-chains-index.xml
index 5e0a03fbc4..7ef4e16e81 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-index.xml
+++ b/tests/qemuxml2argvdata/disk-backing-chains-index.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
index fb8a62dde3..a8675debd5 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,\
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
index a2f030f165..4108943574 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,\
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml b/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml
index 1336d0fdd6..0b78539114 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml
+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/disk-backing-chains.xml b/tests/qemuxml2argvdata/disk-backing-chains.xml
index 2eaafb34e7..7fe84da3f0 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains.xml
+++ b/tests/qemuxml2argvdata/disk-backing-chains.xml
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i686
+ /usr/bin/qemu-system-i386
diff --git a/tests/qemuxml2argvdata/disk-blockio.args b/tests/qemuxml2argvdata/disk-blockio.args
index 8ed9ac87fd..72aa592fef 100644
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ b/tests/qemuxml2argvdata/disk-blockio.args
@@ -7,7 +7,7 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
+/usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-S \
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
diff --git a/tests/qemuxml2argvdata/disk-blockio.xml b/tests/qemuxml2argvdata/disk-blockio.xml
index ea5c861773..1f78b38cb6 100644
--- a/tests/qemuxml2argvdata/disk-blockio.xml
+++ b/tests/qemuxml2argvdata/disk-blockio.xml
@@ -13,7 +13,7 @@
restart
destroy
-