aboutsummaryrefslogtreecommitdiff
path: root/nbd.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-02-17 14:43:49 +0100
committerKevin Wolf <kwolf@redhat.com>2014-02-21 21:02:22 +0100
commit77e8b9ca64e85d3d309f322410964b7852ec091e (patch)
tree83c89ead8b7febc0900867dbce56f5eb5d7a20ed /nbd.c
parenta69d9af449e9de200abc751d8614124c7486426f (diff)
downloadqemu-arm-77e8b9ca64e85d3d309f322410964b7852ec091e.tar.gz
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 'nbd.c')
-rw-r--r--nbd.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/nbd.c b/nbd.c
index 030f56b5c7..17ca95bf0d 100644
--- a/nbd.c
+++ b/nbd.c
@@ -199,18 +199,6 @@ static void combine_addr(char *buf, size_t len, const char* address,
}
}
-int tcp_socket_outgoing_opts(QemuOpts *opts)
-{
- Error *local_err = NULL;
- int fd = inet_connect_opts(opts, &local_err, NULL, NULL);
- if (local_err != NULL) {
- qerror_report_err(local_err);
- error_free(local_err);
- }
-
- return fd;
-}
-
int tcp_socket_incoming(const char *address, uint16_t port)
{
char address_and_port[128];