tests: qemuxml: Remove prehistoric machine types from legacy tests

None of the tests depend on anything that the machine type would
influence. This will allow us to drop the very old machine type from the
non-real-data tests. If something depends on the machine type it should
be tested with real data rather than this hack.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuxml2argvdata/disk-discard.args b/tests/qemuxml2argvdata/disk-discard.args
index 8d7351e32990094e802e7cc8023b524040bcd5b5..163b1b0df2105650bfe48225531ce40841958a36 100644 (file)
--- a/tests/qemuxml2argvdata/disk-discard.args
+++ b/tests/qemuxml2argvdata/disk-discard.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name test \
 -S \
--machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 1024 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/disk-discard.xml b/tests/qemuxml2argvdata/disk-discard.xml
index ec53d69c4eb9d0d880370ceb0446b1ccb729ab6e..05271a4ec9a92ea38d8f192ac8e84f0333d7ec08 100644 (file)
--- a/tests/qemuxml2argvdata/disk-discard.xml
+++ b/tests/qemuxml2argvdata/disk-discard.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-0.13'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>

diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args b/tests/qemuxml2argvdata/disk-ioeventfd.args
index a3c989c32f59eecc7d6503bde776c4f99ed2a6fb..2fc3562b164a08b0363c548cac2b7438f0276081 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name test \
 -S \
--machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 1024 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.xml b/tests/qemuxml2argvdata/disk-ioeventfd.xml
index 55c11177246b6530a8dba55ff0a9b2f9b30dbc9f..7d96be9e4283d4edd43fc62e04ec602aecb8a1e2 100644 (file)
--- a/tests/qemuxml2argvdata/disk-ioeventfd.xml
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.xml
@@ -4,7 +4,7 @@
   <memory unit='KiB'>1048576</memory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-0.13'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>

diff --git a/tests/qemuxml2argvdata/event_idx.args b/tests/qemuxml2argvdata/event_idx.args
index 97f859c65220dd3215f676f5e774b186ed7372c1..bfeeffd93993a6954617e14d94ed0a100f708cf5 100644 (file)
--- a/tests/qemuxml2argvdata/event_idx.args
+++ b/tests/qemuxml2argvdata/event_idx.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name test \
 -S \
--machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 1024 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/event_idx.xml b/tests/qemuxml2argvdata/event_idx.xml
index c1771398505a692fa6ab5e0f206e114fc2363944..01554402b156c0fed9d493d98c5227cd2c0d5486 100644 (file)
--- a/tests/qemuxml2argvdata/event_idx.xml
+++ b/tests/qemuxml2argvdata/event_idx.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-0.13'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>

diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index 4aa4724624ed7a21f61b566710b833e616e25183..4ffc2295d06ebae0364c73eaf17cd417d1674ec5 100644 (file)
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name QEMUGuest1 \
 -S \
--machine pc-0.15,accel=kvm,usb=off,dump-guest-core=off \
+-machine pc,accel=kvm,usb=off,dump-guest-core=off \
 -m 1024 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.xml b/tests/qemuxml2argvdata/video-device-pciaddr-default.xml
index e2afb3ec5e309a04f78cb1030dd3534ca3778534..097e51fb0f078a02d45b30958cdd0fcd873e204e 100644 (file)
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.xml
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-0.15'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2argvdata/virtio-lun.args b/tests/qemuxml2argvdata/virtio-lun.args
index fb1c733bd6bf87f5db21677af498802c41738c9c..7df1512b9b7e2862b7ce482a824c3e5fdb60b5a0 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-lun.args
+++ b/tests/qemuxml2argvdata/virtio-lun.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name test \
 -S \
--machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 1024 \
 -realtime mlock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvdata/virtio-lun.xml b/tests/qemuxml2argvdata/virtio-lun.xml
index 769c129f17744e02fb978c777f560300f2357d0a..303131fb619205398cf6a902285311af6923fe79 100644 (file)
--- a/tests/qemuxml2argvdata/virtio-lun.xml
+++ b/tests/qemuxml2argvdata/virtio-lun.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-0.13'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>

diff --git a/tests/qemuxml2xmloutdata/disk-discard.xml b/tests/qemuxml2xmloutdata/disk-discard.xml
index d51c3a181909748bed593e7acf944be0a3d37434..563a24ae047af37f71e75efc7ba181e32f5294d7 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-discard.xml
+++ b/tests/qemuxml2xmloutdata/disk-discard.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-0.13'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>

diff --git a/tests/qemuxml2xmloutdata/event_idx.xml b/tests/qemuxml2xmloutdata/event_idx.xml
index 4976da89929816c497975c1469ed4c6d886150ad..5ba208e36751ffe9e12dbd73ef2a93b8ec2167ea 100644 (file)
--- a/tests/qemuxml2xmloutdata/event_idx.xml
+++ b/tests/qemuxml2xmloutdata/event_idx.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-0.13'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>

diff --git a/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml b/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
index b972a9e44223e941a3eb35fcb8a50e963d572858..b278f2a06d8fac069776ddf44b1d18cfadca3b7c 100644 (file)
--- a/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
+++ b/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-0.15'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2xmloutdata/virtio-lun.xml b/tests/qemuxml2xmloutdata/virtio-lun.xml
index c98e2dc620fd667d8ae96d82b2a8a0062b2604bb..dbedd4edc09f98f2014947408d0606f99430b0d9 100644 (file)
--- a/tests/qemuxml2xmloutdata/virtio-lun.xml
+++ b/tests/qemuxml2xmloutdata/virtio-lun.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-0.13'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='cdrom'/>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>