From: Michal Privoznik <[email protected]> While our qemuhotplugtest already does a PCI hotplug and unlpug ("hostdev-pci") there is another way to hotplug a PCI device, esp. if it's a NIC: <interface type='hostdev'/>. This has been missing and as shown in v12.1.0-rc1-4-gfe782ed334 can be potentially dangerous as some different paths are taken. Introduce a test case for interface-hostdev.
Signed-off-by: Michal Privoznik <[email protected]> --- tests/qemuhotplugtest.c | 7 ++- .../qemuhotplug-interface-hostdev.xml | 6 ++ ...emuhotplug-base-live+interface-hostdev.xml | 63 +++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-interface-hostdev.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-hostdev.xml diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 58413b6e0d..3367804ed0 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -697,6 +697,10 @@ mymain(void) DO_TEST_DETACH("ppc64", "pseries-base-live", "hostdev-pci", false, false, "device_del", QMP_DEVICE_DELETED("hostdev0") QMP_OK); + DO_TEST_ATTACH("x86_64", "base-live", "interface-hostdev", false, true, + "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-vdpa", false, true, "query-fdsets", "{\"return\":[{\"fdset-id\":99999}]}", "add-fd", "{ \"return\": { \"fdset-id\": 1, \"fd\": 95 }}", @@ -803,4 +807,5 @@ VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virpci"), VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("virprocess"), - VIR_TEST_MOCK("qemuhotplug")); + VIR_TEST_MOCK("qemuhotplug"), + VIR_TEST_MOCK("virnetdev")); diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-interface-hostdev.xml b/tests/qemuhotplugtestdevices/qemuhotplug-interface-hostdev.xml new file mode 100644 index 0000000000..0eb7a1df1a --- /dev/null +++ b/tests/qemuhotplugtestdevices/qemuhotplug-interface-hostdev.xml @@ -0,0 +1,6 @@ +<interface type='hostdev' managed='yes'> + <source> + <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x2'/> + </source> + <mac address='52:54:00:6d:90:02'/> +</interface> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-hostdev.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-hostdev.xml new file mode 100644 index 0000000000..13288f7711 --- /dev/null +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-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:6d:90:02'/> + <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> -- 2.52.0
