tests: qemuxml2xml: 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.

Note that these tests are run only in the XML->XML suite because the
XML->argv suite doesn't work with the network driver.

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

diff --git a/tests/qemuxml2argvdata/interface-driver.xml b/tests/qemuxml2argvdata/interface-driver.xml
index d7562e59c415e827e9be4dff164935a846b4b4ec..8c8f043a9391729b0e42a7c4c5c074941d5ac851 100644 (file)
--- a/tests/qemuxml2argvdata/interface-driver.xml
+++ b/tests/qemuxml2argvdata/interface-driver.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/net-bandwidth.xml b/tests/qemuxml2argvdata/net-bandwidth.xml
index 99c4d2e85583f2d456bdebb912ca9ac3555f8b7c..3d43f1666ba097b024b0728aab4c530813e29875 100644 (file)
--- a/tests/qemuxml2argvdata/net-bandwidth.xml
+++ b/tests/qemuxml2argvdata/net-bandwidth.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>2</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/net-bandwidth2.xml b/tests/qemuxml2argvdata/net-bandwidth2.xml
index 12d2e8e59f05ecaccfe87e4b87d5d02bacca541f..b75e17da160fdb8be29c46d5953a8d5ca899aac1 100644 (file)
--- a/tests/qemuxml2argvdata/net-bandwidth2.xml
+++ b/tests/qemuxml2argvdata/net-bandwidth2.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>2</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/net-coalesce.xml b/tests/qemuxml2argvdata/net-coalesce.xml
index b510324427d3272522b3fa3a29a59146d9dbe2e5..bdcf7864295345007e662883bf315db61b3750f8 100644 (file)
--- a/tests/qemuxml2argvdata/net-coalesce.xml
+++ b/tests/qemuxml2argvdata/net-coalesce.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/net-mtu.xml b/tests/qemuxml2argvdata/net-mtu.xml
index 173c0d97ef65b50dcbc2dd26b5850e24cebc9505..99258b97fac1cf4e049ffa76be46c972a217721e 100644 (file)
--- a/tests/qemuxml2argvdata/net-mtu.xml
+++ b/tests/qemuxml2argvdata/net-mtu.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/tap-vhost-incorrect.xml b/tests/qemuxml2argvdata/tap-vhost-incorrect.xml
index 4e1d67e4e18b7a6d31fae04143a5a6aa796e64a0..084ddae346d93b229ae922d8fef2e60f5c8bbd15 100644 (file)
--- a/tests/qemuxml2argvdata/tap-vhost-incorrect.xml
+++ b/tests/qemuxml2argvdata/tap-vhost-incorrect.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/tap-vhost.xml b/tests/qemuxml2argvdata/tap-vhost.xml
index 6d7ffb05a33ede9e17ee17be2e5f964fd257d47a..0e2e7ddf21929170f23411c68b89d78c08c61342 100644 (file)
--- a/tests/qemuxml2argvdata/tap-vhost.xml
+++ b/tests/qemuxml2argvdata/tap-vhost.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/vhost_queues.xml b/tests/qemuxml2argvdata/vhost_queues.xml
index aac99aa1bb536bdea2585dbeb16da1d2675734df..2e38f2dad3256234e2946f8ab8b62b07e93aae61 100644 (file)
--- a/tests/qemuxml2argvdata/vhost_queues.xml
+++ b/tests/qemuxml2argvdata/vhost_queues.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/interface-driver.xml b/tests/qemuxml2xmloutdata/interface-driver.xml
index 5be590e759da04bbea802dcc0d67305710089551..06606b7fbb877b435356364e0164790a6a1bb3ab 100644 (file)
--- a/tests/qemuxml2xmloutdata/interface-driver.xml
+++ b/tests/qemuxml2xmloutdata/interface-driver.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/net-bandwidth.xml b/tests/qemuxml2xmloutdata/net-bandwidth.xml
index 4ec77d154fa14a953b22c7ab2f5438ef9ccf1ebe..906081c33d6a2d89c49499ed5b678c79cbc94b2e 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-bandwidth.xml
+++ b/tests/qemuxml2xmloutdata/net-bandwidth.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>2</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/net-bandwidth2.xml b/tests/qemuxml2xmloutdata/net-bandwidth2.xml
index ee65c3a5b1a31199a512aa55d824a3a884fc4a5c..e9c8388078b22b06b9b775d2723e0ed7ccd98a98 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-bandwidth2.xml
+++ b/tests/qemuxml2xmloutdata/net-bandwidth2.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>2</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/net-coalesce.xml b/tests/qemuxml2xmloutdata/net-coalesce.xml
index 56792b99990579fa48e482ac5fb104db14226e6b..3a37587dde6932b2f48db3ac2a1d861a3fd7feff 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-coalesce.xml
+++ b/tests/qemuxml2xmloutdata/net-coalesce.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/net-mtu.xml b/tests/qemuxml2xmloutdata/net-mtu.xml
index fc7b2e39ae592d0afe489a24efe809a028843bc3..e729d5b6faff4f9a78a240b90cd94747f5ea4a76 100644 (file)
--- a/tests/qemuxml2xmloutdata/net-mtu.xml
+++ b/tests/qemuxml2xmloutdata/net-mtu.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/tap-vhost-incorrect.xml b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
index c4334f6ca537fd24d4a919b57432b68082e04b71..b312ea4d150b6f4127eebf3a592dd95d7e37ecb6 100644 (file)
--- a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.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/tap-vhost.xml b/tests/qemuxml2xmloutdata/tap-vhost.xml
index 8e761762f4bdc9f2fc4bfb11f65423553c9c6593..32fe224cf90040750f3abcce4a7c1cee9e8647f3 100644 (file)
--- a/tests/qemuxml2xmloutdata/tap-vhost.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost.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/vhost_queues.xml b/tests/qemuxml2xmloutdata/vhost_queues.xml
index 49a7b550b3b81efbe8bc44adf7d3b374a856f753..8bfeb5bc8977d84598812ceeee6b6a0834c3e9f2 100644 (file)
--- a/tests/qemuxml2xmloutdata/vhost_queues.xml
+++ b/tests/qemuxml2xmloutdata/vhost_queues.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'/>