From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WF42F-0002gn-Af for qemu-devel@nongnu.org; Sun, 16 Feb 2014 10:53:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WF426-0002OE-2F for qemu-devel@nongnu.org; Sun, 16 Feb 2014 10:53:39 -0500 Received: from mail-qc0-x233.google.com ([2607:f8b0:400d:c01::233]:40144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WF425-0002O7-Sf for qemu-devel@nongnu.org; Sun, 16 Feb 2014 10:53:29 -0500 Received: by mail-qc0-f179.google.com with SMTP id e16so22334421qcx.38 for ; Sun, 16 Feb 2014 07:53:29 -0800 (PST) Sender: Paolo Bonzini Message-ID: <5300DEF5.9090003@redhat.com> Date: Sun, 16 Feb 2014 16:53:25 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1392138233-26407-1-git-send-email-pbonzini@redhat.com> <1392138233-26407-2-git-send-email-pbonzini@redhat.com> <20140214165434.GC17514@localhost.localdomain> In-Reply-To: <20140214165434.GC17514@localhost.localdomain> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 01/20] nbd: produce a better error if neither host nor port is passed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jeff Cody Cc: kwolf@redhat.com, famz@redhat.com, qemu-devel@nongnu.org Il 14/02/2014 17:54, Jeff Cody ha scritto: > 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: > > > 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 Thanks, I was working on an older checkout. Fixed and tested now. Paolo > >> 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 >> >> >> > >