From: Boris Fiuczynski <fiuczy@linux.ibm.com> Add DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE for s390-secure-boot to ensure the XML definition and formatting remain stable across ABI updates. Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com> --- ...0-secure-boot.s390x-latest.abi-update.args | 32 ++++++++++++++++++ ...90-secure-boot.s390x-latest.abi-update.xml | 33 +++++++++++++++++++ tests/qemuxmlconftest.c | 1 + 3 files changed, 66 insertions(+) create mode 100644 tests/qemuxmlconfdata/s390-secure-boot.s390x-latest.abi-update.args create mode 100644 tests/qemuxmlconfdata/s390-secure-boot.s390x-latest.abi-update.xml diff --git a/tests/qemuxmlconfdata/s390-secure-boot.s390x-latest.abi-update.args b/tests/qemuxmlconfdata/s390-secure-boot.s390x-latest.abi-update.args new file mode 100644 index 0000000000..17c0c09f99 --- /dev/null +++ b/tests/qemuxmlconfdata/s390-secure-boot.s390x-latest.abi-update.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram,secure-boot=on,boot-certs.0.path=/path/to/cert.pem \ +-accel tcg \ +-cpu qemu \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \ +-object '{"qom-type":"monitor-qmp","id":"monitor","chardev":"charmonitor"}' \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0000"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/s390-secure-boot.s390x-latest.abi-update.xml b/tests/qemuxmlconfdata/s390-secure-boot.s390x-latest.abi-update.xml new file mode 100644 index 0000000000..32ed103bc2 --- /dev/null +++ b/tests/qemuxmlconfdata/s390-secure-boot.s390x-latest.abi-update.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> + <firmware> + <feature enabled='yes' name='secure-boot'/> + </firmware> + <boot-certs> + <path>/path/to/cert.pem</path> + </boot-certs> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</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-s390x</emulator> + <controller type='pci' index='0' model='pci-root'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> + </memballoon> + <panic model='s390'/> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index f91611a177..c0f4cf2679 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -3116,6 +3116,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("launch-security-s390-pv", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-secure-boot", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("s390-secure-boot", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-secure-boot-multi-certs", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-secure-boot-audit-mode", "s390x"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-secure-boot-no-certs", "s390x"); -- 2.56.0