From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzeQC-0006r7-Re for qemu-devel@nongnu.org; Wed, 04 Oct 2017 03:48:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzeQ9-0002oR-PU for qemu-devel@nongnu.org; Wed, 04 Oct 2017 03:48:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49766) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dzeQ9-0002nw-JI for qemu-devel@nongnu.org; Wed, 04 Oct 2017 03:48:45 -0400 Date: Wed, 4 Oct 2017 09:48:39 +0200 From: Jens Freimann Message-ID: <20171004074839.5be4pq347yray2b3@localhost.localdomain> References: <20170927152118.13328-1-jfreimann@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20170927152118.13328-1-jfreimann@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3] net: fix check for number of parameters to -netdev socket List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, maozy.fnst@cn.fujitsu.com ping On Wed, Sep 27, 2017 at 03:21:18PM +0000, Jens Freimann wrote: >Since commit 0f8c289ad "net: fix -netdev socket,fd= 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. > >Fix this by reverting the change of the if condition done in 0f8c289ad. > >Cc: Jason Wang >Fixes: 0f8c289ad539feb5135c545bea947b310a893f4b >Reported-by: Mao Zhongyi >Signed-off-by: Jens Freimann > >--- >v2->v3: >- go back to the original check != 1. No need for more than one > argument, putting sock->has_fd back into the calculation is enough > >v1->v2: >- add check to prevent listen= and connect= being used at the same time > > net/socket.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/net/socket.c b/net/socket.c >index e6b471c63d..83a2a31025 100644 >--- a/net/socket.c >+++ b/net/socket.c >@@ -695,8 +695,8 @@ int net_init_socket(const Netdev *netdev, const char *name, > assert(netdev->type == NET_CLIENT_DRIVER_SOCKET); > sock = &netdev->u.socket; > >- if (sock->has_listen + sock->has_connect + sock->has_mcast + >- sock->has_udp > 1) { >+ if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast + >+ sock->has_udp != 1) { > error_setg(errp, "exactly one of listen=, connect=, mcast= or udp=" > " is required"); > return -1; >-- >2.13.5 > >