{"id":811292,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811292/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-10-git-send-email-jasowang@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504836324-4871-10-git-send-email-jasowang@redhat.com>","list_archive_url":null,"date":"2017-09-08T02:05:15","name":"[PULL,09/18] net/socket: Convert several helper functions to Error","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2bebbf5d71c0215a165ed13f9671ebaa9029a6a1","submitter":{"id":5225,"url":"http://patchwork.ozlabs.org/api/1.2/people/5225/?format=json","name":"Jason Wang","email":"jasowang@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-10-git-send-email-jasowang@redhat.com/mbox/","series":[{"id":2087,"url":"http://patchwork.ozlabs.org/api/1.2/series/2087/?format=json","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/811292/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811292/checks/","tags":{},"related":[],"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=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.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 3xpLRt0lHHz9ryT\n\tfor ;\n\tFri, 8 Sep 2017 12:12:10 +1000 (AEST)","from localhost ([::1]:42969 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dq8m8-00085f-3r\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 22:12:08 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60882)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dq8gQ-0003Mp-WF\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:20 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dq8gL-0002JI-ME\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:14 -0400","from mx1.redhat.com ([209.132.183.28]:36764)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dq8gL-0002Io-CQ\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:09 -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 70D6F3683C;\n\tFri, 8 Sep 2017 02:06:08 +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 5892D600C2;\n\tFri, 8 Sep 2017 02:06:05 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 70D6F3683C","From":"Jason Wang ","To":"peter.maydell@linaro.org,\n\tqemu-devel@nongnu.org","Date":"Fri, 8 Sep 2017 10:05:15 +0800","Message-Id":"<1504836324-4871-10-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.30]);\n\tFri, 08 Sep 2017 02:06:08 +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 09/18] net/socket: Convert several helper\n\tfunctions to Error","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":"Mao Zhongyi , jasowang@redhat.com,\n\tarmbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Mao Zhongyi \n\nCurrently, net_socket_mcast_create(), net_socket_fd_init_dgram() and\nnet_socket_fd_init() use the function such as fprintf(), perror() to\nreport an error message.\n\nNow, convert these functions to Error.\n\nCc: jasowang@redhat.com\nCc: armbru@redhat.com\nCc: berrange@redhat.com\nSigned-off-by: Mao Zhongyi \nReviewed-by: Daniel P. Berrange \nReviewed-by: Markus Armbruster \nSigned-off-by: Jason Wang \n---\n net/socket.c | 82 ++++++++++++++++++++++++++++++++++++------------------------\n 1 file changed, 50 insertions(+), 32 deletions(-)","diff":"diff --git a/net/socket.c b/net/socket.c\nindex b4c5a04..00f9796 100644\n--- a/net/socket.c\n+++ b/net/socket.c\n@@ -209,7 +209,9 @@ static void net_socket_send_dgram(void *opaque)\n }\n }\n \n-static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr *localaddr)\n+static int net_socket_mcast_create(struct sockaddr_in *mcastaddr,\n+ struct in_addr *localaddr,\n+ Error **errp)\n {\n struct ip_mreq imr;\n int fd;\n@@ -221,16 +223,16 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr\n #endif\n \n if (!IN_MULTICAST(ntohl(mcastaddr->sin_addr.s_addr))) {\n- fprintf(stderr, \"qemu: error: specified mcastaddr \\\"%s\\\" (0x%08x) \"\n- \"does not contain a multicast address\\n\",\n- inet_ntoa(mcastaddr->sin_addr),\n- (int)ntohl(mcastaddr->sin_addr.s_addr));\n+ error_setg(errp, \"specified mcastaddr %s (0x%08x) \"\n+ \"does not contain a multicast address\",\n+ inet_ntoa(mcastaddr->sin_addr),\n+ (int)ntohl(mcastaddr->sin_addr.s_addr));\n return -1;\n-\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@@ -242,13 +244,15 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr\n val = 1;\n ret = qemu_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));\n if (ret < 0) {\n- perror(\"setsockopt(SOL_SOCKET, SO_REUSEADDR)\");\n+ error_setg_errno(errp, errno,\n+ \"can't set socket option SO_REUSEADDR\");\n goto fail;\n }\n \n ret = bind(fd, (struct sockaddr *)mcastaddr, sizeof(*mcastaddr));\n if (ret < 0) {\n- perror(\"bind\");\n+ error_setg_errno(errp, errno, \"can't bind ip=%s to socket\",\n+ inet_ntoa(mcastaddr->sin_addr));\n goto fail;\n }\n \n@@ -263,7 +267,9 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr\n ret = qemu_setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,\n &imr, sizeof(struct ip_mreq));\n if (ret < 0) {\n- perror(\"setsockopt(IP_ADD_MEMBERSHIP)\");\n+ error_setg_errno(errp, errno,\n+ \"can't add socket to multicast group %s\",\n+ inet_ntoa(imr.imr_multiaddr));\n goto fail;\n }\n \n@@ -272,7 +278,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr\n ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP,\n &loop, sizeof(loop));\n if (ret < 0) {\n- perror(\"setsockopt(SOL_IP, IP_MULTICAST_LOOP)\");\n+ error_setg_errno(errp, errno,\n+ \"can't force multicast message to loopback\");\n goto fail;\n }\n \n@@ -281,7 +288,8 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr\n ret = qemu_setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF,\n localaddr, sizeof(*localaddr));\n if (ret < 0) {\n- perror(\"setsockopt(IP_MULTICAST_IF)\");\n+ error_setg_errno(errp, errno,\n+ \"can't set the default network send interface\");\n goto fail;\n }\n }\n@@ -321,7 +329,8 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,\n const char *model,\n const char *name,\n int fd, int is_connected,\n- const char *mcast)\n+ const char *mcast,\n+ Error **errp)\n {\n struct sockaddr_in saddr;\n int newfd;\n@@ -335,21 +344,17 @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,\n \n if (is_connected && mcast != NULL) {\n if (parse_host_port(&saddr, mcast) < 0) {\n- fprintf(stderr,\n- \"qemu: error: init_dgram: fd=%d failed parse_host_port()\\n\",\n- fd);\n+ error_setg(errp, \"fd=%d failed parse_host_port()\", fd);\n goto err;\n }\n /* must be bound */\n if (saddr.sin_addr.s_addr == 0) {\n- fprintf(stderr, \"qemu: error: init_dgram: fd=%d unbound, \"\n- \"cannot setup multicast dst addr\\n\", fd);\n+ error_setg(errp, \"can't setup multicast destination address\");\n goto err;\n }\n /* clone dgram socket */\n- newfd = net_socket_mcast_create(&saddr, NULL);\n+ newfd = net_socket_mcast_create(&saddr, NULL, errp);\n if (newfd < 0) {\n- /* error already reported by net_socket_mcast_create() */\n goto err;\n }\n /* clone newfd to fd, close newfd */\n@@ -431,20 +436,21 @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,\n \n static NetSocketState *net_socket_fd_init(NetClientState *peer,\n const char *model, const char *name,\n- int fd, int is_connected, const char *mc)\n+ int fd, int is_connected,\n+ const char *mc, Error **errp)\n {\n int so_type = -1, optlen=sizeof(so_type);\n \n if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,\n (socklen_t *)&optlen)< 0) {\n- fprintf(stderr, \"qemu: error: getsockopt(SO_TYPE) for fd=%d failed\\n\",\n- fd);\n+ error_setg(errp, \"can't get socket option SO_TYPE\");\n closesocket(fd);\n return NULL;\n }\n switch(so_type) {\n case SOCK_DGRAM:\n- return net_socket_fd_init_dgram(peer, model, name, fd, is_connected, mc);\n+ return net_socket_fd_init_dgram(peer, model, name, fd, is_connected,\n+ mc, errp);\n case SOCK_STREAM:\n return net_socket_fd_init_stream(peer, model, name, fd, is_connected);\n default:\n@@ -535,6 +541,7 @@ static int net_socket_connect_init(NetClientState *peer,\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) < 0)\n return -1;\n@@ -566,9 +573,12 @@ static int net_socket_connect_init(NetClientState *peer,\n break;\n }\n }\n- s = net_socket_fd_init(peer, model, name, fd, connected, NULL);\n- if (!s)\n+ s = net_socket_fd_init(peer, model, name, fd, connected, NULL, &err);\n+ if (!s) {\n+ error_report_err(err);\n return -1;\n+ }\n+\n snprintf(s->nc.info_str, sizeof(s->nc.info_str),\n \"socket: connect to %s:%d\",\n inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));\n@@ -585,6 +595,7 @@ static int net_socket_mcast_init(NetClientState *peer,\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) < 0)\n return -1;\n@@ -597,13 +608,17 @@ static int net_socket_mcast_init(NetClientState *peer,\n param_localaddr = NULL;\n }\n \n- fd = net_socket_mcast_create(&saddr, param_localaddr);\n- if (fd < 0)\n+ fd = net_socket_mcast_create(&saddr, param_localaddr, &err);\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);\n- if (!s)\n+ s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);\n+ if (!s) {\n+ error_report_err(err);\n return -1;\n+ }\n \n s->dgram_dst = saddr;\n \n@@ -623,6 +638,7 @@ static int net_socket_udp_init(NetClientState *peer,\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) < 0) {\n return -1;\n@@ -651,8 +667,9 @@ static int net_socket_udp_init(NetClientState *peer,\n }\n qemu_set_nonblock(fd);\n \n- s = net_socket_fd_init(peer, model, name, fd, 0, NULL);\n+ s = net_socket_fd_init(peer, model, name, fd, 0, NULL, &err);\n if (!s) {\n+ error_report_err(err);\n return -1;\n }\n \n@@ -695,7 +712,8 @@ int net_init_socket(const Netdev *netdev, const char *name,\n return -1;\n }\n qemu_set_nonblock(fd);\n- if (!net_socket_fd_init(peer, \"socket\", name, fd, 1, sock->mcast)) {\n+ if (!net_socket_fd_init(peer, \"socket\", name, fd, 1, sock->mcast,\n+ errp)) {\n return -1;\n }\n return 0;\n","prefixes":["PULL","09/18"]}