[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 01/11] net: synchronize net_host_device_remove wit
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v4 01/11] net: synchronize net_host_device_remove with host_net_remove_completion |
Date: |
Thu, 12 Mar 2015 14:33:18 +0000 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
net/net.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/net.c b/net/net.c
index 11fb769..0be084d 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]);
@@ -991,7 +991,7 @@ void hmp_host_net_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
- [Qemu-devel] [PULL v4 00/11] Net patches, Stefan Hajnoczi, 2015/03/12
- [Qemu-devel] [PULL v4 01/11] net: synchronize net_host_device_remove with host_net_remove_completion,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v4 03/11] net: add MAC address string printer, Stefan Hajnoczi, 2015/03/12
- [Qemu-devel] [PULL v4 02/11] tests: rtl8139: test timers and interrupt, Stefan Hajnoczi, 2015/03/12
- [Qemu-devel] [PULL v4 04/11] virtio-net: use qemu_mac_strdup_printf, Stefan Hajnoczi, 2015/03/12
- [Qemu-devel] [PULL v4 07/11] pci: add network device class 'other' for network switches, Stefan Hajnoczi, 2015/03/12
- [Qemu-devel] [PULL v4 05/11] rocker: add register programming guide, Stefan Hajnoczi, 2015/03/12
- [Qemu-devel] [PULL v4 06/11] pci: add rocker device ID, Stefan Hajnoczi, 2015/03/12
- [Qemu-devel] [PULL v4 09/11] rocker: add tests, Stefan Hajnoczi, 2015/03/12
- [Qemu-devel] [PULL v4 11/11] rocker: timestamp on the debug logs helps correlate with events in the VM, Stefan Hajnoczi, 2015/03/12
- [Qemu-devel] [PULL v4 10/11] MAINTAINERS: add rocker, Stefan Hajnoczi, 2015/03/12
- [Qemu-devel] [PULL v4 08/11] rocker: add new rocker switch device, Stefan Hajnoczi, 2015/03/12