From patchwork Fri Sep 7 15:27:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 182412 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 6AC3B2C0086 for ; Sat, 8 Sep 2012 01:27:56 +1000 (EST) Received: from localhost ([::1]:43390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA0TK-0005Et-E8 for incoming@patchwork.ozlabs.org; Fri, 07 Sep 2012 11:27:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA0Su-0004Kh-Mq for qemu-devel@nongnu.org; Fri, 07 Sep 2012 11:27:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TA0Sl-0000LJ-9v for qemu-devel@nongnu.org; Fri, 07 Sep 2012 11:27:28 -0400 Received: from hall.aurel32.net ([88.191.126.93]:34379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TA0Sl-0000L8-3s for qemu-devel@nongnu.org; Fri, 07 Sep 2012 11:27:19 -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-0001iZ-GU; Fri, 07 Sep 2012 17:27:17 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1TA0Sh-0003HT-FH; Fri, 07 Sep 2012 17:27:15 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Fri, 7 Sep 2012 17:27:14 +0200 Message-Id: <1347031634-12526-3-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1347031634-12526-1-git-send-email-aurelien@aurel32.net> References: <1347031634-12526-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: Alexander Graf , Aurelien Jarno Subject: [Qemu-devel] [PATCH 3/3] mac99: 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 mac99 machine always add a video card, even when the "-vga none" is passed. Fix that by checking if it is enabled or not before instanciating it. Cc: Alexander Graf Signed-off-by: Aurelien Jarno --- hw/ppc_newworld.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index e95cfe8..6db8b3a 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -330,7 +330,9 @@ static void ppc_core99_init (ram_addr_t ram_size, machine_arch = ARCH_MAC99; } /* init basic PC hardware */ - pci_vga_init(pci_bus); + if (std_vga_enabled) { + pci_vga_init(pci_bus); + } escc_mem = escc_init(0, pic[0x25], pic[0x24], serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);