From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MswIb-0004jU-41 for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MswIK-0004WI-9G for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:29 -0400 Received: from [199.232.76.173] (port=43875 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MswIK-0004W0-5z for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:24 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:55875) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MswIJ-0005q9-1K for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:20:23 -0400 From: Isaku Yamahata Date: Wed, 30 Sep 2009 19:17:51 +0900 Message-Id: <1254305917-14784-16-git-send-email-yamahata@valinux.co.jp> In-Reply-To: <1254305917-14784-1-git-send-email-yamahata@valinux.co.jp> References: <1254305917-14784-1-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] [PATCH 15/61] pc: split out vga initialization from pc_init1() into pc_vga_init(). List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, anthony@codemonkey.ws Cc: yamahata@valinux.co.jp 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 b987b34..5c461a6 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1287,6 +1287,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, @@ -1342,24 +1364,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); cmos_set_s3_resume_init(rtc_state); -- 1.6.0.2