Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx> --- ...e-expander-bus-aarch64.aarch64-latest.args | 32 +++++++++++++++++++ .../pcie-expander-bus-aarch64.xml | 15 +++++++++ tests/qemuxml2argvtest.c | 1 + ...ie-expander-bus-aarch64.aarch64-latest.xml | 32 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 81 insertions(+) create mode 100644 tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/pcie-expander-bus-aarch64.xml create mode 100644 tests/qemuxml2xmloutdata/pcie-expander-bus-aarch64.aarch64-latest.xml diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args new file mode 100644 index 0000000000..d3b7f724aa --- /dev/null +++ b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-pcie-expander-bus-te \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=pcie-expander-bus-test,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-pcie-expander-bus-te/master-key.aes"}' \ +-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,memory-backend=mach-virt.ram \ +-cpu cortex-a15 \ +-m 2048 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":2147483648}' \ +-overcommit mem-lock=off \ +-smp 16,sockets=16,cores=1,threads=1 \ +-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ +-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 \ +-no-acpi \ +-boot strict=on \ +-device pxb-pcie,bus_nr=254,id=pci.1,bus=pcie.0,addr=0x1 \ +-audiodev id=audio1,driver=none \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.xml b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.xml new file mode 100644 index 0000000000..da27fc5abe --- /dev/null +++ b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.xml @@ -0,0 +1,15 @@ +<domain type='qemu'> + <name>pcie-expander-bus-test</name> + <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid> + <memory unit='KiB'>2097152</memory> + <vcpu placement='static'>16</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-expander-bus'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 67c056b887..b552f5deed 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2847,6 +2847,7 @@ mymain(void) DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-bus", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_PXB_PCIE); + DO_TEST_CAPS_ARCH_LATEST("pcie-expander-bus-aarch64", "aarch64"); DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0"); DO_TEST_CAPS_LATEST("hostdev-scsi-lsi"); diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus-aarch64.aarch64-latest.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus-aarch64.aarch64-latest.xml new file mode 100644 index 0000000000..f68203f3fe --- /dev/null +++ b/tests/qemuxml2xmloutdata/pcie-expander-bus-aarch64.aarch64-latest.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>pcie-expander-bus-test</name> + <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static'>16</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>cortex-a15</model> + </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-aarch64</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-expander-bus'> + <model name='pxb-pcie'/> + <target busNr='254'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 983489af6c..9652d2a7ce 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -989,6 +989,7 @@ mymain(void) QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_DEVICE_PXB_PCIE); + DO_TEST_CAPS_ARCH_LATEST("pcie-expander-bus-aarch64", "aarch64"); DO_TEST("autoindex", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, -- 2.31.1