Implement a sub-test in qemuxmlconftest that uses acpi-generic-initiator
to link a PCI device with multiple NUMA node definitions (without any
memory/cpu resource assigned).
Then translate the VM definition to the corresponding qemu command line
that associates the hostdev with the NUMA nodes.
Signed-off-by: Andrea Righi <arighi@xxxxxxxxxx>
---
.../acpi-generic-initiator.x86_64-latest.args | 55 ++++++++++
.../acpi-generic-initiator.x86_64-latest.xml | 102 ++++++++++++++++++
.../acpi-generic-initiator.xml | 102 ++++++++++++++++++
tests/qemuxmlconftest.c | 1 +
4 files changed, 260 insertions(+)
create mode 100644 tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args
create mode 100644 tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.xml
create mode 100644 tests/qemuxmlconfdata/acpi-generic-initiator.xml
diff --git a/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args b/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args
new file mode 100644
index 0000000000..ae2de56975
--- /dev/null
+++ b/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.args
@@ -0,0 +1,55 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest2,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes"}' \
+-machine q35,usb=off,dump-guest-core=off,acpi=off \
+-accel tcg \
+-cpu qemu64 \
+-m size=8388608k \
+-overcommit mem-lock=off \
+-smp 16,sockets=16,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":8589934592}' \
+-numa node,nodeid=0,cpus=0-15,memdev=ram-node0 \
+-numa node,nodeid=1 \
+-numa node,nodeid=2 \
+-numa node,nodeid=3 \
+-numa node,nodeid=4 \
+-numa node,nodeid=5 \
+-numa node,nodeid=6 \
+-numa node,nodeid=7 \
+-numa node,nodeid=8 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
+-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 strict=on \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=off \
+-watchdog-action reset \
+-device '{"driver":"vfio-pci","host":"0000:06:12.1","id":"hostdev0","bus":"pcie.0","addr":"0x2"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pcie.0","addr":"0x6"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-object '{"qom-type":"acpi-generic-initiator","id":"gi1","pci-dev":"hostdev0","node":1}' \
+-object '{"qom-type":"acpi-generic-initiator","id":"gi2","pci-dev":"hostdev0","node":2}' \
+-object '{"qom-type":"acpi-generic-initiator","id":"gi3","pci-dev":"hostdev0","node":3}' \
+-object '{"qom-type":"acpi-generic-initiator","id":"gi4","pci-dev":"hostdev0","node":4}' \
+-object '{"qom-type":"acpi-generic-initiator","id":"gi5","pci-dev":"hostdev0","node":5}' \
+-object '{"qom-type":"acpi-generic-initiator","id":"gi6","pci-dev":"hostdev0","node":6}' \
+-object '{"qom-type":"acpi-generic-initiator","id":"gi7","pci-dev":"hostdev0","node":7}' \
+-object '{"qom-type":"acpi-generic-initiator","id":"gi8","pci-dev":"hostdev0","node":8}' \
+-msg timestamp=on
diff --git a/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.xml b/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.xml
new file mode 100644
index 0000000000..16b7090812
--- /dev/null
+++ b/tests/qemuxmlconfdata/acpi-generic-initiator.x86_64-latest.xml
@@ -0,0 +1,102 @@
+<domain type='qemu'>
+ <name>QEMUGuest2</name>
+ <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>16</vcpu>
+ <os>
+ <type arch='x86_64' machine='q35'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ <numa>
+ <cell id='0' cpus='0-15' memory='8388608' unit='KiB'/>
+ <cell id='1' memory='0' unit='KiB'/>
+ <cell id='2' memory='0' unit='KiB'/>
+ <cell id='3' memory='0' unit='KiB'/>
+ <cell id='4' memory='0' unit='KiB'/>
+ <cell id='5' memory='0' unit='KiB'/>
+ <cell id='6' memory='0' unit='KiB'/>
+ <cell id='7' memory='0' unit='KiB'/>
+ <cell id='8' memory='0' unit='KiB'/>
+ </numa>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <controller type='pci' index='0' model='pcie-root'/>
+ <controller type='pci' index='1' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='1' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
+ </controller>
+ <controller type='pci' index='2' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='2' port='0x9'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+ </controller>
+ <controller type='sata' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+ </controller>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <audio id='1' type='none'/>
+ <hostdev mode='subsystem' type='pci' managed='yes'>
+ <source>
+ <address domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
+ </source>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+ </hostdev>
+ <watchdog model='itco' action='reset'/>
+ <memballoon model='virtio'>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
+ </memballoon>
+ <acpi-generic-initiator>
+ <alias name="gi1" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>1</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi2" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>2</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi3" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>3</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi4" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>4</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi5" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>5</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi6" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>6</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi7" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>7</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi8" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>8</numa-node>
+ </acpi-generic-initiator>
+ </devices>
+</domain>
diff --git a/tests/qemuxmlconfdata/acpi-generic-initiator.xml b/tests/qemuxmlconfdata/acpi-generic-initiator.xml
new file mode 100644
index 0000000000..16b7090812
--- /dev/null
+++ b/tests/qemuxmlconfdata/acpi-generic-initiator.xml
@@ -0,0 +1,102 @@
+<domain type='qemu'>
+ <name>QEMUGuest2</name>
+ <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static'>16</vcpu>
+ <os>
+ <type arch='x86_64' machine='q35'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <cpu mode='custom' match='exact' check='none'>
+ <model fallback='forbid'>qemu64</model>
+ <numa>
+ <cell id='0' cpus='0-15' memory='8388608' unit='KiB'/>
+ <cell id='1' memory='0' unit='KiB'/>
+ <cell id='2' memory='0' unit='KiB'/>
+ <cell id='3' memory='0' unit='KiB'/>
+ <cell id='4' memory='0' unit='KiB'/>
+ <cell id='5' memory='0' unit='KiB'/>
+ <cell id='6' memory='0' unit='KiB'/>
+ <cell id='7' memory='0' unit='KiB'/>
+ <cell id='8' memory='0' unit='KiB'/>
+ </numa>
+ </cpu>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <controller type='pci' index='0' model='pcie-root'/>
+ <controller type='pci' index='1' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='1' port='0x8'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
+ </controller>
+ <controller type='pci' index='2' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='2' port='0x9'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='usb' index='0' model='qemu-xhci'>
+ <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+ </controller>
+ <controller type='sata' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+ </controller>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <audio id='1' type='none'/>
+ <hostdev mode='subsystem' type='pci' managed='yes'>
+ <source>
+ <address domain='0x0000' bus='0x06' slot='0x12' function='0x1'/>
+ </source>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+ </hostdev>
+ <watchdog model='itco' action='reset'/>
+ <memballoon model='virtio'>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
+ </memballoon>
+ <acpi-generic-initiator>
+ <alias name="gi1" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>1</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi2" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>2</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi3" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>3</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi4" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>4</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi5" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>5</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi6" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>6</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi7" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>7</numa-node>
+ </acpi-generic-initiator>
+ <acpi-generic-initiator>
+ <alias name="gi8" />
+ <pci-dev>hostdev0</pci-dev>
+ <numa-node>8</numa-node>
+ </acpi-generic-initiator>
+ </devices>
+</domain>
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index c271170d25..cb415beef7 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -2793,6 +2793,7 @@ mymain(void)
DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-iommu-invalid-address-type");
DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-iommu-invalid-address");
DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-iommu-dma-translation");
+ DO_TEST_CAPS_LATEST("acpi-generic-initiator");
DO_TEST_CAPS_LATEST("cpu-hotplug-startup");
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("cpu-hotplug-granularity", "ppc64");
--
2.48.1
