[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/12] qemu-sockets: add error propagation to inet_p
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 07/12] qemu-sockets: add error propagation to inet_parse |
Date: |
Wed, 19 Sep 2012 16:31:10 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-sockets.c | 35 +++++++++++++++++------------------
1 file modificato, 17 inserzioni(+), 18 rimozioni(-)
diff --git a/qemu-sockets.c b/qemu-sockets.c
index 361d890..5942aef 100644
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -407,7 +407,7 @@ err:
}
/* compatibility wrapper */
-static int inet_parse(QemuOpts *opts, const char *str)
+static void inet_parse(QemuOpts *opts, const char *str, Error **errp)
{
const char *optstr, *h;
char addr[64];
@@ -419,32 +419,28 @@ static int inet_parse(QemuOpts *opts, const char *str)
/* no host given */
addr[0] = '\0';
if (1 != sscanf(str,":%32[^,]%n",port,&pos)) {
- fprintf(stderr, "%s: portonly parse error (%s)\n",
- __FUNCTION__, str);
- return -1;
+ error_setg(errp, "error parsing port in address '%s'", str);
+ return;
}
} else if (str[0] == '[') {
/* IPv6 addr */
if (2 != sscanf(str,"[%64[^]]]:%32[^,]%n",addr,port,&pos)) {
- fprintf(stderr, "%s: ipv6 parse error (%s)\n",
- __FUNCTION__, str);
- return -1;
+ error_setg(errp, "error parsing IPv6 address '%s'", str);
+ return;
}
qemu_opt_set(opts, "ipv6", "on");
} else if (qemu_isdigit(str[0])) {
/* IPv4 addr */
if (2 != sscanf(str,"%64[0-9.]:%32[^,]%n",addr,port,&pos)) {
- fprintf(stderr, "%s: ipv4 parse error (%s)\n",
- __FUNCTION__, str);
- return -1;
+ error_setg(errp, "error parsing IPv4 address '%s'", str);
+ return;
}
qemu_opt_set(opts, "ipv4", "on");
} else {
/* hostname */
if (2 != sscanf(str,"%64[^:]:%32[^,]%n",addr,port,&pos)) {
- fprintf(stderr, "%s: hostname parse error (%s)\n",
- __FUNCTION__, str);
- return -1;
+ error_setg(errp, "error parsing address '%s'", str);
+ return;
}
}
qemu_opt_set(opts, "host", addr);
@@ -459,7 +455,6 @@ static int inet_parse(QemuOpts *opts, const char *str)
qemu_opt_set(opts, "ipv4", "on");
if (strstr(optstr, ",ipv6"))
qemu_opt_set(opts, "ipv6", "on");
- return 0;
}
int inet_listen(const char *str, char *ostr, int olen,
@@ -468,9 +463,11 @@ int inet_listen(const char *str, char *ostr, int olen,
QemuOpts *opts;
char *optstr;
int sock = -1;
+ Error *local_err = NULL;
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
- if (inet_parse(opts, str) == 0) {
+ inet_parse(opts, str, &local_err);
+ if (local_err == NULL) {
sock = inet_listen_opts(opts, port_offset, errp);
if (sock != -1 && ostr) {
optstr = strchr(str, ',');
@@ -487,7 +484,7 @@ int inet_listen(const char *str, char *ostr, int olen,
}
}
} else {
- error_set(errp, QERR_SOCKET_CREATE_FAILED);
+ error_propagate(errp, local_err);
}
qemu_opts_del(opts);
return sock;
@@ -497,15 +494,17 @@ int inet_connect(const char *str, bool block, bool
*in_progress, Error **errp)
{
QemuOpts *opts;
int sock = -1;
+ Error *local_err = NULL;
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
- if (inet_parse(opts, str) == 0) {
+ inet_parse(opts, str, &local_err);
+ if (local_err == NULL) {
if (block) {
qemu_opt_set(opts, "block", "on");
}
sock = inet_connect_opts(opts, in_progress, errp);
} else {
- error_set(errp, QERR_SOCKET_CREATE_FAILED);
+ error_propagate(errp, local_err);
}
qemu_opts_del(opts);
return sock;
--
1.7.12
- Re: [Qemu-devel] [PATCH 02/12] monitor: add Error * argument to monitor_get_fd, (continued)
[Qemu-devel] [PATCH 06/12] qapi: add socket address types, Paolo Bonzini, 2012/09/19
[Qemu-devel] [PATCH 07/12] qemu-sockets: add error propagation to inet_parse,
Paolo Bonzini <=
[Qemu-devel] [PATCH 08/12] qemu-sockets: add error propagation to Unix socket functions, Paolo Bonzini, 2012/09/19
[Qemu-devel] [PATCH 12/12] qemu-sockets: add socket_listen, socket_connect, socket_parse, Paolo Bonzini, 2012/09/19
[Qemu-devel] [PATCH 13/12] block: add close notifiers, Paolo Bonzini, 2012/09/19
[Qemu-devel] [PATCH 14/12] qmp: add NBD server commands, Paolo Bonzini, 2012/09/19
[Qemu-devel] [PATCH 10/12] qemu-sockets: move block from QemuOpts to arguments, Paolo Bonzini, 2012/09/19
[Qemu-devel] [PATCH 11/12] qemu-sockets: add block and in_progress arguments to unix_connect_opts, Paolo Bonzini, 2012/09/19
[Qemu-devel] [PATCH 15/12] hmp: add NBD server commands, Paolo Bonzini, 2012/09/19