Add QEMU_CAPS_MACHINE_S390_SECURE_BOOT to detect whether QEMU supports -machine s390-ccw-virtio,secure-boot=on|off. Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_11.2.0_s390x.xml | 1 + 3 files changed, 4 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ff35fbc65c..53d26a8d3d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -777,6 +777,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "iothread.poll-weight", /* QEMU_CAPS_IOTHREAD_POLL_WEIGHT */ "win-dmp.guest-aware", /* QEMU_CAPS_WIN_DMP_GUEST_AWARE */ "machine.s390-ccw-virtio.boot-certs", /* QEMU_CAPS_MACHINE_S390_BOOT_CERTS */ + "machine.s390-ccw-virtio.secure-boot", /* QEMU_CAPS_MACHINE_S390_SECURE_BOOT */ ); @@ -1886,6 +1887,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsVirt[] = { static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsS390[] = { { "boot-certs", QEMU_CAPS_MACHINE_S390_BOOT_CERTS }, + { "secure-boot", QEMU_CAPS_MACHINE_S390_SECURE_BOOT }, }; static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsGeneric[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 880ed29281..e505ce3749 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -751,6 +751,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_IOTHREAD_POLL_WEIGHT, /* -object iothread.poll-weight */ QEMU_CAPS_WIN_DMP_GUEST_AWARE, /* 'win-dmp' is offered only to a guest that can use it */ QEMU_CAPS_MACHINE_S390_BOOT_CERTS, /* -machine s390-ccw-virtio,boot-certs.N.path= */ + QEMU_CAPS_MACHINE_S390_SECURE_BOOT, /* -machine s390-ccw-virtio,secure-boot=on|off */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_11.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_11.2.0_s390x.xml index 7a7f0beaf5..98429e2b02 100644 --- a/tests/qemucapabilitiesdata/caps_11.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_11.2.0_s390x.xml @@ -150,6 +150,7 @@ <flag name='iothread.poll-weight'/> <flag name='win-dmp.guest-aware'/> <flag name='machine.s390-ccw-virtio.boot-certs'/> + <flag name='machine.s390-ccw-virtio.secure-boot'/> <version>11001050</version> <microcodeVersion>39100288</microcodeVersion> <package>v11.1.0-1870-g81ce3a8773</package> -- 2.56.0