mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Remove monitor command block_passwd

Browse Source 
Command block_passwd always fails since

Commit c01c214b69 "block: remove all encryption handling APIs"
(v2.10.0) turned block_passwd into a stub that always fails, and
hardcoded encryption_key_missing to false in query-named-block-nodes
and query-block.

Commit ad1324e044 "block: remove 'encryption_key_missing' flag from
QAPI" just landed.  Complete the cleanup job: remove block_passwd.

Cc: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210323101951.3686029-1-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Markus Armbruster 2021-03-23 11:19:51 +01:00
parent d83b47646e
commit bdabafc683
5 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/monitor/block-hmp-cmds.c
View File

@ -515,16 +515,6 @@ void hmp_block_stream(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, error); hmp_handle_error(mon, error);
} }
void hmp_block_passwd(Monitor *mon, const QDict *qdict)
{
const char *device = qdict_get_str(qdict, "device");
const char *password = qdict_get_str(qdict, "password");
Error *err = NULL;
qmp_block_passwd(true, device, false, NULL, password, &err);
hmp_handle_error(mon, err);
}
void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict) void hmp_block_set_io_throttle(Monitor *mon, const QDict *qdict)
{ {
Error *err = NULL; Error *err = NULL;

8
blockdev.c
View File

@ -2407,14 +2407,6 @@ exit:
job_txn_unref(block_job_txn); job_txn_unref(block_job_txn);
} }
void qmp_block_passwd(bool has_device, const char *device,
bool has_node_name, const char *node_name,
const char *password, Error **errp)
{
error_setg(errp,
"Setting block passwords directly is no longer supported");
}
BlockDirtyBitmapSha256 *qmp_x_debug_block_dirty_bitmap_sha256(const char *node, BlockDirtyBitmapSha256 *qmp_x_debug_block_dirty_bitmap_sha256(const char *node,
const char *name, const char *name,
Error **errp) Error **errp)

15
hmp-commands.hx
View File

@ -1493,21 +1493,6 @@ SRST
used by another monitor command. used by another monitor command.
ERST ERST
{
.name = "block_passwd",
.args_type = "device:B,password:s",
.params = "block_passwd device password",
.help = "set the password of encrypted block devices",
.cmd = hmp_block_passwd,
},
SRST
``block_passwd`` *device* *password*
Set the encrypted device *device* password to *password*
This command is now obsolete and will always return an error since 2.10
ERST
{ {
.name = "block_set_io_throttle", .name = "block_set_io_throttle",
.args_type = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l", .args_type = "device:B,bps:l,bps_rd:l,bps_wr:l,iops:l,iops_rd:l,iops_wr:l",

14
qapi/block-core.json
View File

@ -1207,20 +1207,6 @@
## ##
{ 'command': 'query-block-jobs', 'returns': ['BlockJobInfo'] } { 'command': 'query-block-jobs', 'returns': ['BlockJobInfo'] }
##
# @block_passwd:
#
# This command sets the password of a block device that has not been open
# with a password and requires one.
#
# This command is now obsolete and will always return an error since 2.10
#
##
{ 'command': 'block_passwd',
'data': { '*device': 'str',
'*node-name': 'str',
'password': 'str' } }
## ##
# @block_resize: # @block_resize:
# #

1
qapi/pragma.json
View File

@ -6,7 +6,6 @@
# Commands allowed to return a non-dictionary: # Commands allowed to return a non-dictionary:
'command-name-exceptions': [ 'command-name-exceptions': [
'add_client', 'add_client',
'block_passwd',
'block_resize', 'block_resize',
'block_set_io_throttle', 'block_set_io_throttle',
'client_migrate_info', 'client_migrate_info',