From patchwork Fri Sep 7 15:27:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 182411 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 DE9152C008F for ; Sat, 8 Sep 2012 01:27:48 +1000 (EST) Received: from localhost ([::1]:42494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA0TC-0004kO-US for incoming@patchwork.ozlabs.org; Fri, 07 Sep 2012 11:27:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA0Sw-0004PQ-2M for qemu-devel@nongnu.org; Fri, 07 Sep 2012 11:27:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TA0So-0000Lm-BI for qemu-devel@nongnu.org; Fri, 07 Sep 2012 11:27:30 -0400 Received: from hall.aurel32.net ([88.191.126.93]:34381) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA0So-0000Lh-5A for qemu-devel@nongnu.org; Fri, 07 Sep 2012 11:27:22 -0400 Received: from [46.27.142.81] (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 1TA0Sj-0001iX-Fc; Fri, 07 Sep 2012 17:27:17 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1TA0Sh-0003HM-CG; Fri, 07 Sep 2012 17:27:15 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Fri, 7 Sep 2012 17:27:12 +0200 Message-Id: <1347031634-12526-1-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 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 1/3] sun4u: add a video card only when requested 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 sun4u machine always add a video card, even when "-vga none" is passed. Fix that by checking if it is enabled or not before instanciating it. Cc: Blue Swirl Signed-off-by: Aurelien Jarno --- hw/sun4u.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index 07cd042..c6bf6eb 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -821,7 +821,9 @@ 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_vga_init(pci_bus); + if (std_vga_enabled) { + pci_vga_init(pci_bus); + } // XXX Should be pci_bus3 isa_bus = pci_ebus_init(pci_bus, -1, pbm_irqs);