Some test cases have the backend tag inside wrong interfaces. The backend xml
tag does not support <interface type='user|direct|hostdev'>. So this commit
removes some tags inside those interfaces.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
---
 tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml     | 2 --
 tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml               | 1 -
 tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml | 2 --
 tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml           | 1 -
 4 files changed, 6 deletions(-)

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml b/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml
index a1532cb..355c1e4 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml
@@ -26,13 +26,11 @@
       <mac address='52:54:00:e5:48:58'/>
       <model type='e1000'/>
       <driver name='vhost' queues='5'/>
-      <backend tap='/dev/null' vhost='/dev/zero'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:e5:48:59'/>
       <model type='virtio'/>
       <driver name='vhost' queues='1'/>
-      <backend tap='/dev/null' vhost='/dev/zero'/>
     </interface>
     <serial type='pty'>
       <target port='0'/>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml b/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml
index c2303b7..aac99aa 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml
@@ -39,7 +39,6 @@
       <mac address='52:54:00:e5:48:58'/>
       <model type='virtio'/>
       <driver name='vhost' queues='5'/>
-      <backend tap='/dev/null' vhost='/dev/zero'/>
     </interface>
     <serial type='pty'>
       <target port='0'/>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
index 3a95b60..b9d5003 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
@@ -29,14 +29,12 @@
     <interface type='user'>
       <mac address='52:54:00:e5:48:58'/>
       <model type='e1000'/>
-      <backend tap='/dev/null'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </interface>
     <interface type='user'>
       <mac address='52:54:00:e5:48:59'/>
       <model type='virtio'/>
       <driver name='vhost'/>
-      <backend tap='/dev/null' vhost='/dev/zero'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </interface>
     <serial type='pty'>
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
index 759b844..8c27470 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
@@ -43,7 +43,6 @@
       <mac address='52:54:00:e5:48:58'/>
       <model type='virtio'/>
       <driver name='vhost' queues='5'/>
-      <backend tap='/dev/null' vhost='/dev/zero'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </interface>
     <serial type='pty'>
-- 
2.7.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Mon, Oct 16, 2017 at 10:07:57PM -0200, Julio Faracco wrote:
>Some test cases have the backend tag inside wrong interfaces. The backend xml
>tag does not support <interface type='user|direct|hostdev'>. So this commit
>removes some tags inside those interfaces.
>
>Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
>---
> tests/qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml     | 2 --
> tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml               | 1 -
> tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml | 2 --
> tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml           | 1 -
> 4 files changed, 6 deletions(-)
>

The point of these tests is to have the behavior of the <backend>
parsing recorded in the test suite.

IIRC these were added before we mocked the tap device creation in
qemuxml2argvtest and we (ab)used the 'user' interface type to test
XML parsing without having any effect on the host system.

The right thing to do here is to change the interface type, not to
delete the backend tag.

Jan
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list