From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWSjk-0005Da-Sf for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWSjg-0005Bg-8B for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:48 -0400 Received: from [199.232.76.173] (port=34912 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWSjf-0005BX-So for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:44 -0400 Received: from mx2.redhat.com ([66.187.237.31]:41339) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MWSjf-0008EI-E6 for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:43 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6UAJgOQ002781 for ; Thu, 30 Jul 2009 06:19:42 -0400 From: Zachary Amsden Date: Thu, 30 Jul 2009 00:15:04 -1000 Message-Id: <1248948912-7877-7-git-send-email-zamsden@redhat.com> In-Reply-To: <1248948912-7877-6-git-send-email-zamsden@redhat.com> References: <1248948912-7877-1-git-send-email-zamsden@redhat.com> <1248948912-7877-2-git-send-email-zamsden@redhat.com> <1248948912-7877-3-git-send-email-zamsden@redhat.com> <1248948912-7877-4-git-send-email-zamsden@redhat.com> <1248948912-7877-5-git-send-email-zamsden@redhat.com> <1248948912-7877-6-git-send-email-zamsden@redhat.com> Subject: [Qemu-devel] [PATCH 06/14] Split VGA ioport init into a helper function. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zamsden@redhat.com Signed-off-by: Zachary Amsden --- hw/vga.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index ca94a68..33645a0 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2301,14 +2301,8 @@ void vga_common_init(VGAState *s, int vga_ram_size) vga_reset(s); } -/* used by both ISA and PCI */ -void vga_init(VGAState *s) +static void vga_ioport_init(VGAState *s) { - int vga_io_memory; - - qemu_register_reset(vga_reset, 0, s); - register_savevm("vga", 0, 2, vga_save, vga_load, s); - register_ioport_write(0x3c0, 16, 1, vga_ioport_write, s); register_ioport_write(0x3b4, 2, 1, vga_ioport_write, s); @@ -2322,7 +2316,6 @@ void vga_init(VGAState *s) register_ioport_read(0x3d4, 2, 1, vga_ioport_read, s); register_ioport_read(0x3ba, 1, 1, vga_ioport_read, s); register_ioport_read(0x3da, 1, 1, vga_ioport_read, s); - s->bank_offset = 0; #ifdef CONFIG_BOCHS_VBE #if defined (TARGET_I386) @@ -2346,6 +2339,19 @@ void vga_init(VGAState *s) register_ioport_write(0x1d0, 1, 2, vbe_ioport_write_data, s); #endif #endif /* CONFIG_BOCHS_VBE */ +} + +/* used by both ISA and PCI */ +void vga_init(VGAState *s) +{ + int vga_io_memory; + + qemu_register_reset(vga_reset, 0, s); + register_savevm("vga", 0, 2, vga_save, vga_load, s); + + s->bank_offset = 0; + + vga_ioport_init(s); vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s); cpu_register_physical_memory(isa_mem_base + 0x000a0000, 0x20000, -- 1.6.2.5