[PATCH 20/21] 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(a)redhat.com&gt; --- tests/qemuxml2argvdata/interface-driver.xml | 2 +- tests/qemuxml2argvdata/net-bandwidth.xml | 2 +- tests/qemuxml2argvdata/net-bandwidth2.xml | 2 +- tests/qemuxml2argvdata/net-coalesce.xml | 2 +- tests/qemuxml2argvdata/net-mtu.xml | 2 +- tests/qemuxml2argvdata/tap-vhost-incorrect.xml | 2 +- tests/qemuxml2argvdata/tap-vhost.xml | 2 +- tests/qemuxml2argvdata/vhost_queues.xml | 2 +- tests/qemuxml2xmloutdata/interface-driver.xml | 2 +- tests/qemuxml2xmloutdata/net-bandwidth.xml | 2 +- tests/qemuxml2xmloutdata/net-bandwidth2.xml | 2 +- tests/qemuxml2xmloutdata/net-coalesce.xml | 2 +- tests/qemuxml2xmloutdata/net-mtu.xml | 2 +- tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml | 2 +- tests/qemuxml2xmloutdata/tap-vhost.xml | 2 +- tests/qemuxml2xmloutdata/vhost_queues.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/qemuxml2argvdata/interface-driver.xml b/tests/qemuxml2argvdata/interface-driver.xml index d7562e59c4..8c8f043a93 100644 --- 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 99c4d2e855..3d43f1666b 100644 --- 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 12d2e8e59f..b75e17da16 100644 --- 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 b510324427..bdcf786429 100644 --- 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 173c0d97ef..99258b97fa 100644 --- 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 4e1d67e4e1..084ddae346 100644 --- 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 6d7ffb05a3..0e2e7ddf21 100644 --- 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 aac99aa1bb..2e38f2dad3 100644 --- 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 5be590e759..06606b7fbb 100644 --- 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 4ec77d154f..906081c33d 100644 --- 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 ee65c3a5b1..e9c8388078 100644 --- 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 56792b9999..3a37587dde 100644 --- 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 fc7b2e39ae..e729d5b6fa 100644 --- 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 c4334f6ca5..b312ea4d15 100644 --- 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 8e761762f4..32fe224cf9 100644 --- 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 49a7b550b3..8bfeb5bc89 100644 --- 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'/> -- 2.24.1