From patchwork Fri Feb 14 16:54:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Cody X-Patchwork-Id: 320487 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 11A182C00A3 for ; Sat, 15 Feb 2014 03:55:25 +1100 (EST) Received: from localhost ([::1]:52752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEM2r-00058R-Sz for incoming@patchwork.ozlabs.org; Fri, 14 Feb 2014 11:55:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEM2J-0004y3-Al for qemu-devel@nongnu.org; Fri, 14 Feb 2014 11:54:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WEM2B-00011B-1r for qemu-devel@nongnu.org; Fri, 14 Feb 2014 11:54:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57148) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WEM2A-0000z3-PZ for qemu-devel@nongnu.org; Fri, 14 Feb 2014 11:54:38 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1EGsbQ7002866 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 14 Feb 2014 11:54:37 -0500 Received: from localhost (ovpn-112-60.phx2.redhat.com [10.3.112.60]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s1EGsYNX009320 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Fri, 14 Feb 2014 11:54:36 -0500 Date: Fri, 14 Feb 2014 11:54:34 -0500 From: Jeff Cody To: Paolo Bonzini Message-ID: <20140214165434.GC17514@localhost.localdomain> References: <1392138233-26407-1-git-send-email-pbonzini@redhat.com> <1392138233-26407-2-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1392138233-26407-2-git-send-email-pbonzini@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, famz@redhat.com, qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH v2 01/20] nbd: produce a better error if neither host nor port is passed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Tue, Feb 11, 2014 at 06:03:34PM +0100, Paolo Bonzini wrote: > Before: > $ qemu-io-old > qemu-io-old> open -r -o file.driver=nbd > qemu-io-old: can't open device (null): Could not open image: Invalid argument > $ ./qemu-io-old > qemu-io-old> open -r -o file.driver=nbd,file.host=foo,file.path=bar > path and host may not be used at the same time. > qemu-io-old: can't open device (null): Could not open image: Invalid argument > > After: > $ ./qemu-io > qemu-io> open -r -o file.driver=nbd > one of path and host must be specified. > qemu-io: can't open device (null): Could not open image: Invalid argument > $ ./qemu-io > qemu-io> open -r -o file.driver=nbd,file.host=foo,file.path=bar > path and host may not be used at the same time. > qemu-io: can't open device (null): Could not open image: Invalid argument > This breaks test 051, which is parsing the error output. Could you also update 051.out in this patch? This should fix it: > Next patch will fix the error propagation. > > Signed-off-by: Paolo Bonzini > --- > block/nbd.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/block/nbd.c b/block/nbd.c > index 327e913..fd89083 100644 > --- a/block/nbd.c > +++ b/block/nbd.c > @@ -192,19 +192,18 @@ static int nbd_config(BDRVNBDState *s, QDict *options, char **export) > { > Error *local_err = NULL; > > - if (qdict_haskey(options, "path")) { > - if (qdict_haskey(options, "host")) { > + if (qdict_haskey(options, "path") == qdict_haskey(options, "host")) { > + if (qdict_haskey(options, "path")) { > qerror_report(ERROR_CLASS_GENERIC_ERROR, "path and host may not " > "be used at the same time."); > - return -EINVAL; > + } else { > + qerror_report(ERROR_CLASS_GENERIC_ERROR, "one of path and host " > + "must be specified."); > } > - s->client.is_unix = true; > - } else if (qdict_haskey(options, "host")) { > - s->client.is_unix = false; > - } else { > return -EINVAL; > } > > + s->client.is_unix = qdict_haskey(options, "path"); > s->socket_opts = qemu_opts_create(&socket_optslist, NULL, 0, > &error_abort); > > -- > 1.8.5.3 > > > diff --git tests/qemu-iotests/051.out tests/qemu-iotests/051.out index 30e2dbd..7de1870 100644 --- tests/qemu-iotests/051.out +++ tests/qemu-iotests/051.out @@ -231,7 +231,7 @@ Testing: -drive driver=file QEMU_PROG: -drive driver=file: could not open disk image ide0-hd0: The 'file' block driver requires a file name Testing: -drive driver=nbd -QEMU_PROG: -drive driver=nbd: could not open disk image ide0-hd0: Could not open image: Invalid argument +QEMU_PROG: -drive driver=nbd: could not open disk image ide0-hd0: one of path and host must be specified. Testing: -drive driver=raw QEMU_PROG: -drive driver=raw: could not open disk image ide0-hd0: Can't use 'raw' as a block driver for the protocol level @@ -240,7 +240,7 @@ Testing: -drive file.driver=file QEMU_PROG: -drive file.driver=file: could not open disk image ide0-hd0: The 'file' block driver requires a file name Testing: -drive file.driver=nbd -QEMU_PROG: -drive file.driver=nbd: could not open disk image ide0-hd0: Could not open image: Invalid argument +QEMU_PROG: -drive file.driver=nbd: could not open disk image ide0-hd0: one of path and host must be specified. Testing: -drive file.driver=raw QEMU_PROG: -drive file.driver=raw: could not open disk image ide0-hd0: Can't use 'raw' as a block driver for the protocol level