From patchwork Tue May 15 15:26:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 159367 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0381AB6FC3 for ; Wed, 16 May 2012 01:31:47 +1000 (EST) Received: from localhost ([::1]:58369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJiy-0007So-QV for incoming@patchwork.ozlabs.org; Tue, 15 May 2012 11:31:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJi9-0006rB-7I for qemu-devel@nongnu.org; Tue, 15 May 2012 11:31:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUJhR-0006Qz-B0 for qemu-devel@nongnu.org; Tue, 15 May 2012 11:30:52 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:52999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJhR-0006Ha-1v for qemu-devel@nongnu.org; Tue, 15 May 2012 11:30:09 -0400 X-IronPort-AV: E=Sophos;i="4.75,595,1330923600"; d="scan'208";a="194910357" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 15 May 2012 11:27:12 -0400 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.213.0; Tue, 15 May 2012 11:27:11 -0400 Received: from [10.80.3.61] (helo=perard.uk.xensource.com) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1SUJeZ-00026H-H2; Tue, 15 May 2012 16:27:11 +0100 From: Anthony PERARD To: QEMU-devel Date: Tue, 15 May 2012 16:26:39 +0100 Message-ID: <1337095599-28836-5-git-send-email-anthony.perard@citrix.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1337095599-28836-1-git-send-email-anthony.perard@citrix.com> References: <1337095599-28836-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Cc: Anthony PERARD , Stefano Stabellini , "Michael S. Tsirkin" , Anthony Liguori , Xen Devel Subject: [Qemu-devel] [PATCH 4/4] xen: Fix PV-on-HVM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In the context of PV-on-HVM under Xen, the emulated nics are supposed to be unplug before the guest drivers are initialized. This mean that there must be unplug without the consent of the guest. 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 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen_platform.c b/hw/xen_platform.c index a9c52a6..2e47129 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -87,7 +87,7 @@ 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); + qdev_force_unplug(&(d->qdev), NULL); } }