[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 31/33] block: Avoid printing NULL string in error mes
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 31/33] block: Avoid printing NULL string in error messages |
Date: |
Thu, 22 Sep 2016 18:29:32 +0200 |
Even for nodes that have a BlockBackend attached, bdrv_get_parent_name()
can return NULL if the BB is anonymous (e.g. it belongs to a block job
or a device that was created with a drive=<node-name> option).
Remove the information from the error message. The user probably knows
already why the node is still in use.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
blockdev.c | 9 +++------
tests/qemu-iotests/085.out | 6 +++---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 405145a..17c2671 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1803,8 +1803,7 @@ static void external_snapshot_prepare(BlkActionState
*common,
}
if (bdrv_has_blk(state->new_bs)) {
- error_setg(errp, "The snapshot is already in use by %s",
- bdrv_get_parent_name(state->new_bs));
+ error_setg(errp, "The snapshot is already in use");
return;
}
@@ -2532,8 +2531,7 @@ void qmp_x_blockdev_insert_medium(bool has_device, const
char *device,
}
if (bdrv_has_blk(bs)) {
- error_setg(errp, "Node '%s' is already in use by '%s'", node_name,
- bdrv_get_parent_name(bs));
+ error_setg(errp, "Node '%s' is already in use", node_name);
return;
}
@@ -3941,8 +3939,7 @@ void qmp_x_blockdev_del(bool has_id, const char *id,
return;
}
if (bdrv_has_blk(bs)) {
- error_setg(errp, "Node %s is in use by %s",
- node_name, bdrv_get_parent_name(bs));
+ error_setg(errp, "Node %s is in use", node_name);
return;
}
aio_context = bdrv_get_aio_context(bs);
diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
index 01c78d6..08e4bb7 100644
--- a/tests/qemu-iotests/085.out
+++ b/tests/qemu-iotests/085.out
@@ -68,9 +68,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
backing_file=TEST_DIR/
=== Invalid command - snapshot node used as active layer ===
-{"error": {"class": "GenericError", "desc": "The snapshot is already in use by
virtio0"}}
-{"error": {"class": "GenericError", "desc": "The snapshot is already in use by
virtio0"}}
-{"error": {"class": "GenericError", "desc": "The snapshot is already in use by
virtio1"}}
+{"error": {"class": "GenericError", "desc": "The snapshot is already in use"}}
+{"error": {"class": "GenericError", "desc": "The snapshot is already in use"}}
+{"error": {"class": "GenericError", "desc": "The snapshot is already in use"}}
=== Invalid command - snapshot node used as backing hd ===
--
1.8.3.1
- [Qemu-devel] [PULL 22/33] qemu-iotests/041: Avoid blockdev-add with id, (continued)
- [Qemu-devel] [PULL 22/33] qemu-iotests/041: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 20/33] block: Accept device model name for block_set_io_throttle, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 26/33] qemu-iotests/087: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 24/33] qemu-iotests/071: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 27/33] qemu-iotests/117: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 28/33] qemu-iotests/118: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 29/33] qemu-iotests/124: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 32/33] qemu-iotests/141: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 33/33] block: Remove BB interface from blockdev-add/del, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 30/33] qemu-iotests/139: Avoid blockdev-add with id, Kevin Wolf, 2016/09/22
- [Qemu-devel] [PULL 31/33] block: Avoid printing NULL string in error messages,
Kevin Wolf <=
- Re: [Qemu-devel] [PULL 00/33] Block layer patches, Peter Maydell, 2016/09/23