Commit a69d9af4 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

nbd: produce a better error if neither host nor port is passed 



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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f7d9fd8c

block/nbd.c

+6 −7
Original line number Diff line number Diff line
@@ -192,19 +192,18 @@ static int nbd_config(BDRVNBDState *s, QDict *options, char **export) 
{

    Error *local_err = NULL;



    if (qdict_haskey(options, "path") == qdict_haskey(options, "host")) {

        if (qdict_haskey(options, "path")) {

        if (qdict_haskey(options, "host")) {

            qerror_report(ERROR_CLASS_GENERIC_ERROR, "path and host may not "

                          "be used at the same time.");

            return -EINVAL;

        }

        s->client.is_unix = true;

    } else if (qdict_haskey(options, "host")) {

        s->client.is_unix = false;

        } else {

            qerror_report(ERROR_CLASS_GENERIC_ERROR, "one of path and host "

                          "must be specified.");

        }

        return -EINVAL;

    }



    s->client.is_unix = qdict_haskey(options, "path");

    s->socket_opts = qemu_opts_create(&socket_optslist, NULL, 0,

                                      &error_abort);

tests/qemu-iotests/051.out

+2 −0
Original line number Diff line number Diff line
@@ -231,6 +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: one of path and host must be specified.

QEMU_PROG: -drive driver=nbd: could not open disk image ide0-hd0: Could not open image: Invalid argument



Testing: -drive driver=raw
@@ -240,6 +241,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: one of path and host must be specified.

QEMU_PROG: -drive file.driver=nbd: could not open disk image ide0-hd0: Could not open image: Invalid argument



Testing: -drive file.driver=raw