Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/811296/?format=api
{ "id": 811296, "url": "http://patchwork.ozlabs.org/api/1.2/patches/811296/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-12-git-send-email-jasowang@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.2/projects/14/?format=api", "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": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1504836324-4871-12-git-send-email-jasowang@redhat.com>", "list_archive_url": null, "date": "2017-09-08T02:05:17", "name": "[PULL,11/18] net/socket: Improve -net socket error reporting", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "9fbc8e63cc33e1493c6f71523ef1e0bc477f6967", "submitter": { "id": 5225, "url": "http://patchwork.ozlabs.org/api/1.2/people/5225/?format=api", "name": "Jason Wang", "email": "jasowang@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-12-git-send-email-jasowang@redhat.com/mbox/", "series": [ { "id": 2087, "url": "http://patchwork.ozlabs.org/api/1.2/series/2087/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2087", "date": "2017-09-08T02:05:06", "name": "[PULL,01/18] net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/2087/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/811296/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/811296/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jasowang@redhat.com" ], "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 3xpLWR440Jz9s7p\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 8 Sep 2017 12:15:15 +1000 (AEST)", "from localhost ([::1]:42980 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dq8p7-0002gp-Ac\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 22:15:13 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:60995)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <jasowang@redhat.com>) id 1dq8gd-0003Z1-TY\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:33 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <jasowang@redhat.com>) id 1dq8gY-0002Qp-Gn\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:27 -0400", "from mx1.redhat.com ([209.132.183.28]:41154)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <jasowang@redhat.com>) id 1dq8gY-0002Q9-7T\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:22 -0400", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 25D5B4E4CA;\n\tFri, 8 Sep 2017 02:06:21 +0000 (UTC)", "from jason-ThinkPad-T450s.redhat.com (ovpn-12-98.pek2.redhat.com\n\t[10.72.12.98])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id CBA98600C2;\n\tFri, 8 Sep 2017 02:06:17 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 25D5B4E4CA", "From": "Jason Wang <jasowang@redhat.com>", "To": "peter.maydell@linaro.org,\n\tqemu-devel@nongnu.org", "Date": "Fri, 8 Sep 2017 10:05:17 +0800", "Message-Id": "<1504836324-4871-12-git-send-email-jasowang@redhat.com>", "In-Reply-To": "<1504836324-4871-1-git-send-email-jasowang@redhat.com>", "References": "<1504836324-4871-1-git-send-email-jasowang@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tFri, 08 Sep 2017 02:06:21 +0000 (UTC)", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PULL 11/18] net/socket: Improve -net socket error\n\treporting", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Mao Zhongyi <maozy.fnst@cn.fujitsu.com>, jasowang@redhat.com,\n\tarmbru@redhat.com", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>\n\nWhen -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 <maozy.fnst@cn.fujitsu.com>\nReviewed-by: Markus Armbruster <armbru@redhat.com>\nSigned-off-by: Jason Wang <jasowang@redhat.com>\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": [ "PULL", "11/18" ] }