From patchwork Thu Jun 13 09:50:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 251023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 114A22C0079 for ; Thu, 13 Jun 2013 19:52:01 +1000 (EST) Received: from localhost ([::1]:43842 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un4CD-0006WO-Bb for incoming@patchwork.ozlabs.org; Thu, 13 Jun 2013 05:51:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un4Bu-0006TT-9a for qemu-devel@nongnu.org; Thu, 13 Jun 2013 05:51:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Un4Bp-0003RW-Dc for qemu-devel@nongnu.org; Thu, 13 Jun 2013 05:51:38 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:53896) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un4Bp-0003RH-8m for qemu-devel@nongnu.org; Thu, 13 Jun 2013 05:51:33 -0400 X-IronPort-AV: E=Sophos;i="4.87,857,1363132800"; d="scan'208";a="29433141" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/AES128-SHA; 13 Jun 2013 09:51:31 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Thu, 13 Jun 2013 05:51:30 -0400 Received: from york.uk.xensource.com ([10.80.228.45] helo=york.uk.xensource.com.) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Un4Bm-0002NC-JW; Thu, 13 Jun 2013 10:51:30 +0100 From: Paul Durrant To: , Date: Thu, 13 Jun 2013 10:50:54 +0100 Message-ID: <1371117054-5694-1-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 1.7.10.4 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: Paul Durrant Subject: [Qemu-devel] [PATCH] Remove hardcoded xen-platform device initialization 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 The xen-platform device should be initialized by the Xen toolstack by passing the appropriate -device argument on the command line. Signed-off-by: Paul Durrant --- hw/i386/pc_piix.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d618570..e25012d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -174,9 +174,6 @@ static void pc_init1(MemoryRegion *system_memory, pc_register_ferr_irq(gsi[13]); pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL); - if (xen_enabled()) { - pci_create_simple(pci_bus, -1, "xen-platform"); - } /* init basic PC hardware */ pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled());