[PATCH 09/19] qemuxml2xmltest: Move 'graphics-listen-network2' case go genericxml2xmltest
The tested configuration is not valid for a qemu VM. Move it to the
generic test.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../graphics-listen-network2.xml | 0
.../graphics-listen-network2.xml} | 19 +++----------------
tests/genericxml2xmltest.c | 1 +
tests/qemuxml2xmltest.c | 1 -
4 files changed, 4 insertions(+), 17 deletions(-)
rename tests/{qemuxml2argvdata => genericxml2xmlindata}/graphics-listen-network2.xml
(100%)
rename tests/{qemuxml2xmloutdata/graphics-listen-network2.x86_64-latest.xml =>
genericxml2xmloutdata/graphics-listen-network2.xml} (59%)
diff --git a/tests/qemuxml2argvdata/graphics-listen-network2.xml
b/tests/genericxml2xmlindata/graphics-listen-network2.xml
similarity index 100%
rename from tests/qemuxml2argvdata/graphics-listen-network2.xml
rename to tests/genericxml2xmlindata/graphics-listen-network2.xml
diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network2.x86_64-latest.xml
b/tests/genericxml2xmloutdata/graphics-listen-network2.xml
similarity index 59%
rename from tests/qemuxml2xmloutdata/graphics-listen-network2.x86_64-latest.xml
rename to tests/genericxml2xmloutdata/graphics-listen-network2.xml
index e13bd7fe74..e8befe696c 100644
--- a/tests/qemuxml2xmloutdata/graphics-listen-network2.x86_64-latest.xml
+++ b/tests/genericxml2xmloutdata/graphics-listen-network2.xml
@@ -8,9 +8,6 @@
<type arch='x86_64' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
- <cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>qemu64</model>
- </cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
@@ -18,31 +15,21 @@
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0'
target='0' unit='0'/>
</disk>
- <controller type='usb' index='0' model='piix3-uhci'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
- </controller>
- <controller type='ide' index='0'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
- </controller>
- <controller type='pci' index='0' model='pci-root'/>
+ <controller type='usb' index='0'/>
+ <controller type='ide' index='0'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<graphics type='vnc' port='-1' autoport='yes'
listen='1.2.3.4'>
<listen type='address' address='1.2.3.4'/>
<listen type='network' network='Bobsnetwork'/>
</graphics>
- <audio id='1' type='none'/>
<video>
<model type='cirrus' vram='16384' heads='1'
primary='yes'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</video>
- <memballoon model='virtio'>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
- </memballoon>
+ <memballoon model='virtio'/>
</devices>
</domain>
diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
index 6025054876..19d08686df 100644
--- a/tests/genericxml2xmltest.c
+++ b/tests/genericxml2xmltest.c
@@ -174,6 +174,7 @@ mymain(void)
DO_TEST_FAIL_ACTIVE("graphics-vnc-socket-attr-listen-socket-mismatch");
DO_TEST("graphics-vnc-autoport-no");
DO_TEST_FAIL_INACTIVE("graphics-listen-network-invalid");
+ DO_TEST_DIFFERENT("graphics-listen-network2");
DO_TEST_FAIL_ACTIVE("name-slash-fail");
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 8cc0874f65..e04001156c 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -574,7 +574,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-scsi-device-auto");
DO_TEST_CAPS_LATEST("console-virtio");
DO_TEST_CAPS_LATEST("serial-target-port-auto");
- DO_TEST_CAPS_LATEST("graphics-listen-network2");
DO_TEST_CAPS_LATEST("numad-auto-vcpu-no-numatune");
DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-no-cpuset-and-placement");
DO_TEST_CAPS_LATEST("numad-auto-memory-vcpu-cpuset");
--
2.43.0