added cpu_model parameter to cpu_init()

[qemu] / hw / mips_pica61.c

diff --git a/hw/mips_pica61.c b/hw/mips_pica61.c
index 17c7a0f..8e7ce6c 100644 (file)
--- a/hw/mips_pica61.c
+++ b/hw/mips_pica61.c
@@ -51,11 +51,10 @@ static void main_cpu_reset(void *opaque)
 {
     CPUState *env = opaque;
     cpu_reset(env);
-    cpu_mips_register(env, NULL);
 }
 
 static
-void mips_pica61_init (int ram_size, int vga_ram_size, int boot_device,
+void mips_pica61_init (int ram_size, int vga_ram_size, const char *boot_device,
                     DisplayState *ds, const char **fd_filename, int snapshot,
                     const char *kernel_filename, const char *kernel_cmdline,
                     const char *initrd_filename, const char *cpu_model)
@@ -78,10 +77,11 @@ void mips_pica61_init (int ram_size, int vga_ram_size, int boot_device,
         cpu_model = "24Kf";
 #endif
     }
-    if (mips_find_by_name(cpu_model, &def) != 0)
-        def = NULL;
-    env = cpu_init();
-    cpu_mips_register(env, def);
+    env = cpu_init(cpu_model);
+    if (!env) {
+        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);
 
@@ -94,7 +94,9 @@ void mips_pica61_init (int ram_size, int vga_ram_size, int boot_device,
 
     /* load a BIOS image */
     bios_offset = ram_size + vga_ram_size;
-    snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME);
+    if (bios_name == NULL)
+        bios_name = BIOS_FILENAME;
+    snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
     bios_size = load_image(buf, phys_ram_base + bios_offset);
     if ((bios_size <= 0) || (bios_size > BIOS_SIZE)) {
         /* fatal */
@@ -168,6 +170,9 @@ void mips_pica61_init (int ram_size, int vga_ram_size, int boot_device,
      * but let's do with what Qemu currenly emulates... */
     isa_vga_mm_init(ds, phys_ram_base + ram_size, ram_size, vga_ram_size,
                     0x40000000, 0x60000000, 0);
+
+    /* LED indicator */
+    jazz_led_init(ds, 0x8000f000);
 }
 
 QEMUMachine mips_pica61_machine = {