[Qemu-devel] [PATCH 06/14] Split VGA ioport init into a helper function.

[Zachary Amsden]

Signed-off-by: Zachary Amsden <address@hidden>
---
 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