From patchwork Sat Sep 8 11:26:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 182549 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 0F8882C0093 for ; Sat, 8 Sep 2012 22:24:44 +1000 (EST) Received: from localhost ([::1]:60301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJCc-0004rc-68 for incoming@patchwork.ozlabs.org; Sat, 08 Sep 2012 07:27:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBm-0003FE-8a for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:27:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAJBh-0000zD-C4 for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:27:01 -0400 Received: from hall.aurel32.net ([88.191.126.93]:57364) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAJBh-0000xJ-54 for qemu-devel@nongnu.org; Sat, 08 Sep 2012 07:26:57 -0400 Received: from [77.227.137.151] (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 1TAJBY-0007VB-Fr; Sat, 08 Sep 2012 13:26:48 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1TAJBS-0005RY-TJ; Sat, 08 Sep 2012 13:26:42 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Sat, 8 Sep 2012 13:26:22 +0200 Message-Id: <1347103584-20598-11-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1347103584-20598-1-git-send-email-aurelien@aurel32.net> References: <1347103584-20598-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: Blue Swirl , Aurelien Jarno Subject: [Qemu-devel] [PATCH 10/12] 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). Cc: Blue Swirl Signed-off-by: Aurelien Jarno Acked-by: Blue Swirl --- 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);