[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 01/20] nbd: produce a better error if neither ho
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH 01/20] nbd: produce a better error if neither host nor port is passed |
Date: |
Mon, 10 Feb 2014 15:27:15 +0800 |
User-agent: |
Mutt/1.5.22 (2013-10-16) |
On Sun, 02/09 10:48, 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
>
> Next patch will fix the error propagation.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> 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
>
>
>
Reviewed-by: Fam Zheng <address@hidden>