[PATCH 11/14] block: remove 'encryption_key_missing' flag from QAPI

Thomas Huth thuth at redhat.com
Wed Feb 24 15:01:24 UTC 2021


On 24/02/2021 14.11, Daniel P. Berrangé wrote:
> This has been hardcoded to "false" since 2.10.0, since secrets required
> to unlock block devices are now always provided upfront instead of using
> interactive prompts.
> 
> Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
> ---
>   block/qapi.c                     |  1 -
>   docs/system/deprecated.rst       | 10 -------
>   docs/system/removed-features.rst | 10 +++++++
>   qapi/block-core.json             |  8 ------
>   tests/qemu-iotests/184.out       |  6 ++--
>   tests/qemu-iotests/191.out       | 48 +++++++++++---------------------
>   tests/qemu-iotests/273.out       | 15 ++++------
>   7 files changed, 33 insertions(+), 65 deletions(-)
> 
> diff --git a/block/qapi.c b/block/qapi.c
> index 84a0aadc09..3acc118c44 100644
> --- a/block/qapi.c
> +++ b/block/qapi.c
> @@ -62,7 +62,6 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
>       info->ro                     = bs->read_only;
>       info->drv                    = g_strdup(bs->drv->format_name);
>       info->encrypted              = bs->encrypted;
> -    info->encryption_key_missing = false;
>   
>       info->cache = g_new(BlockdevCacheInfo, 1);
>       *info->cache = (BlockdevCacheInfo) {
> diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
> index cb88fea94f..e746a63edf 100644
> --- a/docs/system/deprecated.rst
> +++ b/docs/system/deprecated.rst
> @@ -147,16 +147,6 @@ Use argument ``id`` instead.
>   
>   Use argument ``id`` instead.
>   
> -``query-named-block-nodes`` result ``encryption_key_missing`` (since 2.10.0)
> -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> -
> -Always false.
> -
> -``query-block`` result ``inserted.encryption_key_missing`` (since 2.10.0)
> -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> -
> -Always false.
> -
>   ``blockdev-add`` empty string argument ``backing`` (since 2.10.0)
>   '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
>   
> diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst
> index bb6bc8dfc8..583f14f02e 100644
> --- a/docs/system/removed-features.rst
> +++ b/docs/system/removed-features.rst
> @@ -112,6 +112,16 @@ chardev client socket with ``wait`` option (removed in 6.0)
>   Character devices creating sockets in client mode should not specify
>   the 'wait' field, which is only applicable to sockets in server mode
>   
> +``query-named-block-nodes`` result ``encryption_key_missing`` (removed in 6.0)
> +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +Always false.

Should that be "Removed with no replacement", too ? (just like the one below)

> +``query-block`` result ``inserted.encryption_key_missing`` (removed in 6.0)
> +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +Removed with no replacement
> +

Apart from that nit:
Reviewed-by: Thomas Huth <thuth at redhat.com>




More information about the libvir-list mailing list