From patchwork Tue Jan 5 06:27:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 42189 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0F7F0B6EF0 for ; Wed, 6 Jan 2010 08:19:26 +1100 (EST) Received: from localhost ([127.0.0.1]:56732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSGoE-0006QL-FD for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2010 16:19:22 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSFPv-0007Wq-GM for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:11 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSFPp-0007Se-Ov for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:10 -0500 Received: from [199.232.76.173] (port=40919 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSFPp-0007Sb-J6 for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:05 -0500 Received: from mx20.gnu.org ([199.232.41.8]:36255) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NSFPp-0003Ef-6M for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:50:05 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NS2ur-0003rm-Hq for qemu-devel@nongnu.org; Tue, 05 Jan 2010 01:29:18 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 924B418289; Tue, 5 Jan 2010 15:27:43 +0900 (JST) Received: (nullmailer pid 22674 invoked by uid 1000); Tue, 05 Jan 2010 06:27:50 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kraxel@redhat.com Date: Tue, 5 Jan 2010 15:27:38 +0900 Message-Id: <1262672870-22607-16-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1262672870-22607-1-git-send-email-yamahata@valinux.co.jp> References: <1262672870-22607-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V11 15/27] pc: split out vga initialization from pc_init1() into pc_vga_init(). X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Split out vga initialization which is independent of piix from pc_init1() as pc_vga_init(). Later it will be used. Signed-off-by: Isaku Yamahata --- hw/pc.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index e5bd712..386f730 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1120,6 +1120,28 @@ static void pc_memory_init(ram_addr_t ram_size, } } +static void pc_vga_init(PCIBus *pci_bus) +{ + if (cirrus_vga_enabled) { + if (pci_bus) { + pci_cirrus_vga_init(pci_bus); + } else { + isa_cirrus_vga_init(); + } + } else if (vmsvga_enabled) { + if (pci_bus) + pci_vmsvga_init(pci_bus); + else + fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__); + } else if (std_vga_enabled) { + if (pci_bus) { + pci_vga_init(pci_bus, 0, 0); + } else { + isa_vga_init(); + } + } +} + /* PC hardware initialisation */ static void pc_init1(ram_addr_t ram_size, const char *boot_device, @@ -1178,24 +1200,7 @@ static void pc_init1(ram_addr_t ram_size, register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL); - if (cirrus_vga_enabled) { - if (pci_enabled) { - pci_cirrus_vga_init(pci_bus); - } else { - isa_cirrus_vga_init(); - } - } else if (vmsvga_enabled) { - if (pci_enabled) - pci_vmsvga_init(pci_bus); - else - fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__); - } else if (std_vga_enabled) { - if (pci_enabled) { - pci_vga_init(pci_bus, 0, 0); - } else { - isa_vga_init(); - } - } + pc_vga_init(pci_enabled? pci_bus: NULL); rtc_state = rtc_init(2000);