[PATCH 06/11] tests: Add test case for CPU clusters

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- .../cpu-topology5.aarch64-latest.args | 31 +++++++++++++++++++ tests/qemuxml2argvdata/cpu-topology5.xml | 17 ++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 49 insertions(+) create mode 100644 tests/qemuxml2argvdata/cpu-topology5.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-topology5.xml diff --git a/tests/qemuxml2argvdata/cpu-topology5.aarch64-latest.args b/tests/qemuxml2argvdata/cpu-topology5.aarch64-latest.args new file mode 100644 index 0000000000..d835e1c0fa --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-topology5.aarch64-latest.args @@ -0,0 +1,31 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,maxcpus=8,sockets=1,dies=1,clusters=2,cores=2,threads=2 \ +-uuid c7a5fdbd-edaf-9455-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-topology5.xml b/tests/qemuxml2argvdata/cpu-topology5.xml new file mode 100644 index 0000000000..f78f0b6b54 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-topology5.xml @@ -0,0 +1,17 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <vcpu placement='static' current='1'>8</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + </os> + <cpu> + <topology sockets='1' dies='1' clusters='2' cores='2' threads='2'/> + </cpu> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' model='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cb78465fc2..1be138bb0f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1813,6 +1813,7 @@ mymain(void) DO_TEST_CAPS_LATEST("cpu-topology2"); DO_TEST_CAPS_LATEST("cpu-topology3"); DO_TEST_CAPS_LATEST("cpu-topology4"); + DO_TEST_CAPS_ARCH_LATEST("cpu-topology5", "aarch64"); DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); -- 2.43.0