qemuhotplug: Introduce interface-network-hostdev

Inspired by commit of v12.1.0-37-g25662b3700.
We already have a test case for <interface type='hostdev'/>, but
what we are missing is <interface type='network'/> where the
network is of a <forward mode='hostdev'/>. Apparently, we had a
crasher there too.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index ae29f47c16c0e9d086aca2f53a0125e4b4e8f680..ea9d3243f8b18af47c0498139a1ecdb41c1843a1 100644 (file)
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -724,6 +724,10 @@ mymain(void)
                    "device_add", QMP_OK);
     DO_TEST_DETACH("x86_64", "base-live", "interface-hostdev", false, false,
                    "device_del", QMP_DEVICE_DELETED("hostdev0") QMP_OK);
+    DO_TEST_ATTACH("x86_64", "base-live", "interface-network-hostdev", false, true,
+                   "device_add", QMP_OK);
+    DO_TEST_DETACH("x86_64", "base-live", "interface-network-hostdev", false, false,
+                   "device_del", QMP_DEVICE_DELETED("hostdev0") QMP_OK);
 #endif
     DO_TEST_ATTACH("x86_64", "base-live", "interface-vdpa", false, true,
                    "query-fdsets", "{\"return\":[{\"fdset-id\":99999}]}",

diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-interface-network-hostdev.xml b/tests/qemuhotplugtestdevices/qemuhotplug-interface-network-hostdev.xml
new file mode 100644 (file)
index 0000000..b432412
--- /dev/null
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-interface-network-hostdev.xml
@@ -0,0 +1,4 @@
+<interface type='network'>
+  <mac address='52:54:00:7b:35:93'/>
+  <source network='hostdev;plug-hostdev-pci'/>
+</interface>

diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-network-hostdev.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-network-hostdev.xml
new file mode 100644 (file)
index 0000000..6775fdc
--- /dev/null
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-network-hostdev.xml
@@ -0,0 +1,63 @@
+<domain type='kvm' id='7'>
+  <name>hotplug</name>
+  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
+  <memory unit='KiB'>4194304</memory>
+  <currentMemory unit='KiB'>4194304</currentMemory>
+  <vcpu placement='static'>4</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <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>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <alias name='usb'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <alias name='ide'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='scsi' index='0' model='virtio-scsi'>
+      <alias name='scsi0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'>
+      <alias name='pci'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <alias name='virtio-serial0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </controller>
+    <interface type='hostdev' managed='yes'>
+      <mac address='52:54:00:7b:35:93'/>
+      <driver name='vfio'/>
+      <source>
+        <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x2'/>
+      </source>
+      <alias name='hostdev0'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </interface>
+    <input type='mouse' bus='ps2'>
+      <alias name='input0'/>
+    </input>
+    <input type='keyboard' bus='ps2'>
+      <alias name='input1'/>
+    </input>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+  <seclabel type='none' model='none'/>
+</domain>