* [Qemu-devel] [PATCH v7 1/4] net/socket: Don't treat odd socket type as SOCK_STREAM
2017-06-29 9:42 [Qemu-devel] [PATCH v7 0/4] Improve error reporting Mao Zhongyi
@ 2017-06-29 9:42 ` Mao Zhongyi
2017-06-29 9:43 ` [Qemu-devel] [PATCH v7 2/4] net/socket: Convert several helper functions to Error Mao Zhongyi
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Mao Zhongyi @ 2017-06-29 9:42 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang, armbru, berrange, eblake
In net_socket_fd_init(), the 'default' case is odd: it warns,
then continues as if the socket type was SOCK_STREAM. The
comment explains "this could be a eg. a pty", but that makes
no sense. If @fd really was a pty, getsockopt() would fail
with ENOTSOCK. If @fd was a socket, but neither SOCK_DGRAM nor
SOCK_STREAM. It should not be treated as if it was SOCK_STREAM.
Turn this case into an Error. If there is a genuine reason to
support something like SOCK_RAW, it should be explicitly
handled.
Cc: jasowang@redhat.com
Cc: armbru@redhat.com
Cc: berrange@redhat.com
Cc: armbru@redhat.com
Cc: eblake@redhat.com
Suggested-by: Markus Armbruster <armbru@redhat.com>
Suggested-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
net/socket.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index dcae1ae..7d05e70 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -449,9 +449,9 @@ static NetSocketState *net_socket_fd_init(NetClientState *peer,
case SOCK_STREAM:
return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
default:
- /* who knows ... this could be a eg. a pty, do warn and continue as stream */
- fprintf(stderr, "qemu: warning: socket type=%d for fd=%d is not SOCK_DGRAM or SOCK_STREAM\n", so_type, fd);
- return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
+ error_report("socket type=%d for fd=%d must be either"
+ " SOCK_DGRAM or SOCK_STREAM", so_type, fd);
+ closesocket(fd);
}
return NULL;
}
--
2.9.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH v7 2/4] net/socket: Convert several helper functions to Error
2017-06-29 9:42 [Qemu-devel] [PATCH v7 0/4] Improve error reporting Mao Zhongyi
2017-06-29 9:42 ` [Qemu-devel] [PATCH v7 1/4] net/socket: Don't treat odd socket type as SOCK_STREAM Mao Zhongyi
@ 2017-06-29 9:43 ` Mao Zhongyi
2017-07-04 14:54 ` Markus Armbruster
2017-06-29 9:43 ` [Qemu-devel] [PATCH v7 3/4] net/net: Convert parse_host_port() " Mao Zhongyi
2017-06-29 9:43 ` [Qemu-devel] [PATCH v7 4/4] net/socket: Improve -net socket error reporting Mao Zhongyi
3 siblings, 1 reply; 10+ messages in thread
From: Mao Zhongyi @ 2017-06-29 9:43 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang, armbru, berrange
Currently, net_socket_mcast_create(), net_socket_fd_init_dgram() and
net_socket_fd_init() use the function such as fprintf(), perror() to
report an error message.
Now, convert these functions to Error.
Cc: jasowang@redhat.com
Cc: armbru@redhat.com
Cc: berrange@redhat.com
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
---
net/socket.c | 81 +++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 50 insertions(+), 31 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index 7d05e70..44fb504 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -209,7 +209,9 @@ static void net_socket_send_dgram(void *opaque)
}
}
-static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr *localaddr)
+static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,
+ struct in_addr *localaddr,
+ Error **errp)
{
struct ip_mreq imr;
int fd;
@@ -221,16 +223,16 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
#endif
if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
- fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) "
- "does not contain a multicast address\n",
- inet_ntoa(mcastaddr->sin_addr),
- (int)ntohl(mcastaddr->sin_addr.s_addr));
+ error_setg(errp, "specified mcastaddr %s (0x%08x) "
+ "does not contain a multicast address",
+ inet_ntoa(mcastaddr->sin_addr),
+ (int)ntohl(mcastaddr->sin_addr.s_addr));
return -1;
}
fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
if (fd < 0) {
- perror("socket(PF_INET, SOCK_DGRAM)");
+ error_setg_errno(errp, errno, "failed to create datagram socket");
return -1;
}
@@ -242,13 +244,15 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
val = 1;
ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
if (ret < 0) {
- perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)");
+ error_setg_errno(errp, errno, "set the socket 'SO_REUSEADDR'"
+ " attribute failed");
goto fail;
}
ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr));
if (ret < 0) {
- perror("bind");
+ error_setg_errno(errp, errno, "bind ip=%s to socket failed",
+ inet_ntoa(mcastaddr->sin_addr));
goto fail;
}
@@ -263,7 +267,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
ret = qemu_setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
&imr, sizeof(struct ip_mreq));
if (ret < 0) {
- perror("setsockopt(IP_ADD_MEMBERSHIP)");
+ error_setg_errno(errp, errno, "add socket to multicast group %s"
+ " failed", inet_ntoa(imr.imr_multiaddr));
goto fail;
}
@@ -272,7 +277,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,
&loop, sizeof(loop));
if (ret < 0) {
- perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)");
+ error_setg_errno(errp, errno, "force multicast message to loopback"
+ " failed");
goto fail;
}
@@ -281,7 +287,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
localaddr, sizeof(*localaddr));
if (ret < 0) {
- perror("setsockopt(IP_MULTICAST_IF)");
+ error_setg_errno(errp, errno, "set the default network send "
+ "interface failed");
goto fail;
}
}
@@ -320,7 +327,8 @@ static NetClientInfo net_dgram_socket_info = {
static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
const char *model,
const char *name,
- int fd, int is_connected)
+ int fd, int is_connected,
+ Error **errp)
{
struct sockaddr_in saddr;
int newfd;
@@ -337,14 +345,13 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
if (getsockname(fd, (struct sockaddr *) &saddr, &saddr_len) == 0) {
/* must be bound */
if (saddr.sin_addr.s_addr == 0) {
- fprintf(stderr, "qemu: error: init_dgram: fd=%d unbound, "
- "cannot setup multicast dst addr\n", fd);
+ error_setg(errp, "init_dgram: fd=%d unbound, "
+ "cannot setup multicast dst addr", fd);
goto err;
}
/* clone dgram socket */
- newfd = net_socket_mcast_create(&saddr, NULL);
+ newfd = net_socket_mcast_create(&saddr, NULL, errp);
if (newfd < 0) {
- /* error already reported by net_socket_mcast_create() */
goto err;
}
/* clone newfd to fd, close newfd */
@@ -352,9 +359,9 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
close(newfd);
} else {
- fprintf(stderr,
- "qemu: error: init_dgram: fd=%d failed getsockname(): %s\n",
- fd, strerror(errno));
+ error_setg(errp,
+ "init_dgram: fd=%d failed getsockname(): %s",
+ fd, strerror(errno));
goto err;
}
}
@@ -432,20 +439,22 @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
static NetSocketState *net_socket_fd_init(NetClientState *peer,
const char *model, const char *name,
- int fd, int is_connected)
+ int fd, int is_connected,
+ Error **errp)
{
int so_type = -1, optlen=sizeof(so_type);
if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,
(socklen_t *)&optlen)< 0) {
- fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=%d failed\n",
- fd);
+ error_setg(errp, "getsockopt(SO_TYPE) for fd=%d failed",
+ fd);
closesocket(fd);
return NULL;
}
switch(so_type) {
case SOCK_DGRAM:
- return net_socket_fd_init_dgram(peer, model, name, fd, is_connected);
+ return net_socket_fd_init_dgram(peer, model, name, fd, is_connected,
+ errp);
case SOCK_STREAM:
return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
default:
@@ -536,6 +545,7 @@ static int net_socket_connect_init(NetClientState *peer,
NetSocketState *s;
int fd, connected, ret;
struct sockaddr_in saddr;
+ Error *err = NULL;
if (parse_host_port(&saddr, host_str) < 0)
return -1;
@@ -567,9 +577,11 @@ static int net_socket_connect_init(NetClientState *peer,
break;
}
}
- s = net_socket_fd_init(peer, model, name, fd, connected);
- if (!s)
+ s = net_socket_fd_init(peer, model, name, fd, connected, &err);
+ if (!s) {
+ error_report_err(err);
return -1;
+ }
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
"socket: connect to %s:%d",
inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
@@ -586,6 +598,7 @@ static int net_socket_mcast_init(NetClientState *peer,
int fd;
struct sockaddr_in saddr;
struct in_addr localaddr, *param_localaddr;
+ Error *err = NULL;
if (parse_host_port(&saddr, host_str) < 0)
return -1;
@@ -598,13 +611,17 @@ static int net_socket_mcast_init(NetClientState *peer,
param_localaddr = NULL;
}
- fd = net_socket_mcast_create(&saddr, param_localaddr);
- if (fd < 0)
+ fd = net_socket_mcast_create(&saddr, param_localaddr, &err);
+ if (fd < 0) {
+ error_report_err(err);
return -1;
+ }
- s = net_socket_fd_init(peer, model, name, fd, 0);
- if (!s)
+ s = net_socket_fd_init(peer, model, name, fd, 0, &err);
+ if (!s) {
+ error_report_err(err);
return -1;
+ }
s->dgram_dst = saddr;
@@ -624,6 +641,7 @@ static int net_socket_udp_init(NetClientState *peer,
NetSocketState *s;
int fd, ret;
struct sockaddr_in laddr, raddr;
+ Error *err = NULL;
if (parse_host_port(&laddr, lhost) < 0) {
return -1;
@@ -652,8 +670,9 @@ static int net_socket_udp_init(NetClientState *peer,
}
qemu_set_nonblock(fd);
- s = net_socket_fd_init(peer, model, name, fd, 0);
+ s = net_socket_fd_init(peer, model, name, fd, 0, &err);
if (!s) {
+ error_report_err(err);
return -1;
}
@@ -696,7 +715,7 @@ int net_init_socket(const Netdev *netdev, const char *name,
return -1;
}
qemu_set_nonblock(fd);
- if (!net_socket_fd_init(peer, "socket", name, fd, 1)) {
+ if (!net_socket_fd_init(peer, "socket", name, fd, 1, errp)) {
return -1;
}
return 0;
--
2.9.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PATCH v7 2/4] net/socket: Convert several helper functions to Error
2017-06-29 9:43 ` [Qemu-devel] [PATCH v7 2/4] net/socket: Convert several helper functions to Error Mao Zhongyi
@ 2017-07-04 14:54 ` Markus Armbruster
2017-07-05 3:20 ` Mao Zhongyi
0 siblings, 1 reply; 10+ messages in thread
From: Markus Armbruster @ 2017-07-04 14:54 UTC (permalink / raw)
To: Mao Zhongyi; +Cc: qemu-devel, jasowang
Mao Zhongyi <maozy.fnst@cn.fujitsu.com> writes:
> Currently, net_socket_mcast_create(), net_socket_fd_init_dgram() and
> net_socket_fd_init() use the function such as fprintf(), perror() to
> report an error message.
>
> Now, convert these functions to Error.
>
> Cc: jasowang@redhat.com
> Cc: armbru@redhat.com
> Cc: berrange@redhat.com
> Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> net/socket.c | 81 +++++++++++++++++++++++++++++++++++++-----------------------
> 1 file changed, 50 insertions(+), 31 deletions(-)
>
> diff --git a/net/socket.c b/net/socket.c
> index 7d05e70..44fb504 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -209,7 +209,9 @@ static void net_socket_send_dgram(void *opaque)
> }
> }
>
> -static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr *localaddr)
> +static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,
> + struct in_addr *localaddr,
> + Error **errp)
> {
> struct ip_mreq imr;
> int fd;
> @@ -221,16 +223,16 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
> #endif
>
> if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
> - fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) "
> - "does not contain a multicast address\n",
> - inet_ntoa(mcastaddr->sin_addr),
> - (int)ntohl(mcastaddr->sin_addr.s_addr));
> + error_setg(errp, "specified mcastaddr %s (0x%08x) "
> + "does not contain a multicast address",
> + inet_ntoa(mcastaddr->sin_addr),
> + (int)ntohl(mcastaddr->sin_addr.s_addr));
> return -1;
>
You could drop the empty line here, and ...
> }
... maybe insert one here.
> fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
> if (fd < 0) {
> - perror("socket(PF_INET, SOCK_DGRAM)");
> + error_setg_errno(errp, errno, "failed to create datagram socket");
I suggested "can't create datagram socket" in my review of v5. I prefer
"can't <do something>" over "failed to <do something>" myself, but grep
shows more strings starting "failed to" than with "can't". I guess
reporting "failed to <do something>" is more common. Okay.
> return -1;
> }
>
> @@ -242,13 +244,15 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
> val = 1;
> ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
> if (ret < 0) {
> - perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)");
> + error_setg_errno(errp, errno, "set the socket 'SO_REUSEADDR'"
> + " attribute failed");
Adapting my review of v5 to the next instance: I'm not a native speaker,
but "set FOO failed" doesn't feel right to me. Where's the subject?
"Create" is a verb. "Setting FOO failed" has a subject, but doesn't
feel right. What about "can't set socket option SO_REUSEADDR"?
Also, please avoid breaking the line in the middle of an argument when
you could just as well break it between arguments, like this:
error_setg_errno(errp, errno,
"can't set socket attribute SO_REUSEADDR");
> goto fail;
> }
>
> ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr));
> if (ret < 0) {
> - perror("bind");
> + error_setg_errno(errp, errno, "bind ip=%s to socket failed",
> + inet_ntoa(mcastaddr->sin_addr));
Likewise, "can't bind ip=%s to socket".
> goto fail;
> }
>
> @@ -263,7 +267,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
> ret = qemu_setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
> &imr, sizeof(struct ip_mreq));
> if (ret < 0) {
> - perror("setsockopt(IP_ADD_MEMBERSHIP)");
> + error_setg_errno(errp, errno, "add socket to multicast group %s"
> + " failed", inet_ntoa(imr.imr_multiaddr));
Likewise.
> goto fail;
> }
>
> @@ -272,7 +277,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
> ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,
> &loop, sizeof(loop));
> if (ret < 0) {
> - perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)");
> + error_setg_errno(errp, errno, "force multicast message to loopback"
> + " failed");
Likwise.
> goto fail;
> }
>
> @@ -281,7 +287,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
> ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
> localaddr, sizeof(*localaddr));
> if (ret < 0) {
> - perror("setsockopt(IP_MULTICAST_IF)");
> + error_setg_errno(errp, errno, "set the default network send "
> + "interface failed");
Likewise.
> goto fail;
> }
> }
> @@ -320,7 +327,8 @@ static NetClientInfo net_dgram_socket_info = {
> static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
> const char *model,
> const char *name,
> - int fd, int is_connected)
> + int fd, int is_connected,
> + Error **errp)
> {
> struct sockaddr_in saddr;
> int newfd;
> @@ -337,14 +345,13 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
> if (getsockname(fd, (struct sockaddr *) &saddr, &saddr_len) == 0) {
> /* must be bound */
> if (saddr.sin_addr.s_addr == 0) {
> - fprintf(stderr, "qemu: error: init_dgram: fd=%d unbound, "
> - "cannot setup multicast dst addr\n", fd);
> + error_setg(errp, "init_dgram: fd=%d unbound, "
> + "cannot setup multicast dst addr", fd);
Yet another awful error message: "init_dgram" and the value of @fd are
useful to a developer, but not to the user, and "dst addr" aren't even
words. What about "can't setup multicast destination address"?
Aside: I wonder whether this is actually a programming error. How can
it happen? Mao, I don't expect you to answer this :)
> goto err;
> }
> /* clone dgram socket */
> - newfd = net_socket_mcast_create(&saddr, NULL);
> + newfd = net_socket_mcast_create(&saddr, NULL, errp);
> if (newfd < 0) {
> - /* error already reported by net_socket_mcast_create() */
> goto err;
> }
> /* clone newfd to fd, close newfd */
> @@ -352,9 +359,9 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
> close(newfd);
>
> } else {
> - fprintf(stderr,
> - "qemu: error: init_dgram: fd=%d failed getsockname(): %s\n",
> - fd, strerror(errno));
> + error_setg(errp,
> + "init_dgram: fd=%d failed getsockname(): %s",
> + fd, strerror(errno));
Similarly awful error message. What about "can't get socket name"?
error_setg_errno() instead of strerror(), please.
> goto err;
> }
> }
> @@ -432,20 +439,22 @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
>
> static NetSocketState *net_socket_fd_init(NetClientState *peer,
> const char *model, const char *name,
> - int fd, int is_connected)
> + int fd, int is_connected,
> + Error **errp)
> {
> int so_type = -1, optlen=sizeof(so_type);
>
> if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,
> (socklen_t *)&optlen)< 0) {
> - fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=%d failed\n",
> - fd);
> + error_setg(errp, "getsockopt(SO_TYPE) for fd=%d failed",
> + fd);
Another awful one. What about "can't get socket option SO_TYPE"?
> closesocket(fd);
> return NULL;
> }
> switch(so_type) {
> case SOCK_DGRAM:
> - return net_socket_fd_init_dgram(peer, model, name, fd, is_connected);
> + return net_socket_fd_init_dgram(peer, model, name, fd, is_connected,
> + errp);
> case SOCK_STREAM:
> return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
> default:
> @@ -536,6 +545,7 @@ static int net_socket_connect_init(NetClientState *peer,
> NetSocketState *s;
> int fd, connected, ret;
> struct sockaddr_in saddr;
> + Error *err = NULL;
>
> if (parse_host_port(&saddr, host_str) < 0)
> return -1;
> @@ -567,9 +577,11 @@ static int net_socket_connect_init(NetClientState *peer,
> break;
> }
> }
> - s = net_socket_fd_init(peer, model, name, fd, connected);
> - if (!s)
> + s = net_socket_fd_init(peer, model, name, fd, connected, &err);
> + if (!s) {
> + error_report_err(err);
> return -1;
> + }
> snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> "socket: connect to %s:%d",
> inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
> @@ -586,6 +598,7 @@ static int net_socket_mcast_init(NetClientState *peer,
> int fd;
> struct sockaddr_in saddr;
> struct in_addr localaddr, *param_localaddr;
> + Error *err = NULL;
>
> if (parse_host_port(&saddr, host_str) < 0)
> return -1;
> @@ -598,13 +611,17 @@ static int net_socket_mcast_init(NetClientState *peer,
> param_localaddr = NULL;
> }
>
> - fd = net_socket_mcast_create(&saddr, param_localaddr);
> - if (fd < 0)
> + fd = net_socket_mcast_create(&saddr, param_localaddr, &err);
> + if (fd < 0) {
> + error_report_err(err);
> return -1;
> + }
>
> - s = net_socket_fd_init(peer, model, name, fd, 0);
> - if (!s)
> + s = net_socket_fd_init(peer, model, name, fd, 0, &err);
> + if (!s) {
> + error_report_err(err);
> return -1;
> + }
>
> s->dgram_dst = saddr;
>
> @@ -624,6 +641,7 @@ static int net_socket_udp_init(NetClientState *peer,
> NetSocketState *s;
> int fd, ret;
> struct sockaddr_in laddr, raddr;
> + Error *err = NULL;
>
> if (parse_host_port(&laddr, lhost) < 0) {
> return -1;
> @@ -652,8 +670,9 @@ static int net_socket_udp_init(NetClientState *peer,
> }
> qemu_set_nonblock(fd);
>
> - s = net_socket_fd_init(peer, model, name, fd, 0);
> + s = net_socket_fd_init(peer, model, name, fd, 0, &err);
> if (!s) {
> + error_report_err(err);
> return -1;
> }
>
> @@ -696,7 +715,7 @@ int net_init_socket(const Netdev *netdev, const char *name,
> return -1;
> }
> qemu_set_nonblock(fd);
> - if (!net_socket_fd_init(peer, "socket", name, fd, 1)) {
> + if (!net_socket_fd_init(peer, "socket", name, fd, 1, errp)) {
> return -1;
> }
> return 0;
Looks good to me otherwise.
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PATCH v7 2/4] net/socket: Convert several helper functions to Error
2017-07-04 14:54 ` Markus Armbruster
@ 2017-07-05 3:20 ` Mao Zhongyi
0 siblings, 0 replies; 10+ messages in thread
From: Mao Zhongyi @ 2017-07-05 3:20 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel, jasowang
Hi, Markus
On 07/04/2017 10:54 PM, Markus Armbruster wrote:
> Mao Zhongyi <maozy.fnst@cn.fujitsu.com> writes:
>
>> Currently, net_socket_mcast_create(), net_socket_fd_init_dgram() and
>> net_socket_fd_init() use the function such as fprintf(), perror() to
>> report an error message.
>>
>> Now, convert these functions to Error.
>>
>> Cc: jasowang@redhat.com
>> Cc: armbru@redhat.com
>> Cc: berrange@redhat.com
>> Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
>> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
>> ---
>> net/socket.c | 81 +++++++++++++++++++++++++++++++++++++-----------------------
>> 1 file changed, 50 insertions(+), 31 deletions(-)
>>
>> diff --git a/net/socket.c b/net/socket.c
>> index 7d05e70..44fb504 100644
>> --- a/net/socket.c
>> +++ b/net/socket.c
>> @@ -209,7 +209,9 @@ static void net_socket_send_dgram(void *opaque)
>> }
>> }
>>
>> -static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr *localaddr)
>> +static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,
>> + struct in_addr *localaddr,
>> + Error **errp)
>> {
>> struct ip_mreq imr;
>> int fd;
>> @@ -221,16 +223,16 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
>> #endif
>>
>> if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {
>> - fprintf(stderr, "qemu: error: specified mcastaddr \"%s\" (0x%08x) "
>> - "does not contain a multicast address\n",
>> - inet_ntoa(mcastaddr->sin_addr),
>> - (int)ntohl(mcastaddr->sin_addr.s_addr));
>> + error_setg(errp, "specified mcastaddr %s (0x%08x) "
>> + "does not contain a multicast address",
>> + inet_ntoa(mcastaddr->sin_addr),
>> + (int)ntohl(mcastaddr->sin_addr.s_addr));
>> return -1;
>>
>
> You could drop the empty line here, and ...
OK, I see.
>
>> }
>
> ... maybe insert one here.
>
>> fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
>> if (fd < 0) {
>> - perror("socket(PF_INET, SOCK_DGRAM)");
>> + error_setg_errno(errp, errno, "failed to create datagram socket");
>
> I suggested "can't create datagram socket" in my review of v5. I prefer
> "can't <do something>" over "failed to <do something>" myself, but grep
> shows more strings starting "failed to" than with "can't". I guess
> reporting "failed to <do something>" is more common. Okay.
>
Yes, I also prefer "can't <do something>", but I found the "failed to <do something>"
in source code more generic and thus borrowed from it. I think both of these are ok,
it's depends on individual style. I decided to follow my heart and use "can't ..."
in the next version, thanks.
>> return -1;
>> }
>>
>> @@ -242,13 +244,15 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
>> val = 1;
>> ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
>> if (ret < 0) {
>> - perror("setsockopt(SOL_SOCKET, SO_REUSEADDR)");
>> + error_setg_errno(errp, errno, "set the socket 'SO_REUSEADDR'"
>> + " attribute failed");
>
> Adapting my review of v5 to the next instance: I'm not a native speaker,
> but "set FOO failed" doesn't feel right to me. Where's the subject?
> "Create" is a verb. "Setting FOO failed" has a subject, but doesn't
> feel right. What about "can't set socket option SO_REUSEADDR"?
I‘ll examine all the similar issues and fix them completely in the next
version.
>
> Also, please avoid breaking the line in the middle of an argument when
> you could just as well break it between arguments, like this:
>
> error_setg_errno(errp, errno,
> "can't set socket attribute SO_REUSEADDR");
>
Yes, it is more reasonable than before. But sometimes if the argument is
so long that it has to break the line in the middle of an argument.
>> goto fail;
>> }
>>
>> ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr));
>> if (ret < 0) {
>> - perror("bind");
>> + error_setg_errno(errp, errno, "bind ip=%s to socket failed",
>> + inet_ntoa(mcastaddr->sin_addr));
>
> Likewise, "can't bind ip=%s to socket".
>
>> goto fail;
>> }
>>
>> @@ -263,7 +267,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
>> ret = qemu_setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
>> &imr, sizeof(struct ip_mreq));
>> if (ret < 0) {
>> - perror("setsockopt(IP_ADD_MEMBERSHIP)");
>> + error_setg_errno(errp, errno, "add socket to multicast group %s"
>> + " failed", inet_ntoa(imr.imr_multiaddr));
>
> Likewise.
>
>> goto fail;
>> }
>>
>> @@ -272,7 +277,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
>> ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,
>> &loop, sizeof(loop));
>> if (ret < 0) {
>> - perror("setsockopt(SOL_IP, IP_MULTICAST_LOOP)");
>> + error_setg_errno(errp, errno, "force multicast message to loopback"
>> + " failed");
>
> Likwise.
>
>> goto fail;
>> }
>>
>> @@ -281,7 +287,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr
>> ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,
>> localaddr, sizeof(*localaddr));
>> if (ret < 0) {
>> - perror("setsockopt(IP_MULTICAST_IF)");
>> + error_setg_errno(errp, errno, "set the default network send "
>> + "interface failed");
>
> Likewise.
>
>> goto fail;
>> }
>> }
>> @@ -320,7 +327,8 @@ static NetClientInfo net_dgram_socket_info = {
>> static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
>> const char *model,
>> const char *name,
>> - int fd, int is_connected)
>> + int fd, int is_connected,
>> + Error **errp)
>> {
>> struct sockaddr_in saddr;
>> int newfd;
>> @@ -337,14 +345,13 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
>> if (getsockname(fd, (struct sockaddr *) &saddr, &saddr_len) == 0) {
>> /* must be bound */
>> if (saddr.sin_addr.s_addr == 0) {
>> - fprintf(stderr, "qemu: error: init_dgram: fd=%d unbound, "
>> - "cannot setup multicast dst addr\n", fd);
>> + error_setg(errp, "init_dgram: fd=%d unbound, "
>> + "cannot setup multicast dst addr", fd);
>
> Yet another awful error message: "init_dgram" and the value of @fd are
> useful to a developer, but not to the user, and "dst addr" aren't even
> words. What about "can't setup multicast destination address"?
>
OK, I see.
> Aside: I wonder whether this is actually a programming error. How can
> it happen? Mao, I don't expect you to answer this :)
>
>> goto err;
>> }
>> /* clone dgram socket */
>> - newfd = net_socket_mcast_create(&saddr, NULL);
>> + newfd = net_socket_mcast_create(&saddr, NULL, errp);
>> if (newfd < 0) {
>> - /* error already reported by net_socket_mcast_create() */
>> goto err;
>> }
>> /* clone newfd to fd, close newfd */
>> @@ -352,9 +359,9 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
>> close(newfd);
>>
>> } else {
>> - fprintf(stderr,
>> - "qemu: error: init_dgram: fd=%d failed getsockname(): %s\n",
>> - fd, strerror(errno));
>> + error_setg(errp,
>> + "init_dgram: fd=%d failed getsockname(): %s",
>> + fd, strerror(errno));
>
> Similarly awful error message. What about "can't get socket name"?
>
> error_setg_errno() instead of strerror(), please.
>
OK, I will.
>> goto err;
>> }
>> }
>> @@ -432,20 +439,22 @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
>>
>> static NetSocketState *net_socket_fd_init(NetClientState *peer,
>> const char *model, const char *name,
>> - int fd, int is_connected)
>> + int fd, int is_connected,
>> + Error **errp)
>> {
>> int so_type = -1, optlen=sizeof(so_type);
>>
>> if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,
>> (socklen_t *)&optlen)< 0) {
>> - fprintf(stderr, "qemu: error: getsockopt(SO_TYPE) for fd=%d failed\n",
>> - fd);
>> + error_setg(errp, "getsockopt(SO_TYPE) for fd=%d failed",
>> + fd);
>
> Another awful one. What about "can't get socket option SO_TYPE"?
OK, I will.
>
>> closesocket(fd);
>> return NULL;
>> }
>> switch(so_type) {
>> case SOCK_DGRAM:
>> - return net_socket_fd_init_dgram(peer, model, name, fd, is_connected);
>> + return net_socket_fd_init_dgram(peer, model, name, fd, is_connected,
>> + errp);
>> case SOCK_STREAM:
>> return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
>> default:
>> @@ -536,6 +545,7 @@ static int net_socket_connect_init(NetClientState *peer,
>> NetSocketState *s;
>> int fd, connected, ret;
>> struct sockaddr_in saddr;
>> + Error *err = NULL;
>>
>> if (parse_host_port(&saddr, host_str) < 0)
>> return -1;
>> @@ -567,9 +577,11 @@ static int net_socket_connect_init(NetClientState *peer,
>> break;
>> }
>> }
>> - s = net_socket_fd_init(peer, model, name, fd, connected);
>> - if (!s)
>> + s = net_socket_fd_init(peer, model, name, fd, connected, &err);
>> + if (!s) {
>> + error_report_err(err);
>> return -1;
>> + }
>> snprintf(s->nc.info_str, sizeof(s->nc.info_str),
>> "socket: connect to %s:%d",
>> inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
>> @@ -586,6 +598,7 @@ static int net_socket_mcast_init(NetClientState *peer,
>> int fd;
>> struct sockaddr_in saddr;
>> struct in_addr localaddr, *param_localaddr;
>> + Error *err = NULL;
>>
>> if (parse_host_port(&saddr, host_str) < 0)
>> return -1;
>> @@ -598,13 +611,17 @@ static int net_socket_mcast_init(NetClientState *peer,
>> param_localaddr = NULL;
>> }
>>
>> - fd = net_socket_mcast_create(&saddr, param_localaddr);
>> - if (fd < 0)
>> + fd = net_socket_mcast_create(&saddr, param_localaddr, &err);
>> + if (fd < 0) {
>> + error_report_err(err);
>> return -1;
>> + }
>>
>> - s = net_socket_fd_init(peer, model, name, fd, 0);
>> - if (!s)
>> + s = net_socket_fd_init(peer, model, name, fd, 0, &err);
>> + if (!s) {
>> + error_report_err(err);
>> return -1;
>> + }
>>
>> s->dgram_dst = saddr;
>>
>> @@ -624,6 +641,7 @@ static int net_socket_udp_init(NetClientState *peer,
>> NetSocketState *s;
>> int fd, ret;
>> struct sockaddr_in laddr, raddr;
>> + Error *err = NULL;
>>
>> if (parse_host_port(&laddr, lhost) < 0) {
>> return -1;
>> @@ -652,8 +670,9 @@ static int net_socket_udp_init(NetClientState *peer,
>> }
>> qemu_set_nonblock(fd);
>>
>> - s = net_socket_fd_init(peer, model, name, fd, 0);
>> + s = net_socket_fd_init(peer, model, name, fd, 0, &err);
>> if (!s) {
>> + error_report_err(err);
>> return -1;
>> }
>>
>> @@ -696,7 +715,7 @@ int net_init_socket(const Netdev *netdev, const char *name,
>> return -1;
>> }
>> qemu_set_nonblock(fd);
>> - if (!net_socket_fd_init(peer, "socket", name, fd, 1)) {
>> + if (!net_socket_fd_init(peer, "socket", name, fd, 1, errp)) {
>> return -1;
>> }
>> return 0;
>
> Looks good to me otherwise.
>
Thank you for your patient explanation.
I'm sorry to bother you with these minor questions. I‘ll be
more careful to avoid similar problems.
Thanks again,
Mao
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v7 3/4] net/net: Convert parse_host_port() to Error
2017-06-29 9:42 [Qemu-devel] [PATCH v7 0/4] Improve error reporting Mao Zhongyi
2017-06-29 9:42 ` [Qemu-devel] [PATCH v7 1/4] net/socket: Don't treat odd socket type as SOCK_STREAM Mao Zhongyi
2017-06-29 9:43 ` [Qemu-devel] [PATCH v7 2/4] net/socket: Convert several helper functions to Error Mao Zhongyi
@ 2017-06-29 9:43 ` Mao Zhongyi
2017-07-04 14:58 ` Markus Armbruster
2017-06-29 9:43 ` [Qemu-devel] [PATCH v7 4/4] net/socket: Improve -net socket error reporting Mao Zhongyi
3 siblings, 1 reply; 10+ messages in thread
From: Mao Zhongyi @ 2017-06-29 9:43 UTC (permalink / raw)
To: qemu-devel; +Cc: berrange, kraxel, pbonzini, jasowang, armbru, eblake
Cc: berrange@redhat.com
Cc: kraxel@redhat.com
Cc: pbonzini@redhat.com
Cc: jasowang@redhat.com
Cc: armbru@redhat.com
Cc: eblake@redhat.com
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
---
include/qemu/sockets.h | 3 ++-
net/net.c | 22 +++++++++++++++++-----
net/socket.c | 19 ++++++++++++++-----
3 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 5c326db..78e2b30 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -53,7 +53,8 @@ void socket_listen_cleanup(int fd, Error **errp);
int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);
/* Old, ipv4 only bits. Don't use for new code. */
-int parse_host_port(struct sockaddr_in *saddr, const char *str);
+int parse_host_port(struct sockaddr_in *saddr, const char *str,
+ Error **errp);
int socket_init(void);
/**
diff --git a/net/net.c b/net/net.c
index 6235aab..77b6deb 100644
--- a/net/net.c
+++ b/net/net.c
@@ -100,7 +100,8 @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
return 0;
}
-int parse_host_port(struct sockaddr_in *saddr, const char *str)
+int parse_host_port(struct sockaddr_in *saddr, const char *str,
+ Error **errp)
{
char buf[512];
struct hostent *he;
@@ -108,24 +109,35 @@ int parse_host_port(struct sockaddr_in *saddr, const char *str)
int port;
p = str;
- if (get_str_sep(buf, sizeof(buf), &p, ':') < 0)
+ if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
+ error_setg(errp, "host address '%s' doesn't contain ':' "
+ "separating host from port", str);
return -1;
+ }
saddr->sin_family = AF_INET;
if (buf[0] == '\0') {
saddr->sin_addr.s_addr = 0;
} else {
if (qemu_isdigit(buf[0])) {
- if (!inet_aton(buf, &saddr->sin_addr))
+ if (!inet_aton(buf, &saddr->sin_addr)) {
+ error_setg(errp, "host address '%s' is not a valid "
+ "IPv4 address", buf);
return -1;
+ }
} else {
- if ((he = gethostbyname(buf)) == NULL)
+ he = gethostbyname(buf);
+ if (he == NULL) {
+ error_setg(errp, "can't resolve host address '%s'", buf);
return - 1;
+ }
saddr->sin_addr = *(struct in_addr *)he->h_addr;
}
}
port = strtol(p, (char **)&r, 0);
- if (r == p)
+ if (r == p) {
+ error_setg(errp, "port number '%s' is invalid", p);
return -1;
+ }
saddr->sin_port = htons(port);
return 0;
}
diff --git a/net/socket.c b/net/socket.c
index 44fb504..bd80b3c 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -500,9 +500,12 @@ static int net_socket_listen_init(NetClientState *peer,
NetSocketState *s;
struct sockaddr_in saddr;
int fd, ret;
+ Error *err = NULL;
- if (parse_host_port(&saddr, host_str) < 0)
+ if (parse_host_port(&saddr, host_str, &err) < 0) {
+ error_report_err(err);
return -1;
+ }
fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) {
@@ -547,8 +550,10 @@ static int net_socket_connect_init(NetClientState *peer,
struct sockaddr_in saddr;
Error *err = NULL;
- if (parse_host_port(&saddr, host_str) < 0)
+ if (parse_host_port(&saddr, host_str, &err) < 0) {
+ error_report_err(err);
return -1;
+ }
fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) {
@@ -600,8 +605,10 @@ static int net_socket_mcast_init(NetClientState *peer,
struct in_addr localaddr, *param_localaddr;
Error *err = NULL;
- if (parse_host_port(&saddr, host_str) < 0)
+ if (parse_host_port(&saddr, host_str, &err) < 0) {
+ error_report_err(err);
return -1;
+ }
if (localaddr_str != NULL) {
if (inet_aton(localaddr_str, &localaddr) == 0)
@@ -643,11 +650,13 @@ static int net_socket_udp_init(NetClientState *peer,
struct sockaddr_in laddr, raddr;
Error *err = NULL;
- if (parse_host_port(&laddr, lhost) < 0) {
+ if (parse_host_port(&laddr, lhost, &err) < 0) {
+ error_report_err(err);
return -1;
}
- if (parse_host_port(&raddr, rhost) < 0) {
+ if (parse_host_port(&raddr, rhost, &err) < 0) {
+ error_report_err(err);
return -1;
}
--
2.9.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Qemu-devel] [PATCH v7 4/4] net/socket: Improve -net socket error reporting
2017-06-29 9:42 [Qemu-devel] [PATCH v7 0/4] Improve error reporting Mao Zhongyi
` (2 preceding siblings ...)
2017-06-29 9:43 ` [Qemu-devel] [PATCH v7 3/4] net/net: Convert parse_host_port() " Mao Zhongyi
@ 2017-06-29 9:43 ` Mao Zhongyi
2017-07-04 16:24 ` Markus Armbruster
3 siblings, 1 reply; 10+ messages in thread
From: Mao Zhongyi @ 2017-06-29 9:43 UTC (permalink / raw)
To: qemu-devel; +Cc: jasowang, armbru, berrange
When -net socket fails, it first reports a specific error, then
a generic one, like this:
$ qemu-system-x86_64 -net socket,
qemu-system-x86_64: -net socket: exactly one of fd=, listen=, connect=, mcast= or udp= is required
qemu-system-x86_64: -net socket: Device 'socket' could not be initialized
Convert net_socket_*_init() to Error to get rid of the superfluous second
error message. After the patch, the effect like this:
$ qemu-system-x86_64 -net socket,
qemu-system-x86_64: -net socket: exactly one of fd=, listen=, connect=, mcast= or udp= is required
At the same time, add many explicit error handling message when it fails.
Cc: jasowang@redhat.com
Cc: armbru@redhat.com
Cc: berrange@redhat.com
Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
---
net/socket.c | 94 +++++++++++++++++++++++++++++-------------------------------
1 file changed, 45 insertions(+), 49 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index bd80b3c..a891c3a 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -494,22 +494,21 @@ static void net_socket_accept(void *opaque)
static int net_socket_listen_init(NetClientState *peer,
const char *model,
const char *name,
- const char *host_str)
+ const char *host_str,
+ Error **errp)
{
NetClientState *nc;
NetSocketState *s;
struct sockaddr_in saddr;
int fd, ret;
- Error *err = NULL;
- if (parse_host_port(&saddr, host_str, &err) < 0) {
- error_report_err(err);
+ if (parse_host_port(&saddr, host_str, errp) < 0) {
return -1;
}
fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) {
- perror("socket");
+ error_setg_errno(errp, errno, "failed to create stream socket");
return -1;
}
qemu_set_nonblock(fd);
@@ -518,13 +517,14 @@ static int net_socket_listen_init(NetClientState *peer,
ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));
if (ret < 0) {
- perror("bind");
+ error_setg_errno(errp, errno, "bind ip=%s to socket failed",
+ inet_ntoa(saddr.sin_addr));
closesocket(fd);
return -1;
}
ret = listen(fd, 0);
if (ret < 0) {
- perror("listen");
+ error_setg_errno(errp, errno, "listen socket failed");
closesocket(fd);
return -1;
}
@@ -543,21 +543,20 @@ static int net_socket_listen_init(NetClientState *peer,
static int net_socket_connect_init(NetClientState *peer,
const char *model,
const char *name,
- const char *host_str)
+ const char *host_str,
+ Error **errp)
{
NetSocketState *s;
int fd, connected, ret;
struct sockaddr_in saddr;
- Error *err = NULL;
- if (parse_host_port(&saddr, host_str, &err) < 0) {
- error_report_err(err);
+ if (parse_host_port(&saddr, host_str, errp) < 0) {
return -1;
}
fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (fd < 0) {
- perror("socket");
+ error_setg_errno(errp, errno, "failed to create stream socket");
return -1;
}
qemu_set_nonblock(fd);
@@ -573,7 +572,7 @@ static int net_socket_connect_init(NetClientState *peer,
errno == EINVAL) {
break;
} else {
- perror("connect");
+ error_setg_errno(errp, errno, "connection failed");
closesocket(fd);
return -1;
}
@@ -582,9 +581,8 @@ static int net_socket_connect_init(NetClientState *peer,
break;
}
}
- s = net_socket_fd_init(peer, model, name, fd, connected, &err);
+ s = net_socket_fd_init(peer, model, name, fd, connected, errp);
if (!s) {
- error_report_err(err);
return -1;
}
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
@@ -597,36 +595,36 @@ static int net_socket_mcast_init(NetClientState *peer,
const char *model,
const char *name,
const char *host_str,
- const char *localaddr_str)
+ const char *localaddr_str,
+ Error **errp)
{
NetSocketState *s;
int fd;
struct sockaddr_in saddr;
struct in_addr localaddr, *param_localaddr;
- Error *err = NULL;
- if (parse_host_port(&saddr, host_str, &err) < 0) {
- error_report_err(err);
+ if (parse_host_port(&saddr, host_str, errp) < 0) {
return -1;
}
if (localaddr_str != NULL) {
- if (inet_aton(localaddr_str, &localaddr) == 0)
+ if (inet_aton(localaddr_str, &localaddr) == 0) {
+ error_setg(errp, "localaddr '%s' is not a valid IPv4 address",
+ localaddr_str);
return -1;
+ }
param_localaddr = &localaddr;
} else {
param_localaddr = NULL;
}
- fd = net_socket_mcast_create(&saddr, param_localaddr, &err);
+ fd = net_socket_mcast_create(&saddr, param_localaddr, errp);
if (fd < 0) {
- error_report_err(err);
return -1;
}
- s = net_socket_fd_init(peer, model, name, fd, 0, &err);
+ s = net_socket_fd_init(peer, model, name, fd, 0, errp);
if (!s) {
- error_report_err(err);
return -1;
}
@@ -643,45 +641,45 @@ static int net_socket_udp_init(NetClientState *peer,
const char *model,
const char *name,
const char *rhost,
- const char *lhost)
+ const char *lhost,
+ Error **errp)
{
NetSocketState *s;
int fd, ret;
struct sockaddr_in laddr, raddr;
- Error *err = NULL;
- if (parse_host_port(&laddr, lhost, &err) < 0) {
- error_report_err(err);
+ if (parse_host_port(&laddr, lhost, errp) < 0) {
return -1;
}
- if (parse_host_port(&raddr, rhost, &err) < 0) {
- error_report_err(err);
+ if (parse_host_port(&raddr, rhost, errp) < 0) {
return -1;
}
fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
if (fd < 0) {
- perror("socket(PF_INET, SOCK_DGRAM)");
+ error_setg_errno(errp, errno, "failed to create datagram socket");
return -1;
}
ret = socket_set_fast_reuse(fd);
if (ret < 0) {
+ error_setg_errno(errp, errno, "set the socket 'SO_REUSEADDR'"
+ " attribute failed");
closesocket(fd);
return -1;
}
ret = bind(fd, (struct sockaddr *)&laddr, sizeof(laddr));
if (ret < 0) {
- perror("bind");
+ error_setg_errno(errp, errno, "bind ip=%s to socket failed",
+ inet_ntoa(laddr.sin_addr));
closesocket(fd);
return -1;
}
qemu_set_nonblock(fd);
- s = net_socket_fd_init(peer, model, name, fd, 0, &err);
+ s = net_socket_fd_init(peer, model, name, fd, 0, errp);
if (!s) {
- error_report_err(err);
return -1;
}
@@ -696,8 +694,6 @@ static int net_socket_udp_init(NetClientState *peer,
int net_init_socket(const Netdev *netdev, const char *name,
NetClientState *peer, Error **errp)
{
- /* FIXME error_setg(errp, ...) on failure */
- Error *err = NULL;
const NetdevSocketOptions *sock;
assert(netdev->type == NET_CLIENT_DRIVER_SOCKET);
@@ -705,22 +701,21 @@ int net_init_socket(const Netdev *netdev, const char *name,
if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast +
sock->has_udp != 1) {
- error_report("exactly one of fd=, listen=, connect=, mcast= or udp="
- " is required");
+ error_setg(errp, "exactly one of fd=, listen=, connect=, mcast= or udp="
+ " is required");
return -1;
}
if (sock->has_localaddr && !sock->has_mcast && !sock->has_udp) {
- error_report("localaddr= is only valid with mcast= or udp=");
+ error_setg(errp, "localaddr= is only valid with mcast= or udp=");
return -1;
}
if (sock->has_fd) {
int fd;
- fd = monitor_fd_param(cur_mon, sock->fd, &err);
+ fd = monitor_fd_param(cur_mon, sock->fd, errp);
if (fd == -1) {
- error_report_err(err);
return -1;
}
qemu_set_nonblock(fd);
@@ -731,15 +726,16 @@ int net_init_socket(const Netdev *netdev, const char *name,
}
if (sock->has_listen) {
- if (net_socket_listen_init(peer, "socket", name, sock->listen) == -1) {
+ if (net_socket_listen_init(peer, "socket", name,
+ sock->listen, errp) == -1) {
return -1;
}
return 0;
}
if (sock->has_connect) {
- if (net_socket_connect_init(peer, "socket", name, sock->connect) ==
- -1) {
+ if (net_socket_connect_init(peer, "socket", name,
+ sock->connect, errp) == -1) {
return -1;
}
return 0;
@@ -748,8 +744,8 @@ int net_init_socket(const Netdev *netdev, const char *name,
if (sock->has_mcast) {
/* if sock->localaddr is missing, it has been initialized to "all bits
* zero" */
- if (net_socket_mcast_init(peer, "socket", name, sock->mcast,
- sock->localaddr) == -1) {
+ if (net_socket_mcast_init(peer, "socket", name,
+ sock->mcast, sock->localaddr, errp) == -1) {
return -1;
}
return 0;
@@ -757,11 +753,11 @@ int net_init_socket(const Netdev *netdev, const char *name,
assert(sock->has_udp);
if (!sock->has_localaddr) {
- error_report("localaddr= is mandatory with udp=");
+ error_setg(errp, "localaddr= is mandatory with udp=");
return -1;
}
- if (net_socket_udp_init(peer, "socket", name, sock->udp, sock->localaddr) ==
- -1) {
+ if (net_socket_udp_init(peer, "socket", name,
+ sock->udp, sock->localaddr, errp) == -1) {
return -1;
}
return 0;
--
2.9.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PATCH v7 4/4] net/socket: Improve -net socket error reporting
2017-06-29 9:43 ` [Qemu-devel] [PATCH v7 4/4] net/socket: Improve -net socket error reporting Mao Zhongyi
@ 2017-07-04 16:24 ` Markus Armbruster
2017-07-05 3:30 ` Mao Zhongyi
0 siblings, 1 reply; 10+ messages in thread
From: Markus Armbruster @ 2017-07-04 16:24 UTC (permalink / raw)
To: Mao Zhongyi; +Cc: qemu-devel, jasowang
Mao Zhongyi <maozy.fnst@cn.fujitsu.com> writes:
> When -net socket fails, it first reports a specific error, then
> a generic one, like this:
>
> $ qemu-system-x86_64 -net socket,
> qemu-system-x86_64: -net socket: exactly one of fd=, listen=, connect=, mcast= or udp= is required
> qemu-system-x86_64: -net socket: Device 'socket' could not be initialized
>
> Convert net_socket_*_init() to Error to get rid of the superfluous second
> error message. After the patch, the effect like this:
>
> $ qemu-system-x86_64 -net socket,
> qemu-system-x86_64: -net socket: exactly one of fd=, listen=, connect=, mcast= or udp= is required
>
> At the same time, add many explicit error handling message when it fails.
>
> Cc: jasowang@redhat.com
> Cc: armbru@redhat.com
> Cc: berrange@redhat.com
> Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
> ---
> net/socket.c | 94 +++++++++++++++++++++++++++++-------------------------------
> 1 file changed, 45 insertions(+), 49 deletions(-)
>
> diff --git a/net/socket.c b/net/socket.c
> index bd80b3c..a891c3a 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -494,22 +494,21 @@ static void net_socket_accept(void *opaque)
> static int net_socket_listen_init(NetClientState *peer,
> const char *model,
> const char *name,
> - const char *host_str)
> + const char *host_str,
> + Error **errp)
> {
> NetClientState *nc;
> NetSocketState *s;
> struct sockaddr_in saddr;
> int fd, ret;
> - Error *err = NULL;
>
> - if (parse_host_port(&saddr, host_str, &err) < 0) {
> - error_report_err(err);
> + if (parse_host_port(&saddr, host_str, errp) < 0) {
> return -1;
> }
>
> fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
> if (fd < 0) {
> - perror("socket");
> + error_setg_errno(errp, errno, "failed to create stream socket");
> return -1;
> }
> qemu_set_nonblock(fd);
> @@ -518,13 +517,14 @@ static int net_socket_listen_init(NetClientState *peer,
>
> ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));
> if (ret < 0) {
> - perror("bind");
> + error_setg_errno(errp, errno, "bind ip=%s to socket failed",
> + inet_ntoa(saddr.sin_addr));
Comment on the same error message in PATCH 2 applies.
> closesocket(fd);
> return -1;
> }
> ret = listen(fd, 0);
> if (ret < 0) {
> - perror("listen");
> + error_setg_errno(errp, errno, "listen socket failed");
Suggest "can't listen on socket".
> closesocket(fd);
> return -1;
> }
> @@ -543,21 +543,20 @@ static int net_socket_listen_init(NetClientState *peer,
> static int net_socket_connect_init(NetClientState *peer,
> const char *model,
> const char *name,
> - const char *host_str)
> + const char *host_str,
> + Error **errp)
> {
> NetSocketState *s;
> int fd, connected, ret;
> struct sockaddr_in saddr;
> - Error *err = NULL;
>
> - if (parse_host_port(&saddr, host_str, &err) < 0) {
> - error_report_err(err);
> + if (parse_host_port(&saddr, host_str, errp) < 0) {
> return -1;
> }
>
> fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
> if (fd < 0) {
> - perror("socket");
> + error_setg_errno(errp, errno, "failed to create stream socket");
> return -1;
> }
> qemu_set_nonblock(fd);
> @@ -573,7 +572,7 @@ static int net_socket_connect_init(NetClientState *peer,
> errno == EINVAL) {
> break;
> } else {
> - perror("connect");
> + error_setg_errno(errp, errno, "connection failed");
Suggest "can't connect socket".
> closesocket(fd);
> return -1;
> }
> @@ -582,9 +581,8 @@ static int net_socket_connect_init(NetClientState *peer,
> break;
> }
> }
> - s = net_socket_fd_init(peer, model, name, fd, connected, &err);
> + s = net_socket_fd_init(peer, model, name, fd, connected, errp);
> if (!s) {
> - error_report_err(err);
> return -1;
> }
> snprintf(s->nc.info_str, sizeof(s->nc.info_str),
> @@ -597,36 +595,36 @@ static int net_socket_mcast_init(NetClientState *peer,
> const char *model,
> const char *name,
> const char *host_str,
> - const char *localaddr_str)
> + const char *localaddr_str,
> + Error **errp)
> {
> NetSocketState *s;
> int fd;
> struct sockaddr_in saddr;
> struct in_addr localaddr, *param_localaddr;
> - Error *err = NULL;
>
> - if (parse_host_port(&saddr, host_str, &err) < 0) {
> - error_report_err(err);
> + if (parse_host_port(&saddr, host_str, errp) < 0) {
> return -1;
> }
>
> if (localaddr_str != NULL) {
> - if (inet_aton(localaddr_str, &localaddr) == 0)
> + if (inet_aton(localaddr_str, &localaddr) == 0) {
> + error_setg(errp, "localaddr '%s' is not a valid IPv4 address",
> + localaddr_str);
> return -1;
> + }
> param_localaddr = &localaddr;
> } else {
> param_localaddr = NULL;
> }
>
> - fd = net_socket_mcast_create(&saddr, param_localaddr, &err);
> + fd = net_socket_mcast_create(&saddr, param_localaddr, errp);
> if (fd < 0) {
> - error_report_err(err);
> return -1;
> }
>
> - s = net_socket_fd_init(peer, model, name, fd, 0, &err);
> + s = net_socket_fd_init(peer, model, name, fd, 0, errp);
> if (!s) {
> - error_report_err(err);
> return -1;
> }
>
> @@ -643,45 +641,45 @@ static int net_socket_udp_init(NetClientState *peer,
> const char *model,
> const char *name,
> const char *rhost,
> - const char *lhost)
> + const char *lhost,
> + Error **errp)
> {
> NetSocketState *s;
> int fd, ret;
> struct sockaddr_in laddr, raddr;
> - Error *err = NULL;
>
> - if (parse_host_port(&laddr, lhost, &err) < 0) {
> - error_report_err(err);
> + if (parse_host_port(&laddr, lhost, errp) < 0) {
> return -1;
> }
>
> - if (parse_host_port(&raddr, rhost, &err) < 0) {
> - error_report_err(err);
> + if (parse_host_port(&raddr, rhost, errp) < 0) {
> return -1;
> }
>
> fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);
> if (fd < 0) {
> - perror("socket(PF_INET, SOCK_DGRAM)");
> + error_setg_errno(errp, errno, "failed to create datagram socket");
Comment on the same error message in PATCH 2 applies.
> return -1;
> }
>
> ret = socket_set_fast_reuse(fd);
> if (ret < 0) {
> + error_setg_errno(errp, errno, "set the socket 'SO_REUSEADDR'"
> + " attribute failed");
Comment on the same error message in PATCH 2 applies.
> closesocket(fd);
> return -1;
> }
> ret = bind(fd, (struct sockaddr *)&laddr, sizeof(laddr));
> if (ret < 0) {
> - perror("bind");
> + error_setg_errno(errp, errno, "bind ip=%s to socket failed",
> + inet_ntoa(laddr.sin_addr));
Likewise.
> closesocket(fd);
> return -1;
> }
> qemu_set_nonblock(fd);
>
> - s = net_socket_fd_init(peer, model, name, fd, 0, &err);
> + s = net_socket_fd_init(peer, model, name, fd, 0, errp);
> if (!s) {
> - error_report_err(err);
> return -1;
> }
>
> @@ -696,8 +694,6 @@ static int net_socket_udp_init(NetClientState *peer,
> int net_init_socket(const Netdev *netdev, const char *name,
> NetClientState *peer, Error **errp)
> {
> - /* FIXME error_setg(errp, ...) on failure */
> - Error *err = NULL;
> const NetdevSocketOptions *sock;
>
> assert(netdev->type == NET_CLIENT_DRIVER_SOCKET);
> @@ -705,22 +701,21 @@ int net_init_socket(const Netdev *netdev, const char *name,
>
> if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast +
> sock->has_udp != 1) {
> - error_report("exactly one of fd=, listen=, connect=, mcast= or udp="
> - " is required");
> + error_setg(errp, "exactly one of fd=, listen=, connect=, mcast= or udp="
> + " is required");
> return -1;
> }
>
> if (sock->has_localaddr && !sock->has_mcast && !sock->has_udp) {
> - error_report("localaddr= is only valid with mcast= or udp=");
> + error_setg(errp, "localaddr= is only valid with mcast= or udp=");
> return -1;
> }
>
> if (sock->has_fd) {
> int fd;
>
> - fd = monitor_fd_param(cur_mon, sock->fd, &err);
> + fd = monitor_fd_param(cur_mon, sock->fd, errp);
> if (fd == -1) {
> - error_report_err(err);
> return -1;
> }
> qemu_set_nonblock(fd);
> @@ -731,15 +726,16 @@ int net_init_socket(const Netdev *netdev, const char *name,
> }
>
> if (sock->has_listen) {
> - if (net_socket_listen_init(peer, "socket", name, sock->listen) == -1) {
> + if (net_socket_listen_init(peer, "socket", name,
> + sock->listen, errp) == -1) {
Please avoid breaking the line in the middle of an operator's operand
when you could just as well break it at the operator, like this:
if (net_socket_listen_init(peer, "socket", name, sock->listen, errp)
== -1) {
Since you're touching this line anyway, I suggest to replace == -1 by
the more idiomatic < 0.
> return -1;
> }
> return 0;
> }
>
> if (sock->has_connect) {
> - if (net_socket_connect_init(peer, "socket", name, sock->connect) ==
> - -1) {
> + if (net_socket_connect_init(peer, "socket", name,
> + sock->connect, errp) == -1) {
Likewise.
> return -1;
> }
> return 0;
> @@ -748,8 +744,8 @@ int net_init_socket(const Netdev *netdev, const char *name,
> if (sock->has_mcast) {
> /* if sock->localaddr is missing, it has been initialized to "all bits
> * zero" */
> - if (net_socket_mcast_init(peer, "socket", name, sock->mcast,
> - sock->localaddr) == -1) {
> + if (net_socket_mcast_init(peer, "socket", name,
> + sock->mcast, sock->localaddr, errp) == -1) {
Likewise.
> return -1;
> }
> return 0;
> @@ -757,11 +753,11 @@ int net_init_socket(const Netdev *netdev, const char *name,
>
> assert(sock->has_udp);
> if (!sock->has_localaddr) {
> - error_report("localaddr= is mandatory with udp=");
> + error_setg(errp, "localaddr= is mandatory with udp=");
> return -1;
> }
> - if (net_socket_udp_init(peer, "socket", name, sock->udp, sock->localaddr) ==
> - -1) {
> + if (net_socket_udp_init(peer, "socket", name,
> + sock->udp, sock->localaddr, errp) == -1) {
Likewise.
> return -1;
> }
> return 0;
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PATCH v7 4/4] net/socket: Improve -net socket error reporting
2017-07-04 16:24 ` Markus Armbruster
@ 2017-07-05 3:30 ` Mao Zhongyi
0 siblings, 0 replies; 10+ messages in thread
From: Mao Zhongyi @ 2017-07-05 3:30 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel, jasowang
On 07/05/2017 12:24 AM, Markus Armbruster wrote:
> Mao Zhongyi <maozy.fnst@cn.fujitsu.com> writes:
>
>> When -net socket fails, it first reports a specific error, then
>> a generic one, like this:
>>
>> $ qemu-system-x86_64 -net socket,
>> qemu-system-x86_64: -net socket: exactly one of fd=, listen=, connect=, mcast= or udp= is required
>> qemu-system-x86_64: -net socket: Device 'socket' could not be initialized
>>
>> Convert net_socket_*_init() to Error to get rid of the superfluous second
>> error message. After the patch, the effect like this:
>>
>> $ qemu-system-x86_64 -net socket,
>> qemu-system-x86_64: -net socket: exactly one of fd=, listen=, connect=, mcast= or udp= is required
>>
>> At the same time, add many explicit error handling message when it fails.
>>
>> Cc: jasowang@redhat.com
>> Cc: armbru@redhat.com
>> Cc: berrange@redhat.com
>> Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
>> ---
>> net/socket.c | 94 +++++++++++++++++++++++++++++-------------------------------
>> 1 file changed, 45 insertions(+), 49 deletions(-)
>>
>> diff --git a/net/socket.c b/net/socket.c
>> index bd80b3c..a891c3a 100644
>> --- a/net/socket.c
>> +++ b/net/socket.c
>> @@ -494,22 +494,21 @@ static void net_socket_accept(void *opaque)
>> static int net_socket_listen_init(NetClientState *peer,
>> const char *model,
>> const char *name,
>> - const char *host_str)
>> + const char *host_str,
>> + Error **errp)
>> {
>> NetClientState *nc;
>> NetSocketState *s;
>> struct sockaddr_in saddr;
>> int fd, ret;
>> - Error *err = NULL;
>>
>> - if (parse_host_port(&saddr, host_str, &err) < 0) {
>> - error_report_err(err);
>> + if (parse_host_port(&saddr, host_str, errp) < 0) {
>> return -1;
>> }
>>
>> fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
>> if (fd < 0) {
>> - perror("socket");
>> + error_setg_errno(errp, errno, "failed to create stream socket");
>> return -1;
>> }
>> qemu_set_nonblock(fd);
>> @@ -518,13 +517,14 @@ static int net_socket_listen_init(NetClientState *peer,
>>
>> ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));
>> if (ret < 0) {
>> - perror("bind");
>> + error_setg_errno(errp, errno, "bind ip=%s to socket failed",
>> + inet_ntoa(saddr.sin_addr));
>
> Comment on the same error message in PATCH 2 applies.
OK, I will fix the similar problems right away.
>
>> closesocket(fd);
>> return -1;
>> }
>> ret = listen(fd, 0);
>> if (ret < 0) {
>> - perror("listen");
>> + error_setg_errno(errp, errno, "listen socket failed");
>
> Suggest "can't listen on socket".
OK, I will.
>> - fd = net_socket_mcast_create(&saddr, param_localaddr, &err);
[...]
>> if (sock->has_listen) {
>> - if (net_socket_listen_init(peer, "socket", name, sock->listen) == -1) {
>> + if (net_socket_listen_init(peer, "socket", name,
>> + sock->listen, errp) == -1) {
>
> Please avoid breaking the line in the middle of an operator's operand
> when you could just as well break it at the operator, like this:
>
> if (net_socket_listen_init(peer, "socket", name, sock->listen, errp)
> == -1) {
>
> Since you're touching this line anyway, I suggest to replace == -1 by
> the more idiomatic < 0.
>
OK, I see.
Thanks,
Mao
^ permalink raw reply [flat|nested] 10+ messages in thread