6:33 a.m.
Modify the test case so that it can be used also for qemuxml2argvtest
by removing invalid configuration (interface type='user' + queues),
clean up unneeded disks and rename it accordingly. Also test the
ioeventfd.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../net-virtio-vhost.x86_64-latest.args | 42 +++++++++++++++++++
...{vhost_queues.xml => net-virtio-vhost.xml} | 25 +++++------
tests/qemuxml2argvtest.c | 1 +
...xml => net-virtio-vhost.x86_64-latest.xml} | 29 +++++++------
tests/qemuxml2xmltest.c | 2 +-
5 files changed, 69 insertions(+), 30 deletions(-)
create mode 100644 tests/qemuxml2argvdata/net-virtio-vhost.x86_64-latest.args
rename tests/qemuxml2argvdata/{vhost_queues.xml => net-virtio-vhost.xml} (67%)
rename tests/qemuxml2xmloutdata/{vhost_queues.x86_64-latest.xml =>
net-virtio-vhost.x86_64-latest.xml} (78%)
diff --git a/tests/qemuxml2argvdata/net-virtio-vhost.x86_64-latest.args
b/tests/qemuxml2argvdata/net-virtio-vhost.x86_64-latest.args
new file mode 100644
index 0000000000..eabe768169
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-virtio-vhost.x86_64-latest.args
@@ -0,0 +1,42 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-test \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=test,debug-threads=on \
+-S \
+-object
'{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}'
\
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=1048576k \
+-object
'{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}'
\
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot menu=on,strict=on \
+-device
'{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}'
\
+-device
'{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x6"}'
\
+-netdev
'{"type":"tap","fds":"3:4:5:6:7","vhost":true,"vhostfds":"44:45:46:47:48","id":"hostnet0"}'
\
+-device
'{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}'
\
+-netdev
'{"type":"tap","fd":"3","vhost":true,"vhostfd":"44","id":"hostnet1"}'
\
+-device
'{"driver":"virtio-net-pci","ioeventfd":true,"netdev":"hostnet1","id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}'
\
+-netdev
'{"type":"tap","fds":"3:4:5:6:7","vhost":true,"vhostfds":"44:45:46:47:48","id":"hostnet2"}'
\
+-device
'{"driver":"virtio-net-pci","ioeventfd":true,"mq":true,"vectors":12,"netdev":"hostnet2","id":"net2","mac":"52:54:00:e5:48:5a","bus":"pci.0","addr":"0x4"}'
\
+-chardev pty,id=charserial0 \
+-device
'{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}'
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-device
'{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x5"}'
\
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/vhost_queues.xml
b/tests/qemuxml2argvdata/net-virtio-vhost.xml
similarity index 67%
rename from tests/qemuxml2argvdata/vhost_queues.xml
rename to tests/qemuxml2argvdata/net-virtio-vhost.xml
index 2e38f2dad3..9d1feabe68 100644
--- a/tests/qemuxml2argvdata/vhost_queues.xml
+++ b/tests/qemuxml2argvdata/net-virtio-vhost.xml
@@ -16,30 +16,27 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2' event_idx='on'/>
- <source file='/var/lib/libvirt/images/f14.img'/>
- <target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='qemu' type='raw'/>
- <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
target='0' unit='0'/>
- </disk>
<controller type='usb' index='0'/>
<controller type='virtio-serial' index='0'>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
</controller>
<controller type='ide' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
- <interface type='user'>
+ <interface type='ethernet'>
<mac address='52:54:00:e5:48:58'/>
<model type='virtio'/>
<driver name='vhost' queues='5'/>
</interface>
+ <interface type='ethernet'>
+ <mac address='52:54:00:e5:48:59'/>
+ <model type='virtio'/>
+ <driver name='vhost' ioeventfd='on'/>
+ </interface>
+ <interface type='ethernet'>
+ <mac address='52:54:00:e5:48:5A'/>
+ <model type='virtio'/>
+ <driver name='vhost' ioeventfd='on' queues='5'/>
+ </interface>
<serial type='pty'>
<target port='0'/>
</serial>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 22fd35809b..13d279b301 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1379,6 +1379,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("net-virtio-device");
DO_TEST_CAPS_LATEST("net-virtio-disable-offloads");
DO_TEST_CAPS_LATEST("net-virtio-netdev");
+ DO_TEST_CAPS_LATEST("net-virtio-vhost");
DO_TEST_CAPS_ARCH_LATEST("net-virtio-ccw", "s390x");
DO_TEST_CAPS_LATEST("net-virtio-rxtxqueuesize");
DO_TEST_CAPS_LATEST_PARSE_ERROR("net-virtio-rxqueuesize-invalid-size");
diff --git a/tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/net-virtio-vhost.x86_64-latest.xml
similarity index 78%
rename from tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml
rename to tests/qemuxml2xmloutdata/net-virtio-vhost.x86_64-latest.xml
index 8fbc4ccc99..66630c2697 100644
--- a/tests/qemuxml2xmloutdata/vhost_queues.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-vhost.x86_64-latest.xml
@@ -19,19 +19,6 @@
<on_crash>restart</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2' event_idx='on'/>
- <source file='/var/lib/libvirt/images/f14.img'/>
- <target dev='vda' bus='virtio'/>
- <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
- </disk>
- <disk type='file' device='cdrom'>
- <driver name='qemu' type='raw'/>
- <source file='/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
- <target dev='hdc' bus='ide'/>
- <readonly/>
- <address type='drive' controller='0' bus='1'
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>
@@ -42,12 +29,24 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
- <interface type='user'>
+ <interface type='ethernet'>
<mac address='52:54:00:e5:48:58'/>
<model type='virtio'/>
<driver name='vhost' queues='5'/>
<address type='pci' domain='0x0000' bus='0x00'
slot='0x02' function='0x0'/>
</interface>
+ <interface type='ethernet'>
+ <mac address='52:54:00:e5:48:59'/>
+ <model type='virtio'/>
+ <driver name='vhost' ioeventfd='on'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ <interface type='ethernet'>
+ <mac address='52:54:00:e5:48:5a'/>
+ <model type='virtio'/>
+ <driver name='vhost' ioeventfd='on' queues='5'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
+ </interface>
<serial type='pty'>
<target type='isa-serial' port='0'>
<model name='isa-serial'/>
@@ -60,7 +59,7 @@
<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='0x05' function='0x0'/>
</memballoon>
</devices>
</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 466620bd56..df7c9da240 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -383,6 +383,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("net-virtio");
DO_TEST_CAPS_LATEST("net-virtio-device");
DO_TEST_CAPS_LATEST("net-virtio-disable-offloads");
+ DO_TEST_CAPS_LATEST("net-virtio-vhost");
DO_TEST_CAPS_LATEST("net-linkstate");
DO_TEST_CAPS_LATEST("net-eth");
DO_TEST_CAPS_LATEST("net-eth-ifname");
@@ -476,7 +477,6 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x");
DO_TEST_CAPS_LATEST("lease");
DO_TEST_CAPS_LATEST("event_idx");
- DO_TEST_CAPS_LATEST("vhost_queues");
DO_TEST_CAPS_LATEST("interface-driver");
DO_TEST_CAPS_LATEST("net-server");
DO_TEST_CAPS_LATEST("virtio-lun");
--
2.43.0