tests: qemuxml2xmltest: remove interface from disk test

There is no need to specify an interface for a disk test.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>

diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
index 9041eda95abb78bed2d807b4b7e8e0d74c79f8b3..98ddf685e2ce933e6d65ef16c2d7b07e091cb84a 100644 (file)
--- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
@@ -36,9 +36,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
 -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0","bootindex":1}' \
--netdev user,id=hostnet0 \
--device '{"driver":"virtio-net-pci","tx":"bh","netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on

diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.xml b/tests/qemuxml2argvdata/disk-copy_on_read.xml
index 95f4715bbdde675f23224fd1c2662fa200c9f943..10f56a8a640fb454c57400a406ac2e5c0dfaf69d 100644 (file)
--- a/tests/qemuxml2argvdata/disk-copy_on_read.xml
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.xml
@@ -35,11 +35,6 @@
     </controller>
     <controller type='ide' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
-    <interface type='user'>
-      <mac address='52:54:00:e5:48:58'/>
-      <model type='virtio'/>
-      <driver name='vhost' txmode='iothread'/>
-    </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <memballoon model='virtio'/>

diff --git a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
index b2581450e93b0cd365d44ade041f5b84049c9c82..ae76cbafad743b37b1338604eca7ffec84d1f8a8 100644 (file)
--- a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
+++ b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
@@ -39,17 +39,11 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
     <controller type='pci' index='0' model='pci-root'/>
-    <interface type='user'>
-      <mac address='52:54:00:e5:48:58'/>
-      <model type='virtio'/>
-      <driver name='vhost' txmode='iothread'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
   </devices>
 </domain>

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 32e331ca5d7d1b49a391ee107325e9da0d10fc6d..b55715e0f5758131402da7f98f2f7e54f2fe0b16 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -747,7 +747,7 @@ mymain(void)
     DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement");
     DO_TEST_NOCAPS("numad-auto-memory-vcpu-cpuset");
     DO_TEST_NOCAPS("usb-ich9-ehci-addr");
-    DO_TEST("disk-copy_on_read", QEMU_CAPS_VIRTIO_TX_ALG);
+    DO_TEST_NOCAPS("disk-copy_on_read");
     DO_TEST_CAPS_LATEST("tpm-passthrough");
     DO_TEST_CAPS_LATEST("tpm-passthrough-crb");
     DO_TEST_CAPS_LATEST("tpm-emulator");