diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-10 15:15:54 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-10 15:15:54 +0000 |
| commit | aaed909a495e78364abc6812df672d2e764961a8 (patch) | |
| tree | 704ab4280f250fa310bee6a3d0ba94e5417daef3 /hw/mips_r4k.c | |
| parent | 7d77bf200682ed8cbd0c94bdfbac64dc4b23b149 (diff) | |
| download | qemu-aaed909a495e78364abc6812df672d2e764961a8.zip qemu-aaed909a495e78364abc6812df672d2e764961a8.tar.gz qemu-aaed909a495e78364abc6812df672d2e764961a8.tar.bz2 | |
added cpu_model parameter to cpu_init()
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3562 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/mips_r4k.c')
| -rw-r--r-- | hw/mips_r4k.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index e4817e6..5a8bf6c 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -135,7 +135,6 @@ static void main_cpu_reset(void *opaque) { CPUState *env = opaque; cpu_reset(env); - cpu_mips_register(env, NULL); if (loaderparams.kernel_filename) load_kernel (env); @@ -164,10 +163,11 @@ void mips_r4k_init (int ram_size, int vga_ram_size, const char *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); |