From 2ffcb18de0bc02ad8a836ec955584c02b70e0e24 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 11 Jun 2010 14:21:34 +0200 Subject: Make netdev_del delete the netdev even when it's in use To hot-unplug guest and host part of a network device, you do: device_del NIC-ID netdev_del NETDEV-ID For PCI devices, device_del merely tells ACPI to unplug the device. The device goes away for real only after the guest processed the ACPI unplug event. You have to wait until then (e.g. by polling info pci) before you can unplug the netdev. Not good. Fix by removing the "in use" check from do_netdev_del(). Deleting a netdev while it's in use is safe; packets simply get routed to the bit bucket. Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- net.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'net.c') diff --git a/net.c b/net.c index 4cb93ed5b..0703698ca 100644 --- a/net.c +++ b/net.c @@ -1221,10 +1221,6 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data) qerror_report(QERR_DEVICE_NOT_FOUND, id); return -1; } - if (vc->peer) { - qerror_report(QERR_DEVICE_IN_USE, id); - return -1; - } qemu_del_vlan_client(vc); qemu_opts_del(qemu_opts_find(&qemu_netdev_opts, id)); return 0; -- cgit v1.2.3