From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YPuBq-0004Dc-G9 for qemu-devel@nongnu.org; Mon, 23 Feb 2015 09:40:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YPuBk-0007gm-4r for qemu-devel@nongnu.org; Mon, 23 Feb 2015 09:40:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YPuBj-0007gi-S7 for qemu-devel@nongnu.org; Mon, 23 Feb 2015 09:40:48 -0500 From: Stefan Hajnoczi Date: Mon, 23 Feb 2015 14:40:31 +0000 Message-Id: <1424702441-5166-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1424702441-5166-1-git-send-email-stefanha@redhat.com> References: <1424702441-5166-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 01/11] net: synchronize net_host_device_remove with host_net_remove_completion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Paolo Bonzini From: Paolo Bonzini 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 Reviewed-by: Jason Wang Message-id: 1419353600-30519-2-git-send-email-pbonzini@redhat.com Signed-off-by: Stefan Hajnoczi --- net/net.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/net.c b/net/net.c index 74e651e..e3ce215 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; } -- 2.1.0