Revision f9d1465f
| b/hw/sun4u.c | ||
|---|---|---|
| 752 | 752 |
.class_init = ram_class_init, |
| 753 | 753 |
}; |
| 754 | 754 |
|
| 755 |
static CPUSPARCState *cpu_devinit(const char *cpu_model, const struct hwdef *hwdef)
|
|
| 755 |
static SPARCCPU *cpu_devinit(const char *cpu_model, const struct hwdef *hwdef)
|
|
| 756 | 756 |
{
|
| 757 | 757 |
SPARCCPU *cpu; |
| 758 | 758 |
CPUSPARCState *env; |
| ... | ... | |
| 786 | 786 |
reset_info->prom_addr = hwdef->prom_addr; |
| 787 | 787 |
qemu_register_reset(main_cpu_reset, reset_info); |
| 788 | 788 |
|
| 789 |
return env;
|
|
| 789 |
return cpu;
|
|
| 790 | 790 |
} |
| 791 | 791 |
|
| 792 | 792 |
static void sun4uv_init(MemoryRegion *address_space_mem, |
| ... | ... | |
| 796 | 796 |
const char *initrd_filename, const char *cpu_model, |
| 797 | 797 |
const struct hwdef *hwdef) |
| 798 | 798 |
{
|
| 799 |
SPARCCPU *cpu; |
|
| 799 | 800 |
CPUSPARCState *env; |
| 800 | 801 |
M48t59State *nvram; |
| 801 | 802 |
unsigned int i; |
| ... | ... | |
| 808 | 809 |
void *fw_cfg; |
| 809 | 810 |
|
| 810 | 811 |
/* init CPUs */ |
| 811 |
env = cpu_devinit(cpu_model, hwdef); |
|
| 812 |
cpu = cpu_devinit(cpu_model, hwdef); |
|
| 813 |
env = &cpu->env; |
|
| 812 | 814 |
|
| 813 | 815 |
/* set up devices */ |
| 814 | 816 |
ram_init(0, RAM_size); |
Also available in: Unified diff