From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZCaw-0006YR-Bu for qemu-devel@nongnu.org; Fri, 26 Feb 2016 02:13:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZCas-00013z-BP for qemu-devel@nongnu.org; Fri, 26 Feb 2016 02:13:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZCas-00013s-6Y for qemu-devel@nongnu.org; Fri, 26 Feb 2016 02:13:42 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id E8145C0003F5 for ; Fri, 26 Feb 2016 07:13:41 +0000 (UTC) References: <1456441557-1096-1-git-send-email-pbonzini@redhat.com> From: Jason Wang Message-ID: <56CFFB1A.8060006@redhat.com> Date: Fri, 26 Feb 2016 15:13:30 +0800 MIME-Version: 1.0 In-Reply-To: <1456441557-1096-1-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] net: simplify net_init_tap_one logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org On 02/26/2016 07:05 AM, Paolo Bonzini wrote: > net_init_tap_one receives in vhostfdname a fd name from vhostfd= or > vhostfds=, or NULL if there is no vhostfd=/vhostfds=. It is simpler > to just check vhostfdname, than it is to check for vhostfd= or > vhostfds=. This also calms down Coverity, which otherwise thinks > that monitor_fd_param could dereference a NULL vhostfdname. > > Signed-off-by: Paolo Bonzini > --- > net/tap.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/tap.c b/net/tap.c > index cfb6831..cd7a7fc 100644 > --- a/net/tap.c > +++ b/net/tap.c > @@ -662,7 +662,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, > options.backend_type = VHOST_BACKEND_TYPE_KERNEL; > options.net_backend = &s->nc; > > - if (tap->has_vhostfd || tap->has_vhostfds) { > + if (vhostfdname) { > vhostfd = monitor_fd_param(cur_mon, vhostfdname, &err); > if (vhostfd == -1) { > error_propagate(errp, err); > @@ -684,7 +684,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer, > "vhost-net requested but could not be initialized"); > return; > } > - } else if (tap->has_vhostfd || tap->has_vhostfds) { > + } else if (vhostfdname) { > error_setg(errp, "vhostfd= is not valid without vhost"); > } > } Applied to -net. Thanks