{"id":809713,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809713/?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":"<81411b5c110b874a19c63cea528d1c913bd2bce3.1504533674.git.maozy.fnst@cn.fujitsu.com>","date":"2017-09-04T14:35:38","name":"[v9,2/4] net/socket: Convert several helper functions to Error","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2bebbf5d71c0215a165ed13f9671ebaa9029a6a1","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/81411b5c110b874a19c63cea528d1c913bd2bce3.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/809713/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 3xmCLf1brqz9sNc\n\tfor ;\n\tTue, 5 Sep 2017 00:45:13 +1000 (AEST)","from localhost ([::1]:48277 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dosci-000313-1B\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 10:45:12 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33643)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dosVe-0005oB-EU\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 1dosVZ-00040f-8i\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:37:54 -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 1dosVY-0003xu-Fd\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:37:49 -0400","from localhost (HELO cn.fujitsu.com) ([10.167.33.5])\n\tby heian.cn.fujitsu.com with ESMTP; 04 Sep 2017 22:37:40 +0800","from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85])\n\tby cn.fujitsu.com (Postfix) with ESMTP id 80E904725549;\n\tMon, 4 Sep 2017 22:37:40 +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:45 +0800"],"X-IronPort-AV":"E=Sophos;i=\"5.41,475,1498492800\"; d=\"scan'208\";a=\"25197758\"","From":"Mao Zhongyi ","To":"","Date":"Mon, 4 Sep 2017 22:35:38 +0800","Message-ID":"<81411b5c110b874a19c63cea528d1c913bd2bce3.1504533674.git.maozy.fnst@cn.fujitsu.com>","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":"80E904725549.A0109","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 2/4] 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":"jasowang@redhat.com, armbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Currently, 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 \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":["v9","2/4"]}