From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGm8q-0002O6-38 for qemu-devel@nongnu.org; Thu, 29 Jan 2015 05:16:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGm8l-0008Iw-Cn for qemu-devel@nongnu.org; Thu, 29 Jan 2015 05:16:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50938) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGm8l-0008Ig-5h for qemu-devel@nongnu.org; Thu, 29 Jan 2015 05:15:59 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0TAFw1W023554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 29 Jan 2015 05:15:58 -0500 Message-ID: <54CA0859.8050302@redhat.com> Date: Thu, 29 Jan 2015 18:15:53 +0800 From: Jason Wang MIME-Version: 1.0 References: <1419353600-30519-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1419353600-30519-2-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] net: synchronize net_host_device_remove with host_net_remove_completion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: stefanha@redhat.com On 12/24/2014 12:53 AM, Paolo Bonzini wrote: > Using net_host_check_device is unnecessary. qemu_del_net_client asserts > for the non-peer case that it can only process NIC type NetClientStates, > and that assertion is valid for the peered case as well, so move it and > use the same check in net_host_device_remove. host_net_remove_completion > is already checking the type. > > Signed-off-by: Paolo Bonzini > --- > net/net.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/net.c b/net/net.c > index 7acc162..1da612f 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -324,6 +324,8 @@ void qemu_del_net_client(NetClientState *nc) > NetClientState *ncs[MAX_QUEUE_NUM]; > int queues, i; > > + assert(nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC); > + > /* If the NetClientState belongs to a multiqueue backend, we will change all > * other NetClientStates also. > */ > @@ -355,8 +357,6 @@ void qemu_del_net_client(NetClientState *nc) > return; > } > > - assert(nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC); > - > for (i = 0; i < queues; i++) { > qemu_cleanup_net_client(ncs[i]); > qemu_free_net_client(ncs[i]); > @@ -992,7 +992,7 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict) > device, vlan_id); > return; > } > - if (!net_host_check_device(nc->model)) { > + if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) { > error_report("invalid host network device '%s'", device); > return; > } Reviewed-by: Jason Wang