qemuxmlconftest: x86_64: Drop explicit use of '2.9' machine type

New qemu will be deprecating them. Drop the use from test files not
depending on the actual machine type.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
index 1bad605e07df0d6025b7d98e4e3d5beccd8da374..f6a8536b43cef33a04a2253184591c61ac5f890f 100644 (file)
--- a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
 -name guest=test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
--machine pc-i440fx-2.9,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -cpu qemu64 \
 -m size=1048576k \

diff --git a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.xml b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.xml
index ea8daf34c7c23a4f05feec358040fa89ca38bdc5..95a0046ddea6878550d474d60ceb324a3d287339 100644 (file)
--- a/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/vhost-vsock-auto.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.9'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>

diff --git a/tests/qemuxmlconfdata/vhost-vsock-auto.xml b/tests/qemuxmlconfdata/vhost-vsock-auto.xml
index f6619d6cd69965c895988b4fb702bb15545200e8..40272596fe86332dd5d7fe340259ab1c42163d88 100644 (file)
--- a/tests/qemuxmlconfdata/vhost-vsock-auto.xml
+++ b/tests/qemuxmlconfdata/vhost-vsock-auto.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-2.9'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
   </os>