qemuxmlconftest: x86_64: Drop explicit use of '2.10' 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/tseg-explicit-size.x86_64-latest.args b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args
index e4259f32cd03bf0082b5d12d25120df9e25870ce..36ae1a984d6aaf6df709f10018eab615ca1e54da 100644 (file)
--- a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
--machine pc-q35-2.10,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-machine q35,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 -accel tcg \
 -global mch.extended-tseg-mbytes=48 \
 -cpu qemu64 \

diff --git a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml
index d0bb47cda8f4219275887e990e54e09300db9974..50f48b8825bb307928c5a54fafd1da1abd353beb 100644 (file)
--- a/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml
+++ b/tests/qemuxmlconfdata/tseg-explicit-size.x86_64-latest.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.10'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>

diff --git a/tests/qemuxmlconfdata/tseg-explicit-size.xml b/tests/qemuxmlconfdata/tseg-explicit-size.xml
index ae3121048495fa488cd6b82517d114288b1e0d42..ab9d07014a069bd7bba7c2bfb39a6ef2e90cc1a2 100644 (file)
--- a/tests/qemuxmlconfdata/tseg-explicit-size.xml
+++ b/tests/qemuxmlconfdata/tseg-explicit-size.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-q35-2.10'>hvm</type>
+    <type arch='x86_64' machine='q35'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>