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

blockdev: Clarify error messages pertaining to 'node-name'

Browse Source 
Signed-off-by: Connor Kuehl <ckuehl@redhat.com>
Message-Id: <20210305151929.1947331-3-ckuehl@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Connor Kuehl 2021-03-05 09:19:29 -06:00 committed by Kevin Wolf
parent 785ec4b1b9
commit ef2e38a1a1
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
blockdev.c
View File

@ -1515,13 +1515,13 @@ static void external_snapshot_prepare(BlkActionState *common,
s->has_snapshot_node_name ? s->snapshot_node_name : NULL; s->has_snapshot_node_name ? s->snapshot_node_name : NULL;
if (node_name && !snapshot_node_name) { if (node_name && !snapshot_node_name) {
error_setg(errp, "New overlay node name missing"); error_setg(errp, "New overlay node-name missing");
goto out; goto out;
} }
if (snapshot_node_name && if (snapshot_node_name &&
bdrv_lookup_bs(snapshot_node_name, snapshot_node_name, NULL)) { bdrv_lookup_bs(snapshot_node_name, snapshot_node_name, NULL)) {
error_setg(errp, "New overlay node name already in use"); error_setg(errp, "New overlay node-name already in use");
goto out; goto out;
} }
@ -3598,13 +3598,14 @@ void qmp_x_blockdev_reopen(BlockdevOptions *options, Error **errp)
/* Check for the selected node name */ /* Check for the selected node name */
if (!options->has_node_name) { if (!options->has_node_name) {
error_setg(errp, "Node name not specified"); error_setg(errp, "node-name not specified");
goto fail; goto fail;
} }
bs = bdrv_find_node(options->node_name); bs = bdrv_find_node(options->node_name);
if (!bs) { if (!bs) {
error_setg(errp, "Cannot find node named '%s'", options->node_name); error_setg(errp, "Failed to find node with node-name='%s'",
options->node_name);
goto fail; goto fail;
} }
@ -3635,7 +3636,7 @@ void qmp_blockdev_del(const char *node_name, Error **errp)
bs = bdrv_find_node(node_name); bs = bdrv_find_node(node_name);
if (!bs) { if (!bs) {
error_setg(errp, "Cannot find node %s", node_name); error_setg(errp, "Failed to find node with node-name='%s'", node_name);
return; return;
} }
if (bdrv_has_blk(bs)) { if (bdrv_has_blk(bs)) {
@ -3758,7 +3759,7 @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread,
bs = bdrv_find_node(node_name); bs = bdrv_find_node(node_name);
if (!bs) { if (!bs) {
error_setg(errp, "Cannot find node %s", node_name); error_setg(errp, "Failed to find node with node-name='%s'", node_name);
return; return;
} }

6
tests/qemu-iotests/245
View File

@ -140,8 +140,8 @@ class TestBlockdevReopen(iotests.QMPTestCase):
self.reopen(opts, {'file': 'hd0-file'}) self.reopen(opts, {'file': 'hd0-file'})
# We cannot change any of these # We cannot change any of these
self.reopen(opts, {'node-name': 'not-found'}, "Cannot find node named 'not-found'") self.reopen(opts, {'node-name': 'not-found'}, "Failed to find node with node-name='not-found'")
self.reopen(opts, {'node-name': ''}, "Cannot find node named ''") self.reopen(opts, {'node-name': ''}, "Failed to find node with node-name=''")
self.reopen(opts, {'node-name': None}, "Invalid parameter type for 'node-name', expected: string") self.reopen(opts, {'node-name': None}, "Invalid parameter type for 'node-name', expected: string")
self.reopen(opts, {'driver': 'raw'}, "Cannot change the option 'driver'") self.reopen(opts, {'driver': 'raw'}, "Cannot change the option 'driver'")
self.reopen(opts, {'driver': ''}, "Invalid parameter ''") self.reopen(opts, {'driver': ''}, "Invalid parameter ''")
@ -158,7 +158,7 @@ class TestBlockdevReopen(iotests.QMPTestCase):
# node-name is optional in BlockdevOptions, but x-blockdev-reopen needs it # node-name is optional in BlockdevOptions, but x-blockdev-reopen needs it
del opts['node-name'] del opts['node-name']
self.reopen(opts, {}, "Node name not specified") self.reopen(opts, {}, "node-name not specified")
# Check that nothing has changed # Check that nothing has changed
self.check_node_graph(original_graph) self.check_node_graph(original_graph)