diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
index 0199eb9edd..a25b57cdd7 100644
--- a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
QEMU_AUDIO_DAC_FIXED_FMT=f32 \
QEMU_AUDIO_ADC_DEV=/dev/dsp0 \
QEMU_AUDIO_DAC_DEV=/dev/dsp1 \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args
index 06aaace7d2..563c33af45 100644
--- a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-alsa-best.xml b/tests/qemuxml2argvdata/audio-alsa-best.xml
index 8fe7b2fe88..29283ab7d2 100644
--- a/tests/qemuxml2argvdata/audio-alsa-best.xml
+++ b/tests/qemuxml2argvdata/audio-alsa-best.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args
index ffbdd79f3d..8c40814596 100644
--- a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-alsa-full.xml b/tests/qemuxml2argvdata/audio-alsa-full.xml
index 634b41a0f0..4205ecde89 100644
--- a/tests/qemuxml2argvdata/audio-alsa-full.xml
+++ b/tests/qemuxml2argvdata/audio-alsa-full.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
index f4f2d75563..080abdcbd1 100644
--- a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.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=alsa \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args
index 17a4a75718..37e3c21f4a 100644
--- a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.xml b/tests/qemuxml2argvdata/audio-alsa-minimal.xml
index ab26688317..57ff9d2bf0 100644
--- a/tests/qemuxml2argvdata/audio-alsa-minimal.xml
+++ b/tests/qemuxml2argvdata/audio-alsa-minimal.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
index b276299f70..cd43f8cbb2 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
QEMU_AUDIO_DAC_FIXED_FMT=f32 \
QEMU_COREAUDIO_BUFFER_COUNT=42 \
QEMU_COREAUDIO_BUFFER_SIZE=200 \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args
index beee1cefc9..387a9e8887 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.xml b/tests/qemuxml2argvdata/audio-coreaudio-best.xml
index 95dfb1247b..d171cc752f 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-best.xml
+++ b/tests/qemuxml2argvdata/audio-coreaudio-best.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args
index eea6cfe5b3..b4b50643c3 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.xml b/tests/qemuxml2argvdata/audio-coreaudio-full.xml
index a46db6936b..b6427a6e9f 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-full.xml
+++ b/tests/qemuxml2argvdata/audio-coreaudio-full.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
index bce521a496..69172e8319 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.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=coreaudio \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args
index ff753482ec..67b0bac293 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.xml b/tests/qemuxml2argvdata/audio-coreaudio-minimal.xml
index f271e995ff..dac55ecbce 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.xml
+++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
index f4f2d75563..080abdcbd1 100644
--- a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.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=alsa \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args
index 17a4a75718..37e3c21f4a 100644
--- a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-default-nographics.xml b/tests/qemuxml2argvdata/audio-default-nographics.xml
index 374c8c38ce..17bdaa06cc 100644
--- a/tests/qemuxml2argvdata/audio-default-nographics.xml
+++ b/tests/qemuxml2argvdata/audio-default-nographics.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args b/tests/qemuxml2argvdata/audio-default-sdl.args
index abf4514cd4..215abc5f59 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.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=sdl \
SDL_AUDIODRIVER=esd \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args
index 1d7dfc03aa..1bbebacbb8 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.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 \
SDL_AUDIODRIVER=esd \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.xml b/tests/qemuxml2argvdata/audio-default-sdl.xml
index 4a7e5ab259..1aa619d295 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.xml
+++ b/tests/qemuxml2argvdata/audio-default-sdl.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args b/tests/qemuxml2argvdata/audio-default-spice.args
index 4bc7966258..a990c5721a 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args
index c20cac9218..4774ed0914 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-default-spice.xml b/tests/qemuxml2argvdata/audio-default-spice.xml
index 93c91376a7..d4dae00967 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.xml
+++ b/tests/qemuxml2argvdata/audio-default-spice.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args b/tests/qemuxml2argvdata/audio-default-vnc.args
index 677427673c..e2a26d2b03 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.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=alsa \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args
index 65c223ab81..1f61163546 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.xml b/tests/qemuxml2argvdata/audio-default-vnc.xml
index 89f1d77554..14e2d8ad46 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.xml
+++ b/tests/qemuxml2argvdata/audio-default-vnc.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
index 9b072bc903..7cde6952d9 100644
--- a/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
@@ -19,7 +19,7 @@ QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
QEMU_AUDIO_DAC_FIXED_FMT=f32 \
QEMU_WAV_PATH=audio.wav \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args b/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args
index 69cddf490d..4261771a43 100644
--- a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-file-best.xml b/tests/qemuxml2argvdata/audio-file-best.xml
index 87d5607915..9946ad9e3d 100644
--- a/tests/qemuxml2argvdata/audio-file-best.xml
+++ b/tests/qemuxml2argvdata/audio-file-best.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args b/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args
index b8bb77ea38..4afc37c43a 100644
--- a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-file-full.xml b/tests/qemuxml2argvdata/audio-file-full.xml
index f88fe42b11..1e4c50f44a 100644
--- a/tests/qemuxml2argvdata/audio-file-full.xml
+++ b/tests/qemuxml2argvdata/audio-file-full.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
index b1689fc5f3..2d426b942a 100644
--- a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.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=wav \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args
index 3ff3052066..cf703681f0 100644
--- a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-file-minimal.xml b/tests/qemuxml2argvdata/audio-file-minimal.xml
index 3091b94cf3..65f2c56a90 100644
--- a/tests/qemuxml2argvdata/audio-file-minimal.xml
+++ b/tests/qemuxml2argvdata/audio-file-minimal.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args b/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args
index ff2f5a4b19..5152ef1a64 100644
--- a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-jack-full.xml b/tests/qemuxml2argvdata/audio-jack-full.xml
index 92351078a7..0583a305b1 100644
--- a/tests/qemuxml2argvdata/audio-jack-full.xml
+++ b/tests/qemuxml2argvdata/audio-jack-full.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args
index ccc728a42c..402f21d31b 100644
--- a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.xml b/tests/qemuxml2argvdata/audio-jack-minimal.xml
index d88d066008..b044a186a8 100644
--- a/tests/qemuxml2argvdata/audio-jack-minimal.xml
+++ b/tests/qemuxml2argvdata/audio-jack-minimal.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args
index 8ef9599b30..f1c6978543 100644
--- a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-many-backends.xml b/tests/qemuxml2argvdata/audio-many-backends.xml
index 86eef90e52..c681784526 100644
--- a/tests/qemuxml2argvdata/audio-many-backends.xml
+++ b/tests/qemuxml2argvdata/audio-many-backends.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
index 1a4bfa917a..12a85c4c13 100644
--- a/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DAC_VOICES=2 \
QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args b/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args
index 6be557cac3..fe55d57b2d 100644
--- a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-none-best.xml b/tests/qemuxml2argvdata/audio-none-best.xml
index b867d20fb2..98c3b17a84 100644
--- a/tests/qemuxml2argvdata/audio-none-best.xml
+++ b/tests/qemuxml2argvdata/audio-none-best.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args b/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args
index 4864f66b4b..b4e04df461 100644
--- a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-none-full.xml b/tests/qemuxml2argvdata/audio-none-full.xml
index f795a24be1..85437c67f2 100644
--- a/tests/qemuxml2argvdata/audio-none-full.xml
+++ b/tests/qemuxml2argvdata/audio-none-full.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
index 6359e597b9..15f3290aa0 100644
--- a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args
index d82963d169..c1c9824f3f 100644
--- a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-none-minimal.xml b/tests/qemuxml2argvdata/audio-none-minimal.xml
index 4729edaa63..4666777e56 100644
--- a/tests/qemuxml2argvdata/audio-none-minimal.xml
+++ b/tests/qemuxml2argvdata/audio-none-minimal.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
index e873abd77e..28a02ce284 100644
--- a/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_ADC_TRY_POLL=on \
QEMU_OSS_DAC_DEV=/dev/dsp1 \
QEMU_AUDIO_DAC_TRY_POLL=off \
QEMU_OSS_NFRAGS=30 \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args b/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args
index 3cf9159569..5d6f2b31e2 100644
--- a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-oss-best.xml b/tests/qemuxml2argvdata/audio-oss-best.xml
index bf2fefdac2..cf0eac2fdf 100644
--- a/tests/qemuxml2argvdata/audio-oss-best.xml
+++ b/tests/qemuxml2argvdata/audio-oss-best.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args b/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args
index 6af29e0a17..c90ffe71f9 100644
--- a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-oss-full.xml b/tests/qemuxml2argvdata/audio-oss-full.xml
index aa31eb9bab..b9acccff36 100644
--- a/tests/qemuxml2argvdata/audio-oss-full.xml
+++ b/tests/qemuxml2argvdata/audio-oss-full.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
index e657a41a7f..9f06244148 100644
--- a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.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=oss \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args
index 990e3a3afb..e9980d6743 100644
--- a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.xml b/tests/qemuxml2argvdata/audio-oss-minimal.xml
index abddc1ac8c..47da331bab 100644
--- a/tests/qemuxml2argvdata/audio-oss-minimal.xml
+++ b/tests/qemuxml2argvdata/audio-oss-minimal.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
index 3a2c4cf1e3..d20d734998 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
@@ -22,7 +22,7 @@ QEMU_PA_SOURCE=fish \
QEMU_PA_SINK=fish \
QEMU_PA_SAMPLES=200 \
QEMU_PA_SERVER=%s=acme.example.org \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args
index 2cd1790bc5..e7a7c8ccb6 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.xml b/tests/qemuxml2argvdata/audio-pulseaudio-best.xml
index 8fd1ca7497..1a4609e9ed 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-best.xml
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args
index 211d0033ec..0467c7ef93 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.xml b/tests/qemuxml2argvdata/audio-pulseaudio-full.xml
index a674653982..e15098e1e8 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-full.xml
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-full.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
index fd36e8f1d1..379310ce73 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.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=pa \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args
index b67e769086..5e91074e2d 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.xml b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.xml
index 013b708498..6a947c0239 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.xml
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
index 96fea4023c..40b3004d24 100644
--- a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
@@ -20,7 +20,7 @@ QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
QEMU_AUDIO_DAC_FIXED_FMT=f32 \
QEMU_SDL_SAMPLES=200 \
SDL_AUDIODRIVER=pulseaudio \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args
index 29874eef8c..838526829a 100644
--- a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-sdl-best.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 \
SDL_AUDIODRIVER=pulseaudio \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-sdl-best.xml b/tests/qemuxml2argvdata/audio-sdl-best.xml
index 79917742f1..84f810c61a 100644
--- a/tests/qemuxml2argvdata/audio-sdl-best.xml
+++ b/tests/qemuxml2argvdata/audio-sdl-best.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args b/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args
index e041efe50b..833aee9066 100644
--- a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-sdl-full.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 \
SDL_AUDIODRIVER=pulseaudio \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-sdl-full.xml b/tests/qemuxml2argvdata/audio-sdl-full.xml
index 9925d048ec..c96182e9fb 100644
--- a/tests/qemuxml2argvdata/audio-sdl-full.xml
+++ b/tests/qemuxml2argvdata/audio-sdl-full.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
index 28ba2c8ff8..4bf332dffe 100644
--- a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.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=sdl \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args
index 93c38eae20..6f27154ec2 100644
--- a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.xml b/tests/qemuxml2argvdata/audio-sdl-minimal.xml
index 223e06196d..23793b6155 100644
--- a/tests/qemuxml2argvdata/audio-sdl-minimal.xml
+++ b/tests/qemuxml2argvdata/audio-sdl-minimal.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
index 4e6651d370..d5d42384b1 100644
--- a/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
@@ -18,7 +18,7 @@ QEMU_AUDIO_DAC_VOICES=2 \
QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args b/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args
index 9a845047aa..b0d69916e2 100644
--- a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-spice-best.xml b/tests/qemuxml2argvdata/audio-spice-best.xml
index 8d203c9089..f38175a913 100644
--- a/tests/qemuxml2argvdata/audio-spice-best.xml
+++ b/tests/qemuxml2argvdata/audio-spice-best.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args b/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args
index e324ccc0aa..4ceeb99edc 100644
--- a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-spice-full.xml b/tests/qemuxml2argvdata/audio-spice-full.xml
index 3ef3e431ac..c2893ac7fe 100644
--- a/tests/qemuxml2argvdata/audio-spice-full.xml
+++ b/tests/qemuxml2argvdata/audio-spice-full.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
index 9196d9f3ac..d8f19972f2 100644
--- a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.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=spice \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args
index 5acf36f429..a4908c5e0d 100644
--- a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.xml b/tests/qemuxml2argvdata/audio-spice-minimal.xml
index eecae5ad12..281a9cd164 100644
--- a/tests/qemuxml2argvdata/audio-spice-minimal.xml
+++ b/tests/qemuxml2argvdata/audio-spice-minimal.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
index 927f447b23..2e88f70eea 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
@@ -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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args
index 356e4ef5b7..b8ea322984 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
index 374ef6cc7f..ed78d21a61 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
index 6f6977e2de..b6e90cb79c 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
@@ -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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args
index 356e4ef5b7..b8ea322984 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
index fb6d28558e..5b202e38ee 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
index 4373084966..d7c8c215b1 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args
index 356e4ef5b7..b8ea322984 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.xml b/tests/qemuxml2argvdata/blkdeviotune-max.xml
index 7616dbd9b5..b57cfa4e2a 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -16,7 +16,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args
index 5285d0749a..a4fbf3a2f2 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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args b/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args
index 7b31c86820..c007694f17 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/console-compat-auto.xml b/tests/qemuxml2argvdata/console-compat-auto.xml
index 2355747451..305d4802c1 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.xml
+++ b/tests/qemuxml2argvdata/console-compat-auto.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args
index 5285d0749a..a4fbf3a2f2 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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args
index 7b31c86820..c007694f17 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.xml b/tests/qemuxml2argvdata/console-compat-chardev.xml
index 4acf635bd4..9d34fd51ab 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.xml
+++ b/tests/qemuxml2argvdata/console-compat-chardev.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args
index 9f37788586..afaf50d4ba 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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args b/tests/qemuxml2argvdata/console-compat.x86_64-latest.args
index 17a356b480..1c7480be84 100644
--- a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/console-compat.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/console-compat.xml b/tests/qemuxml2argvdata/console-compat.xml
index a932b9c4b6..661457b42c 100644
--- a/tests/qemuxml2argvdata/console-compat.xml
+++ b/tests/qemuxml2argvdata/console-compat.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
index b584f93f44..f422623b84 100644
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.xml b/tests/qemuxml2argvdata/controller-virtio-scsi.xml
index 2474c3bec5..09756cf3f7 100644
--- a/tests/qemuxml2argvdata/controller-virtio-scsi.xml
+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.xml
@@ -5,7 +5,7 @@
219136
8
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/disk-address-conflict.xml b/tests/qemuxml2argvdata/disk-address-conflict.xml
index eeec87d70f..3cc38c12c7 100644
--- a/tests/qemuxml2argvdata/disk-address-conflict.xml
+++ b/tests/qemuxml2argvdata/disk-address-conflict.xml
@@ -5,7 +5,7 @@
219136
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
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 dcdeb6960c..ff2b924345 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-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
index e5be1d2db2..48ae71a902 100644
--- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
@@ -6,7 +6,7 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-/usr/bin/qemu-system-i386 \
+/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
diff --git a/tests/qemuxml2argvdata/disk-aio.xml b/tests/qemuxml2argvdata/disk-aio.xml
index 02ac3aadc6..b043557f91 100644
--- a/tests/qemuxml2argvdata/disk-aio.xml
+++ b/tests/qemuxml2argvdata/disk-aio.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml b/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
index 019ba45135..84efac6110 100644
--- a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
+++ b/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
@@ -5,7 +5,7 @@
219100
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64
diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.xml b/tests/qemuxml2argvdata/disk-backing-chains-index.xml
index 7ef4e16e81..9054963f1f 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains-index.xml
+++ b/tests/qemuxml2argvdata/disk-backing-chains-index.xml
@@ -5,7 +5,7 @@
219136
1
- hvm
+ hvm
@@ -13,7 +13,7 @@
restart
destroy
- /usr/bin/qemu-system-i386
+ /usr/bin/qemu-system-x86_64