From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUiMt-0003Eh-Ed for qemu-devel@nongnu.org; Wed, 16 May 2012 13:50:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUiMn-0002zH-5G for qemu-devel@nongnu.org; Wed, 16 May 2012 13:50:35 -0400 Received: from smtp.citrix.com ([66.165.176.89]:34129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUiMm-0002yV-W9 for qemu-devel@nongnu.org; Wed, 16 May 2012 13:50:29 -0400 From: Anthony PERARD Date: Wed, 16 May 2012 18:50:10 +0100 Message-ID: <1337190610-2149-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 1.1 V2] xen: Fix PV-on-HVM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Cc: Anthony PERARD , Stefano Stabellini , Xen Devel In the context of PV-on-HVM under Xen, the emulated nics are supposed to be unplug before the guest drivers are initialized, when the guest write to a specific IO port. Without this patch, the guest end up with two nics with the same MAC, the emulated nic and the PV nic. Signed-off-by: Anthony PERARD --- hw/xen_platform.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/xen_platform.c b/hw/xen_platform.c index a9c52a6..0214f37 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -87,7 +87,10 @@ static void unplug_nic(PCIBus *b, PCIDevice *d) { if (pci_get_word(d->config + PCI_CLASS_DEVICE) == PCI_CLASS_NETWORK_ETHERNET) { - qdev_unplug(&(d->qdev), NULL); + /* Until qdev_free includes a call to object_unparent, we call it here + */ + object_unparent(&d->qdev.parent_obj); + qdev_free(&d->qdev); } } -- Anthony PERARD