Fill in WLAN and BT platform data in CAL area as expected by Maemo.

[qemu.git] / hw / mips_r4k.c

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index dd32b2317933090440d886ca0f6e79b4c1efe1b4..a9d42eadcb7c27b97fb99e51646789cf1b453ff8 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -87,7 +87,7 @@ static void load_kernel (CPUState *env)
     if (kernel_size >= 0) {
         if ((entry & ~0x7fffffffULL) == 0x80000000)
             entry = (int32_t)entry;
-        env->PC[env->current_tc] = entry;
+        env->active_tc.PC = entry;
     } else {
         fprintf(stderr, "qemu: could not load kernel '%s'\n",
                 loaderparams.kernel_filename);
@@ -175,7 +175,6 @@ void mips_r4k_init (ram_addr_t 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 */
@@ -241,7 +240,8 @@ void mips_r4k_init (ram_addr_t ram_size, int vga_ram_size,
 
     for(i = 0; i < MAX_SERIAL_PORTS; i++) {
         if (serial_hds[i]) {
-            serial_init(serial_io[i], i8259[serial_irq[i]], serial_hds[i]);
+            serial_init(serial_io[i], i8259[serial_irq[i]], 115200,
+                        serial_hds[i]);
         }
     }
 
@@ -286,4 +286,5 @@ QEMUMachine mips_machine = {
     "mips",
     "mips r4k platform",
     mips_r4k_init,
+    VGA_RAM_SIZE + BIOS_SIZE,
 };