From nobody Sat May 4 21:41:06 2024 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.zohomail.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 1506068259173109.36588007029127; Fri, 22 Sep 2017 01:17:39 -0700 (PDT) Received: from localhost ([::1]:57286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvJ9T-0007zO-BG for importer@patchew.org; Fri, 22 Sep 2017 04:17:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvIx0-0005xM-QJ for qemu-devel@nongnu.org; Fri, 22 Sep 2017 04:04:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvIww-0002nE-TA for qemu-devel@nongnu.org; Fri, 22 Sep 2017 04:04:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55016) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dvIww-0002ma-Nf for qemu-devel@nongnu.org; Fri, 22 Sep 2017 04:04:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AF39F806CB; Fri, 22 Sep 2017 08:04:37 +0000 (UTC) Received: from localhost (ovpn-116-249.ams2.redhat.com [10.36.116.249]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 44DF15C88B; Fri, 22 Sep 2017 08:04:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AF39F806CB Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jfreimann@redhat.com From: Jens Freimann To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 10:04:35 +0200 Message-Id: <20170922080435.27342-1-jfreimann@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 22 Sep 2017 08:04:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] net: fix check for number of parameters to -netdev socket 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, maozy.fnst@cn.fujitsu.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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since commit 0f8c289ad "net: fix -netdev socket,fd=3D for UDP sockets" we allow more than one parameter for -netdev socket. But now we run into an assert when no parameter at all is specified > qemu-system-x86_64 -netdev socket socket.c:729: net_init_socket: Assertion `sock->has_udp' failed. Change the check and error message to reflect that at least one of the options has to be specified. An example for when we need more than on is when we hand in a UDP socket. Then we have fd=3D and udp=3D as parameters. Cc: Jason Wang Fixes: 0f8c289ad539feb5135c545bea947b310a893f4b Reported-by: Mao Zhongyi Signed-off-by: Jens Freimann --- net/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/socket.c b/net/socket.c index e6b471c63d..0a987bcf4f 100644 --- a/net/socket.c +++ b/net/socket.c @@ -695,9 +695,9 @@ int net_init_socket(const Netdev *netdev, const char *n= ame, assert(netdev->type =3D=3D NET_CLIENT_DRIVER_SOCKET); sock =3D &netdev->u.socket; =20 - if (sock->has_listen + sock->has_connect + sock->has_mcast + - sock->has_udp > 1) { - error_setg(errp, "exactly one of listen=3D, connect=3D, mcast=3D o= r udp=3D" + if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mc= ast + + sock->has_udp =3D=3D 0) { + error_setg(errp, "at least one of fd=3D, listen=3D, connect=3D, mc= ast=3D or udp=3D" " is required"); return -1; } --=20 2.13.5