[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] block: Improve message for device name clashin
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 05/11] block: Improve message for device name clashing with node name |
Date: |
Fri, 26 Sep 2014 20:58:51 +0200 |
From: Markus Armbruster <address@hidden>
Suggested-by: Benoit Canet <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: BenoƮt Canet <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 3 ++-
tests/qemu-iotests/087.out | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 0c4540c..a2fa1e1 100644
--- a/block.c
+++ b/block.c
@@ -347,7 +347,8 @@ BlockDriverState *bdrv_new(const char *device_name, Error
**errp)
return NULL;
}
if (bdrv_find_node(device_name)) {
- error_setg(errp, "Device with node-name '%s' already exists",
+ error_setg(errp,
+ "Device name '%s' conflicts with an existing node name",
device_name);
return NULL;
}
diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out
index 7fbee3f..75a54e0 100644
--- a/tests/qemu-iotests/087.out
+++ b/tests/qemu-iotests/087.out
@@ -20,7 +20,7 @@ QMP_VERSION
{"return": {}}
{"return": {}}
{"error": {"class": "GenericError", "desc": "Device with id 'disk' already
exists"}}
-{"error": {"class": "GenericError", "desc": "Device with node-name 'test-node'
already exists"}}
+{"error": {"class": "GenericError", "desc": "Device name 'test-node' conflicts
with an existing node name"}}
main-loop: WARNING: I/O thread spun for 1000 iterations
{"error": {"class": "GenericError", "desc": "could not open disk image disk2:
node-name=disk is conflicting with a device id"}}
{"error": {"class": "GenericError", "desc": "could not open disk image disk2:
Duplicate node name"}}
--
1.8.3.1
- [Qemu-devel] [PULL 00/11] Block patches, Kevin Wolf, 2014/09/26
- [Qemu-devel] [PULL 01/11] blkdebug: show an error for invalid event names, Kevin Wolf, 2014/09/26
- [Qemu-devel] [PULL 02/11] blockdev: Disentangle BlockDriverState and DriveInfo creation, Kevin Wolf, 2014/09/26
- [Qemu-devel] [PULL 05/11] block: Improve message for device name clashing with node name,
Kevin Wolf <=
- [Qemu-devel] [PULL 06/11] block: Specify -drive legacy option aliases in array, Kevin Wolf, 2014/09/26
- [Qemu-devel] [PULL 04/11] qemu-nbd: Destroy the BlockDriverState properly, Kevin Wolf, 2014/09/26
- [Qemu-devel] [PULL 03/11] block: Keep DriveInfo alive until BlockDriverState dies, Kevin Wolf, 2014/09/26
- [Qemu-devel] [PULL 07/11] block: Catch simultaneous usage of options and their aliases, Kevin Wolf, 2014/09/26
- [Qemu-devel] [PULL 09/11] vpc: fix beX_to_cpu() and cpu_to_beX() confusion, Kevin Wolf, 2014/09/26
- [Qemu-devel] [PULL 10/11] block: Validate node-name, Kevin Wolf, 2014/09/26
- [Qemu-devel] [PULL 11/11] qemu-iotests: Fail test if explicit test case number is unknown, Kevin Wolf, 2014/09/26
- [Qemu-devel] [PULL 08/11] docs: add blkdebug block driver documentation, Kevin Wolf, 2014/09/26
- Re: [Qemu-devel] [PULL 00/11] Block patches, Peter Maydell, 2014/09/29