Zhuoying Cai <[email protected]> writes:
> Introduce a new `boot-certs` machine type option for the s390-ccw-virtio
> machine. This allows users to specify one or more certificate file paths
> or directories to be used during secure boot.
>
> Each entry is specified using the syntax:
> boot-certs.<index>.path=/path/to/cert.pem
>
> Multiple paths can be specify using array properties:
> boot-certs.0.path=/path/to/cert.pem,
> boot-certs.1.path=/path/to/cert-dir,
> boot-certs.2.path=/path/to/another-dir...
>
> Signed-off-by: Zhuoying Cai <[email protected]>
> Acked-by: Markus Armbruster <[email protected]>
[...]
> diff --git a/qapi/machine-s390x.json b/qapi/machine-s390x.json
> index ea430e1b88..0e0f4fdfb0 100644
> --- a/qapi/machine-s390x.json
> +++ b/qapi/machine-s390x.json
> @@ -140,3 +140,26 @@
> { 'event': 'SCLP_CPI_INFO_AVAILABLE',
> 'features': [ 'unstable' ]
> }
> +
> +##
> +# @BootCertificates:
> +#
> +# Boot certificate for secure IPL.
certificates
> +#
> +# @path: path to an X.509 certificate file or a directory containing
> +# certificate files.
You have to indent like this
# @path: path to an X.509 certificate file or a directory containing
# certificate files.
As is, it gets rendered like
Object BootCertificates (Since: 11.0)
Boot certificate for secure IPL.
Members:
* path ("string") -- path to an X.509 certificate file or a
directory containing
certificate files.
Please proofread the generated documentation to avoid such issues.
> +#
> +# Since: 11.0
> +##
> +{ 'struct': 'BootCertificates',
> + 'data': {'path': 'str'} }
> +
> +##
> +# @DummyBootCertificates:
> +#
> +# Not used by QMP; hack to let us use BootCertificatesList internally.
> +#
> +# Since: 11.0
> +##
> +{ 'struct': 'DummyBootCertificates',
> + 'data': {'unused-boot-certs': ['BootCertificates'] } }
[...]
