From patchwork Thu Dec 24 08:09:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 41751 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 CBF2BB7BFB for ; Thu, 24 Dec 2009 19:46:03 +1100 (EST) Received: from localhost ([127.0.0.1]:36102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NNjKb-0001DH-6k for incoming@patchwork.ozlabs.org; Thu, 24 Dec 2009 03:46:01 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NNilU-00027K-NP for qemu-devel@nongnu.org; Thu, 24 Dec 2009 03:09:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NNilN-00020t-1p for qemu-devel@nongnu.org; Thu, 24 Dec 2009 03:09:41 -0500 Received: from [199.232.76.173] (port=42929 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NNilH-0001xQ-0z for qemu-devel@nongnu.org; Thu, 24 Dec 2009 03:09:31 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:39730) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NNilF-0004Vh-2e for qemu-devel@nongnu.org; Thu, 24 Dec 2009 03:09:29 -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 13F56106ABE; Thu, 24 Dec 2009 17:09:23 +0900 (JST) Received: (nullmailer pid 22813 invoked by uid 1000); Thu, 24 Dec 2009 08:09:20 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kraxel@redhat.com Date: Thu, 24 Dec 2009 17:09:08 +0900 Message-Id: <1261642160-22754-16-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1261642160-22754-1-git-send-email-yamahata@valinux.co.jp> References: <1261642160-22754-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 monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V10 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 32e27dd..3774e0e 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1111,6 +1111,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, @@ -1169,24 +1191,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);