KVM: Coalesced MMIO support

[qemu.git] / hw / mips_jazz.c

diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index b377b20170e86346854ace0e0b972fabb92c4c7b..cdf21962047e65ef64f45c199a7506f940dcc387 100644 (file)
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -102,12 +102,12 @@ static void audio_init(qemu_irq *pic)
 }
 #endif
 
-void espdma_memory_read(void *opaque, uint8_t *buf, int len)
+static void espdma_memory_read(void *opaque, uint8_t *buf, int len)
 {
     printf("espdma_memory_read(buf %p, len %d) not implemented\n", buf, len);
 }
 
-void espdma_memory_write(void *opaque, uint8_t *buf, int len)
+static void espdma_memory_write(void *opaque, uint8_t *buf, int len)
 {
     printf("espdma_memory_write(buf %p, len %d) not implemented\n", buf, len);
 }
@@ -116,7 +116,7 @@ void espdma_memory_write(void *opaque, uint8_t *buf, int len)
 #define MAGNUM_BIOS_SIZE (BIOS_SIZE < MAGNUM_BIOS_SIZE_MAX ? BIOS_SIZE : MAGNUM_BIOS_SIZE_MAX)
 
 static
-void mips_jazz_init (int ram_size, int vga_ram_size,
+void mips_jazz_init (ram_addr_t ram_size, int vga_ram_size,
                      DisplayState *ds, const char *cpu_model,
                      enum jazz_model_e jazz_model)
 {
@@ -146,7 +146,6 @@ void mips_jazz_init (int ram_size, int vga_ram_size,
         fprintf(stderr, "Unable to find CPU definition\n");
         exit(1);
     }
-    register_savevm("cpu", 0, 3, cpu_save, cpu_load, env);
     qemu_register_reset(main_cpu_reset, env);
 
     /* allocate RAM */
@@ -234,9 +233,9 @@ void mips_jazz_init (int ram_size, int vga_ram_size,
 
     /* Serial ports */
     if (serial_hds[0])
-        serial_mm_init(0x80006000, 0, rc4030[8], serial_hds[0], 1);
+        serial_mm_init(0x80006000, 0, rc4030[8], 8000000/16, serial_hds[0], 1);
     if (serial_hds[1])
-        serial_mm_init(0x80007000, 0, rc4030[9], serial_hds[1], 1);
+        serial_mm_init(0x80007000, 0, rc4030[9], 8000000/16, serial_hds[1], 1);
 
     /* Parallel port */
     if (parallel_hds[0])
@@ -256,7 +255,7 @@ void mips_jazz_init (int ram_size, int vga_ram_size,
 }
 
 static
-void mips_magnum_init (int ram_size, int vga_ram_size,
+void mips_magnum_init (ram_addr_t ram_size, int vga_ram_size,
                        const char *boot_device, DisplayState *ds,
                        const char *kernel_filename, const char *kernel_cmdline,
                        const char *initrd_filename, const char *cpu_model)
@@ -265,7 +264,7 @@ void mips_magnum_init (int ram_size, int vga_ram_size,
 }
 
 static
-void mips_pica61_init (int ram_size, int vga_ram_size,
+void mips_pica61_init (ram_addr_t ram_size, int vga_ram_size,
                        const char *boot_device, DisplayState *ds,
                        const char *kernel_filename, const char *kernel_cmdline,
                        const char *initrd_filename, const char *cpu_model)
@@ -274,13 +273,17 @@ void mips_pica61_init (int ram_size, int vga_ram_size,
 }
 
 QEMUMachine mips_magnum_machine = {
-    "magnum",
-    "MIPS Magnum",
-    mips_magnum_init,
+    .name = "magnum",
+    .desc = "MIPS Magnum",
+    .init = mips_magnum_init,
+    .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
+    .nodisk_ok = 1,
 };
 
 QEMUMachine mips_pica61_machine = {
-    "pica61",
-    "Acer Pica 61",
-    mips_pica61_init,
+    .name = "pica61",
+    .desc = "Acer Pica 61",
+    .init = mips_pica61_init,
+    .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
+    .nodisk_ok = 1,
 };