From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSsSK-0008LV-L2 for qemu-devel@nongnu.org; Sat, 13 Sep 2014 14:54:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XSsSF-0005d5-Ia for qemu-devel@nongnu.org; Sat, 13 Sep 2014 14:53:56 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:39593 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XSsSF-0005cR-CP for qemu-devel@nongnu.org; Sat, 13 Sep 2014 14:53:51 -0400 Date: Sat, 13 Sep 2014 20:52:50 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140913185250.GB27912@irqsave.net> References: <1410549984-16110-1-git-send-email-armbru@redhat.com> <1410549984-16110-5-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1410549984-16110-5-git-send-email-armbru@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [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: Markus Armbruster Cc: kwolf@redhat.com, benoit.canet@irqsave.net, qemu-devel@nongnu.org, stefanha@redhat.com The Friday 12 Sep 2014 =E0 21:26:24 (+0200), Markus Armbruster wrote : > 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(-) >=20 > 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 n= ame", > 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' alr= eady exists"}} > -{"error": {"class": "GenericError", "desc": "Device with node-name 'te= st-node' already exists"}} > +{"error": {"class": "GenericError", "desc": "Device name 'test-node' c= onflicts 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=3Ddisk is conflicting with a device id"}} > {"error": {"class": "GenericError", "desc": "could not open disk image= disk2: Duplicate node name"}} > --=20 > 1.9.3 >=20 Reviewed-by: Beno=EEt Canet