[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/54] nbd: produce a better error if neither host no
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 11/54] nbd: produce a better error if neither host nor port is passed |
Date: |
Fri, 21 Feb 2014 23:12:08 +0100 |
From: Paolo Bonzini <address@hidden>
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>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/nbd.c | 13 ++++++-------
tests/qemu-iotests/051.out | 2 ++
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index abae506..a83e856 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);
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 30e2dbd..3e8d962 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -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
--
1.8.1.4
- [Qemu-devel] [PULL 02/54] block: Fix bdrv_is_first_non_filter(), (continued)
- [Qemu-devel] [PULL 02/54] block: Fix bdrv_is_first_non_filter(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 01/54] qcow2: Set zero flag for discarded clusters, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 03/54] block: Change BDS parameter of bdrv_open() to **, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 05/54] block: Make bdrv_file_open() static, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 04/54] block: Add reference parameter to bdrv_open(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 06/54] block: Reuse reference handling from bdrv_open(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 07/54] block: Remove bdrv_new() from bdrv_file_open(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 08/54] block: Handle bs->options in bdrv_open() only, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 09/54] block: Reuse success path from bdrv_open(), Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 10/54] block: Remove bdrv_open_image()'s force_raw option, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 11/54] nbd: produce a better error if neither host nor port is passed,
Kevin Wolf <=
- [Qemu-devel] [PULL 12/54] nbd: correctly propagate errors, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 13/54] nbd: inline tcp_socket_incoming_spec into sole caller, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 14/54] nbd: move socket wrappers to qemu-nbd, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 15/54] iscsi: fix indentation, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 16/54] iscsi: correctly propagate errors in iscsi_open, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 17/54] gluster: default scheme to gluster:// and host to localhost., Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 19/54] cow: correctly propagate errors, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 18/54] gluster: correctly propagate errors, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 20/54] curl: correctly propagate errors, Kevin Wolf, 2014/02/21
- [Qemu-devel] [PULL 21/54] qcow: correctly propagate errors, Kevin Wolf, 2014/02/21