OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: remove 'encryption_key_missing' flag from QAPI 

This has been hardcoded to "false" since 2.10.0, since secrets required
to unlock block devices are now always provided up front instead of using
interactive prompts.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-02-19 18:53:17 +00:00
parent 879be3af49
commit ad1324e044
7 changed files with 33 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block/qapi.c
View File

@ -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) {

10
docs/system/deprecated.rst
View File

@ -183,16 +183,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)
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''

10
docs/system/removed-features.rst
View File

@ -110,6 +110,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)
''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
Removed with no replacement.
``query-block`` result ``inserted.encryption_key_missing`` (removed in 6.0)
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
Removed with no replacement.
Human Monitor Protocol (HMP) commands
-------------------------------------

8
qapi/block-core.json
View File

@ -319,8 +319,6 @@
#
# @encrypted: true if the backing device is encrypted
#
# @encryption_key_missing: always false
#
# @detect_zeroes: detect and optimize zero writes (Since 2.1)
#
# @bps: total throughput limit in bytes per second is specified
@ -385,10 +383,6 @@
# @dirty-bitmaps: dirty bitmaps information (only present if node
# has one or more dirty bitmaps) (Since 4.2)
#
# Features:
# @deprecated: Member @encryption_key_missing is deprecated. It is
# always false.
#
# Since: 0.14
#
##
@ -396,8 +390,6 @@
'data': { 'file': 'str', '*node-name': 'str', 'ro': 'bool', 'drv': 'str',
'*backing_file': 'str', 'backing_file_depth': 'int',
'encrypted': 'bool',
'encryption_key_missing': { 'type': 'bool',
'features': [ 'deprecated' ] },
'detect_zeroes': 'BlockdevDetectZeroesOptions',
'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int',
'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int',

6
tests/qemu-iotests/184.out
View File

@ -54,8 +54,7 @@ Testing:
"direct": false,
"writeback": true
},
"file": "json:{\"throttle-group\": \"group0\", \"driver\": \"throttle\", \"file\": {\"driver\": \"null-co\"}}",
"encryption_key_missing": false
"file": "json:{\"throttle-group\": \"group0\", \"driver\": \"throttle\", \"file\": {\"driver\": \"null-co\"}}"
},
{
"iops_rd": 0,
@ -82,8 +81,7 @@ Testing:
"direct": false,
"writeback": true
},
"file": "null-co://",
"encryption_key_missing": false
"file": "null-co://"
}
]
}

48
tests/qemu-iotests/191.out
View File

@ -150,8 +150,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.ovl2",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.ovl2"
},
{
"iops_rd": 0,
@ -179,8 +178,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.ovl2",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.ovl2"
},
{
"iops_rd": 0,
@ -221,8 +219,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT"
},
{
"iops_rd": 0,
@ -250,8 +247,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT"
},
{
"iops_rd": 0,
@ -292,8 +288,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.mid",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.mid"
},
{
"iops_rd": 0,
@ -321,8 +316,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.mid",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.mid"
},
{
"iops_rd": 0,
@ -351,8 +345,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.base",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.base"
},
{
"iops_rd": 0,
@ -380,8 +373,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.base",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.base"
}
]
}
@ -565,8 +557,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.ovl2",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.ovl2"
},
{
"iops_rd": 0,
@ -594,8 +585,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.ovl2",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.ovl2"
},
{
"iops_rd": 0,
@ -647,8 +637,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.ovl3",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.ovl3"
},
{
"iops_rd": 0,
@ -676,8 +665,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.ovl3",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.ovl3"
},
{
"iops_rd": 0,
@ -706,8 +694,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.base",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.base"
},
{
"iops_rd": 0,
@ -735,8 +722,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.base",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.base"
},
{
"iops_rd": 0,
@ -777,8 +763,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT"
},
{
"iops_rd": 0,
@ -806,8 +791,7 @@ wrote 65536/65536 bytes at offset 1048576
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT"
}
]
}

15
tests/qemu-iotests/273.out
View File

@ -69,8 +69,7 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT"
},
{
"iops_rd": 0,
@ -98,8 +97,7 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT"
},
{
"iops_rd": 0,
@ -139,8 +137,7 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.mid",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.mid"
},
{
"iops_rd": 0,
@ -168,8 +165,7 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.mid",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.mid"
},
{
"iops_rd": 0,
@ -197,8 +193,7 @@ Testing: -blockdev file,node-name=base,filename=TEST_DIR/t.IMGFMT.base -blockdev
"direct": false,
"writeback": true
},
"file": "TEST_DIR/t.IMGFMT.base",
"encryption_key_missing": false
"file": "TEST_DIR/t.IMGFMT.base"
}
]
}