From patchwork Tue Sep 11 19:10:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 183182 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 588802C0078 for ; Wed, 12 Sep 2012 05:52:35 +1000 (EST) Received: from localhost ([::1]:56055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBWVd-0004B5-FY for incoming@patchwork.ozlabs.org; Tue, 11 Sep 2012 15:52:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBWUp-0002Nt-NI for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:51:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TBWUo-0000gq-2H for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:51:43 -0400 Received: from hall.aurel32.net ([88.191.126.93]:42683) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TBWUn-0000gZ-Qx for qemu-devel@nongnu.org; Tue, 11 Sep 2012 15:51:42 -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 1TBWUm-0005ZT-F5; Tue, 11 Sep 2012 21:51:40 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1TBVrB-0004tR-GF; Tue, 11 Sep 2012 21:10:45 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Tue, 11 Sep 2012 21:10:39 +0200 Message-Id: <1347390642-17434-15-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> 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 14/17] sun/sun4u: 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: Blue Swirl Signed-off-by: Aurelien Jarno --- hw/sun4u.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index cca090f..137a7c6 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -39,7 +39,6 @@ #include "elf.h" #include "blockdev.h" #include "exec-memory.h" -#include "vga-pci.h" //#define DEBUG_IRQ //#define DEBUG_EBUS @@ -821,7 +820,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, ivec_irqs = qemu_allocate_irqs(cpu_set_ivec_irq, env, IVEC_MAX); pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &pci_bus2, &pci_bus3, &pbm_irqs); - pci_std_vga_init(pci_bus); + pci_vga_init(pci_bus); // XXX Should be pci_bus3 isa_bus = pci_ebus_init(pci_bus, -1, pbm_irqs);