From patchwork Tue Sep 11 19:10:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 183180 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 C50582C0092 for ; Wed, 12 Sep 2012 05:52:18 +1000 (EST) Received: from localhost ([::1]:54708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBWVM-0003Sx-TG for incoming@patchwork.ozlabs.org; Tue, 11 Sep 2012 15:52:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBWVB-0003Ki-7a for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:52:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TBWVA-0000ku-35 for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:52:05 -0400 Received: from hall.aurel32.net ([88.191.126.93]:42687) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBWV9-0000kj-Ro for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:52:04 -0400 Received: from [37.160.6.220] (helo=ohm.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TBWV8-0005ZT-Kq; Tue, 11 Sep 2012 21:52:03 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1TBVrB-0004tH-Dx; Tue, 11 Sep 2012 21:10:45 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Tue, 11 Sep 2012 21:10:37 +0200 Message-Id: <1347390642-17434-13-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1347390642-17434-1-git-send-email-aurelien@aurel32.net> References: <1347390642-17434-1-git-send-email-aurelien@aurel32.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 88.191.126.93 Cc: Aurelien Jarno Subject: [Qemu-devel] [PATCH v3 12/17] ppc/prep: use the new pci_vga_init() function 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 As a bonus it allows new vga card types (including none). Acked-by: Andreas Färber Signed-off-by: Aurelien Jarno --- hw/ppc_prep.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 1fa7609..1544430 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -39,7 +39,6 @@ #include "blockdev.h" #include "arch_init.h" #include "exec-memory.h" -#include "vga-pci.h" //#define HARD_DEBUG_PPC_IO //#define DEBUG_PPC_IO @@ -611,7 +610,7 @@ static void ppc_prep_init (ram_addr_t ram_size, memory_region_add_subregion(sysmem, 0x80000000, PPC_io_memory); /* init basic PC hardware */ - pci_std_vga_init(pci_bus); + pci_vga_init(pci_bus); if (serial_hds[0]) serial_isa_init(isa_bus, 0, serial_hds[0]);