From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSWUR-0007XP-7t for qemu-devel@nongnu.org; Fri, 12 Sep 2014 15:26:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSWUH-000395-QV for qemu-devel@nongnu.org; Fri, 12 Sep 2014 15:26:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSWUH-00038T-IY for qemu-devel@nongnu.org; Fri, 12 Sep 2014 15:26:29 -0400 From: Markus Armbruster Date: Fri, 12 Sep 2014 21:26:24 +0200 Message-Id: <1410549984-16110-5-git-send-email-armbru@redhat.com> In-Reply-To: <1410549984-16110-1-git-send-email-armbru@redhat.com> References: <1410549984-16110-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] block: Improve message for device name clashing with node name List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit.canet@irqsave.net, stefanha@redhat.com Suggested-by: Benoit Canet Signed-off-by: Markus Armbruster --- 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 6faf36f..02ea90f 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.9.3