diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-17 14:43:49 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-02-21 21:02:22 +0100 |
| commit | 77e8b9ca64e85d3d309f322410964b7852ec091e (patch) | |
| tree | 83c89ead8b7febc0900867dbce56f5eb5d7a20ed /tests/qemu-iotests/051.out | |
| parent | a69d9af449e9de200abc751d8614124c7486426f (diff) | |
| download | qemu-77e8b9ca64e85d3d309f322410964b7852ec091e.zip qemu-77e8b9ca64e85d3d309f322410964b7852ec091e.tar.gz qemu-77e8b9ca64e85d3d309f322410964b7852ec091e.tar.bz2 | |
nbd: correctly propagate errors
Before:
$ ./qemu-io-old
qemu-io-old> open -r -o file.driver=nbd
one of path and host must be specified.
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
qemu-io: can't open device (null): one of path and host must be specified.
$ ./qemu-io
qemu-io> open -r -o file.driver=nbd,file.host=foo,file.path=bar
qemu-io: can't open device (null): path and host may not be used at the same time.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/051.out')
| -rw-r--r-- | tests/qemu-iotests/051.out | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out index 3e8d962..7de1870 100644 --- a/tests/qemu-iotests/051.out +++ b/tests/qemu-iotests/051.out @@ -231,8 +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 +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 @@ -241,8 +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: 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 +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 |