{"id":809709,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809709/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"","date":"2017-09-04T14:35:40","name":"[v9,4/4] net/socket: Improve -net socket error reporting","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9fbc8e63cc33e1493c6f71523ef1e0bc477f6967","submitter":{"id":71231,"url":"http://patchwork.ozlabs.org/api/1.0/people/71231/?format=json","name":"Mao Zhongyi","email":"maozy.fnst@cn.fujitsu.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/f6605c222cd1267f4d1c0a357325e7feda179546.1504533674.git.maozy.fnst@cn.fujitsu.com/mbox/","series":[{"id":1398,"url":"http://patchwork.ozlabs.org/api/1.0/series/1398/?format=json","date":"2017-09-04T14:35:37","name":"Improve error reporting","version":9,"mbox":"http://patchwork.ozlabs.org/series/1398/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809709/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xmCC84jkdz9s7c\n\tfor ;\n\tTue, 5 Sep 2017 00:38:44 +1000 (AEST)","from localhost ([::1]:47870 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dosWQ-0005uA-O4\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 10:38:42 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33665)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dosVf-0005qP-Tz\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:38:02 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dosVa-00041d-Gm\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:37:55 -0400","from mail.cn.fujitsu.com ([183.91.158.132]:32749\n\thelo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dosVZ-0003xu-SA\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:37:50 -0400","from localhost (HELO cn.fujitsu.com) ([10.167.33.5])\n\tby heian.cn.fujitsu.com with ESMTP; 04 Sep 2017 22:37:46 +0800","from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85])\n\tby cn.fujitsu.com (Postfix) with ESMTP id C5BD24725542;\n\tMon, 4 Sep 2017 22:37:41 +0800 (CST)","from maozy.g08.fujitsu.local (10.167.225.76) by\n\tG08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP\n\tServer (TLS) id 14.3.361.1; Mon, 4 Sep 2017 22:37:47 +0800"],"X-IronPort-AV":"E=Sophos;i=\"5.41,475,1498492800\"; d=\"scan'208\";a=\"25197764\"","From":"Mao Zhongyi ","To":"","Date":"Mon, 4 Sep 2017 22:35:40 +0800","Message-ID":"","X-Mailer":"git-send-email 2.9.4","In-Reply-To":"","References":"","MIME-Version":"1.0","Content-Type":"text/plain","X-Originating-IP":"[10.167.225.76]","X-yoursite-MailScanner-ID":"C5BD24725542.A17E8","X-yoursite-MailScanner":"Found to be clean","X-yoursite-MailScanner-From":"maozy.fnst@cn.fujitsu.com","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"183.91.158.132","Subject":"[Qemu-devel] [PATCH v9 4/4] net/socket: Improve -net socket error\n\treporting","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"jasowang@redhat.com, armbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"When -net socket fails, it first reports a specific error, then\na generic one, like this:\n\n $ ./x86_64-softmmu/qemu-system-x86_64 -net socket,mcast=230.0.0.1:1234,listen\n qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: exactly one of listen=, connect=, mcast= or udp= is required\n qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: Device 'socket' could not be initialized\n\nConvert net_socket_*_init() to Error to get rid of the superfluous second\nerror message. After the patch, the effect like this:\n\n $ ./x86_64-softmmu/qemu-system-x86_64 -net socket,mcast=230.0.0.1:1234,listen\n qemu-system-x86_64: -net socket,mcast=230.0.0.1:1234,listen: exactly one of listen=, connect=, mcast= or udp= is requireda\n\nThis also fixes a few silent failures to report an error.\n\nCc: jasowang@redhat.com\nCc: armbru@redhat.com\nCc: berrange@redhat.com\nSigned-off-by: Mao Zhongyi \nReviewed-by: Markus Armbruster \n---\n net/socket.c | 92 +++++++++++++++++++++++++++++-------------------------------\n 1 file changed, 44 insertions(+), 48 deletions(-)","diff":"diff --git a/net/socket.c b/net/socket.c\nindex 12495d1..e6b471c 100644\n--- a/net/socket.c\n+++ b/net/socket.c\n@@ -489,22 +489,21 @@ static void net_socket_accept(void *opaque)\n static int net_socket_listen_init(NetClientState *peer,\n const char *model,\n const char *name,\n- const char *host_str)\n+ const char *host_str,\n+ Error **errp)\n {\n NetClientState *nc;\n NetSocketState *s;\n struct sockaddr_in saddr;\n int fd, ret;\n- Error *err = NULL;\n \n- if (parse_host_port(&saddr, host_str, &err) < 0) {\n- error_report_err(err);\n+ if (parse_host_port(&saddr, host_str, errp) < 0) {\n return -1;\n }\n \n fd = qemu_socket(PF_INET, SOCK_STREAM, 0);\n if (fd < 0) {\n- perror(\"socket\");\n+ error_setg_errno(errp, errno, \"can't create stream socket\");\n return -1;\n }\n qemu_set_nonblock(fd);\n@@ -513,13 +512,14 @@ static int net_socket_listen_init(NetClientState *peer,\n \n ret = bind(fd, (struct sockaddr *)&saddr, sizeof(saddr));\n if (ret < 0) {\n- perror(\"bind\");\n+ error_setg_errno(errp, errno, \"can't bind ip=%s to socket\",\n+ inet_ntoa(saddr.sin_addr));\n closesocket(fd);\n return -1;\n }\n ret = listen(fd, 0);\n if (ret < 0) {\n- perror(\"listen\");\n+ error_setg_errno(errp, errno, \"can't listen on socket\");\n closesocket(fd);\n return -1;\n }\n@@ -538,21 +538,20 @@ static int net_socket_listen_init(NetClientState *peer,\n static int net_socket_connect_init(NetClientState *peer,\n const char *model,\n const char *name,\n- const char *host_str)\n+ const char *host_str,\n+ Error **errp)\n {\n NetSocketState *s;\n int fd, connected, ret;\n struct sockaddr_in saddr;\n- Error *err = NULL;\n \n- if (parse_host_port(&saddr, host_str, &err) < 0) {\n- error_report_err(err);\n+ if (parse_host_port(&saddr, host_str, errp) < 0) {\n return -1;\n }\n \n fd = qemu_socket(PF_INET, SOCK_STREAM, 0);\n if (fd < 0) {\n- perror(\"socket\");\n+ error_setg_errno(errp, errno, \"can't create stream socket\");\n return -1;\n }\n qemu_set_nonblock(fd);\n@@ -568,7 +567,7 @@ static int net_socket_connect_init(NetClientState *peer,\n errno == EINVAL) {\n break;\n } else {\n- perror(\"connect\");\n+ error_setg_errno(errp, errno, \"can't connect socket\");\n closesocket(fd);\n return -1;\n }\n@@ -577,9 +576,8 @@ static int net_socket_connect_init(NetClientState *peer,\n break;\n }\n }\n- s = net_socket_fd_init(peer, model, name, fd, connected, NULL, &err);\n+ s = net_socket_fd_init(peer, model, name, fd, connected, NULL, errp);\n if (!s) {\n- error_report_err(err);\n return -1;\n }\n \n@@ -593,36 +591,36 @@ static int net_socket_mcast_init(NetClientState *peer,\n const char *model,\n const char *name,\n const char *host_str,\n- const char *localaddr_str)\n+ const char *localaddr_str,\n+ Error **errp)\n {\n NetSocketState *s;\n int fd;\n struct sockaddr_in saddr;\n struct in_addr localaddr, *param_localaddr;\n- Error *err = NULL;\n \n- if (parse_host_port(&saddr, host_str, &err) < 0) {\n- error_report_err(err);\n+ if (parse_host_port(&saddr, host_str, errp) < 0) {\n return -1;\n }\n \n if (localaddr_str != NULL) {\n- if (inet_aton(localaddr_str, &localaddr) == 0)\n+ if (inet_aton(localaddr_str, &localaddr) == 0) {\n+ error_setg(errp, \"localaddr '%s' is not a valid IPv4 address\",\n+ localaddr_str);\n return -1;\n+ }\n param_localaddr = &localaddr;\n } else {\n param_localaddr = NULL;\n }\n \n- fd = net_socket_mcast_create(&saddr, param_localaddr, &err);\n+ fd = net_socket_mcast_create(&saddr, param_localaddr, errp);\n if (fd < 0) {\n- error_report_err(err);\n return -1;\n }\n \n- s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);\n+ s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);\n if (!s) {\n- error_report_err(err);\n return -1;\n }\n \n@@ -639,45 +637,45 @@ static int net_socket_udp_init(NetClientState *peer,\n const char *model,\n const char *name,\n const char *rhost,\n- const char *lhost)\n+ const char *lhost,\n+ Error **errp)\n {\n NetSocketState *s;\n int fd, ret;\n struct sockaddr_in laddr, raddr;\n- Error *err = NULL;\n \n- if (parse_host_port(&laddr, lhost, &err) < 0) {\n- error_report_err(err);\n+ if (parse_host_port(&laddr, lhost, errp) < 0) {\n return -1;\n }\n \n- if (parse_host_port(&raddr, rhost, &err) < 0) {\n- error_report_err(err);\n+ if (parse_host_port(&raddr, rhost, errp) < 0) {\n return -1;\n }\n \n fd = qemu_socket(PF_INET, SOCK_DGRAM, 0);\n if (fd < 0) {\n- perror(\"socket(PF_INET, SOCK_DGRAM)\");\n+ error_setg_errno(errp, errno, \"can't create datagram socket\");\n return -1;\n }\n \n ret = socket_set_fast_reuse(fd);\n if (ret < 0) {\n+ error_setg_errno(errp, errno,\n+ \"can't set socket option SO_REUSEADDR\");\n closesocket(fd);\n return -1;\n }\n ret = bind(fd, (struct sockaddr *)&laddr, sizeof(laddr));\n if (ret < 0) {\n- perror(\"bind\");\n+ error_setg_errno(errp, errno, \"can't bind ip=%s to socket\",\n+ inet_ntoa(laddr.sin_addr));\n closesocket(fd);\n return -1;\n }\n qemu_set_nonblock(fd);\n \n- s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);\n+ s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);\n if (!s) {\n- error_report_err(err);\n return -1;\n }\n \n@@ -692,8 +690,6 @@ static int net_socket_udp_init(NetClientState *peer,\n int net_init_socket(const Netdev *netdev, const char *name,\n NetClientState *peer, Error **errp)\n {\n- /* FIXME error_setg(errp, ...) on failure */\n- Error *err = NULL;\n const NetdevSocketOptions *sock;\n \n assert(netdev->type == NET_CLIENT_DRIVER_SOCKET);\n@@ -701,22 +697,21 @@ int net_init_socket(const Netdev *netdev, const char *name,\n \n if (sock->has_listen + sock->has_connect + sock->has_mcast +\n sock->has_udp > 1) {\n- error_report(\"exactly one of listen=, connect=, mcast= or udp=\"\n- \" is required\");\n+ error_setg(errp, \"exactly one of listen=, connect=, mcast= or udp=\"\n+ \" is required\");\n return -1;\n }\n \n if (sock->has_localaddr && !sock->has_mcast && !sock->has_udp) {\n- error_report(\"localaddr= is only valid with mcast= or udp=\");\n+ error_setg(errp, \"localaddr= is only valid with mcast= or udp=\");\n return -1;\n }\n \n if (sock->has_fd) {\n int fd;\n \n- fd = monitor_fd_param(cur_mon, sock->fd, &err);\n+ fd = monitor_fd_param(cur_mon, sock->fd, errp);\n if (fd == -1) {\n- error_report_err(err);\n return -1;\n }\n qemu_set_nonblock(fd);\n@@ -728,15 +723,16 @@ int net_init_socket(const Netdev *netdev, const char *name,\n }\n \n if (sock->has_listen) {\n- if (net_socket_listen_init(peer, \"socket\", name, sock->listen) == -1) {\n+ if (net_socket_listen_init(peer, \"socket\", name, sock->listen, errp)\n+ < 0) {\n return -1;\n }\n return 0;\n }\n \n if (sock->has_connect) {\n- if (net_socket_connect_init(peer, \"socket\", name, sock->connect) ==\n- -1) {\n+ if (net_socket_connect_init(peer, \"socket\", name, sock->connect, errp)\n+ < 0) {\n return -1;\n }\n return 0;\n@@ -746,7 +742,7 @@ int net_init_socket(const Netdev *netdev, const char *name,\n /* if sock->localaddr is missing, it has been initialized to \"all bits\n * zero\" */\n if (net_socket_mcast_init(peer, \"socket\", name, sock->mcast,\n- sock->localaddr) == -1) {\n+ sock->localaddr, errp) < 0) {\n return -1;\n }\n return 0;\n@@ -754,11 +750,11 @@ int net_init_socket(const Netdev *netdev, const char *name,\n \n assert(sock->has_udp);\n if (!sock->has_localaddr) {\n- error_report(\"localaddr= is mandatory with udp=\");\n+ error_setg(errp, \"localaddr= is mandatory with udp=\");\n return -1;\n }\n- if (net_socket_udp_init(peer, \"socket\", name, sock->udp, sock->localaddr) ==\n- -1) {\n+ if (net_socket_udp_init(peer, \"socket\", name, sock->udp, sock->localaddr,\n+ errp) < 0) {\n return -1;\n }\n return 0;\n","prefixes":["v9","4/4"]}