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/sun4u.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/sun4u.c')
-rw-r--r-- | hw/sun4u.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -343,7 +343,6 @@ static void sun4u_init(int ram_size, int vga_ram_size, const char *boot_device, unsigned int i; long prom_offset, initrd_size, kernel_size; PCIBus *pci_bus; - const sparc_def_t *def; QEMUBH *bh; qemu_irq *irq; @@ -352,13 +351,11 @@ static void sun4u_init(int ram_size, int vga_ram_size, const char *boot_device, /* init CPUs */ if (cpu_model == NULL) cpu_model = "TI UltraSparc II"; - sparc_find_by_name(cpu_model, &def); - if (def == NULL) { + env = cpu_init(cpu_model); + if (!env) { fprintf(stderr, "Unable to find Sparc CPU definition\n"); exit(1); } - env = cpu_init(); - cpu_sparc_register(env, def, 0); bh = qemu_bh_new(tick_irq, env); env->tick = ptimer_init(bh); ptimer_set_period(env->tick, 1ULL); |