From nobody Thu Nov 6 08:38:17 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149727712045358.07468826401919; Mon, 12 Jun 2017 07:18:40 -0700 (PDT) Received: from localhost ([::1]:38351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKQAv-0000Vn-WC for importer@patchew.org; Mon, 12 Jun 2017 10:18:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKQ91-0007sm-K1 for qemu-devel@nongnu.org; Mon, 12 Jun 2017 10:16:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKQ90-0001lI-C4 for qemu-devel@nongnu.org; Mon, 12 Jun 2017 10:16:39 -0400 Received: from [59.151.112.132] (port=61554 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKQ8z-0001ij-FN for qemu-devel@nongnu.org; Mon, 12 Jun 2017 10:16:38 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 12 Jun 2017 22:16:35 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 4C1B247CA8C6; Mon, 12 Jun 2017 22:16:34 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 12 Jun 2017 22:16:34 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="19937296" From: Mao Zhongyi To: Date: Mon, 12 Jun 2017 22:15:05 +0800 Message-ID: <7e6ebf3f253314160b8a17ca4a3211140992cfc0.1497276062.git.maozy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: 4C1B247CA8C6.A2F40 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 recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v4 4/4] net/socket: Improve -net socket error reporting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jasowang@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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=3D, listen=3D, conne= ct=3D, mcast=3D or udp=3D is required qemu-system-x86_64: -net socket: Device 'socket' could not be initializ= ed Convert net_init_socket() 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=3D, listen=3D, conne= ct=3D, mcast=3D or udp=3D is required At the same time, add many explicit error handling message when it fails. Cc: jasowang@redhat.com Cc: armbru@redhat.com Signed-off-by: Mao Zhongyi --- net/socket.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/net/socket.c b/net/socket.c index 9825422..a8f2d7f 100644 --- a/net/socket.c +++ b/net/socket.c @@ -510,7 +510,8 @@ static int net_socket_listen_init(NetClientState *peer, =20 fd =3D qemu_socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { - perror("socket"); + error_setg_errno(errp, errno, "Create socket(PF_INET," + " SOCK_STREAM) failed"); return -1; } qemu_set_nonblock(fd); @@ -519,13 +520,14 @@ static int net_socket_listen_init(NetClientState *pee= r, =20 ret =3D bind(fd, (struct sockaddr *)&saddr, sizeof(saddr)); if (ret < 0) { - perror("bind"); + error_setg_errno(errp, errno, "Bind ip=3D%s to fd=3D%d failed", + inet_ntoa(saddr.sin_addr), fd); closesocket(fd); return -1; } ret =3D listen(fd, 0); if (ret < 0) { - perror("listen"); + error_setg_errno(errp, errno, "Listen socket fd=3D%d failed", fd); closesocket(fd); return -1; } @@ -557,7 +559,8 @@ static int net_socket_connect_init(NetClientState *peer, =20 fd =3D qemu_socket(PF_INET, SOCK_STREAM, 0); if (fd < 0) { - perror("socket"); + error_setg_errno(errp, errno, "Create socket(PF_INET," + " SOCK_STREAM) failed"); return -1; } qemu_set_nonblock(fd); @@ -573,7 +576,7 @@ static int net_socket_connect_init(NetClientState *peer, errno =3D=3D EINVAL) { break; } else { - perror("connect"); + error_setg_errno(errp, errno, "Connection failed"); closesocket(fd); return -1; } @@ -607,8 +610,11 @@ static int net_socket_mcast_init(NetClientState *peer, return -1; =20 if (localaddr_str !=3D NULL) { - if (inet_aton(localaddr_str, &localaddr) =3D=3D 0) + if (inet_aton(localaddr_str, &localaddr) =3D=3D 0) { + error_setg(errp, "localaddr '%s' is not a valid IPv4 address", + localaddr_str); return -1; + } param_localaddr =3D &localaddr; } else { param_localaddr =3D NULL; @@ -652,18 +658,22 @@ static int net_socket_udp_init(NetClientState *peer, =20 fd =3D qemu_socket(PF_INET, SOCK_DGRAM, 0); if (fd < 0) { - perror("socket(PF_INET, SOCK_DGRAM)"); + error_setg_errno(errp, errno, "Create socket(PF_INET," + " SOCK_DGRAM) failed"); return -1; } =20 ret =3D socket_set_fast_reuse(fd); if (ret < 0) { + error_setg_errno(errp, errno, "Set the socket fd=3D%d attribute" + " SO_REUSEADDR failed", fd); closesocket(fd); return -1; } ret =3D bind(fd, (struct sockaddr *)&laddr, sizeof(laddr)); if (ret < 0) { - perror("bind"); + error_setg_errno(errp, errno, "Bind ip=3D%s to fd=3D%d failed", + inet_ntoa(laddr.sin_addr), fd); closesocket(fd); return -1; } @@ -685,8 +695,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 =3D NULL; const NetdevSocketOptions *sock; =20 assert(netdev->type =3D=3D NET_CLIENT_DRIVER_SOCKET); @@ -694,22 +702,21 @@ int net_init_socket(const Netdev *netdev, const char = *name, =20 if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mc= ast + sock->has_udp !=3D 1) { - error_report("exactly one of fd=3D, listen=3D, connect=3D, mcast= =3D or udp=3D" + error_setg(errp, "exactly one of fd=3D, listen=3D, connect=3D, mca= st=3D or udp=3D" " is required"); return -1; } =20 if (sock->has_localaddr && !sock->has_mcast && !sock->has_udp) { - error_report("localaddr=3D is only valid with mcast=3D or udp=3D"); + error_setg(errp, "localaddr=3D is only valid with mcast=3D or udp= =3D"); return -1; } =20 if (sock->has_fd) { int fd; =20 - fd =3D monitor_fd_param(cur_mon, sock->fd, &err); + fd =3D monitor_fd_param(cur_mon, sock->fd, errp); if (fd =3D=3D -1) { - error_report_err(err); return -1; } qemu_set_nonblock(fd); @@ -747,7 +754,7 @@ int net_init_socket(const Netdev *netdev, const char *n= ame, =20 assert(sock->has_udp); if (!sock->has_localaddr) { - error_report("localaddr=3D is mandatory with udp=3D"); + error_setg(errp, "localaddr=3D is mandatory with udp=3D"); return -1; } if (net_socket_udp_init(peer, "socket", name, sock->udp, sock->localad= dr, --=20 2.9.3