diff options
| -rw-r--r-- | hw/sun4m.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c index ad1efb1ebc..85fd632caf 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -756,8 +756,8 @@ static void ram_register_devices(void) device_init(ram_register_devices); -static CPUState *cpu_devinit(const char *cpu_model, unsigned int id, - uint64_t prom_addr, qemu_irq **cpu_irqs) +static void cpu_devinit(const char *cpu_model, unsigned int id, + uint64_t prom_addr, qemu_irq **cpu_irqs) { CPUState *env; @@ -776,8 +776,6 @@ static CPUState *cpu_devinit(const char *cpu_model, unsigned int id, } *cpu_irqs = qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS); env->prom_addr = prom_addr; - - return env; } static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, @@ -786,7 +784,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - CPUState *envs[MAX_CPUS]; unsigned int i; void *iommu, *espdma, *ledma, *nvram; qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS], @@ -803,7 +800,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, cpu_model = hwdef->default_cpu_model; for(i = 0; i < smp_cpus; i++) { - envs[i] = cpu_devinit(cpu_model, i, hwdef->slavio_base, &cpu_irqs[i]); + cpu_devinit(cpu_model, i, hwdef->slavio_base, &cpu_irqs[i]); } for (i = smp_cpus; i < MAX_CPUS; i++) @@ -1408,7 +1405,6 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - CPUState *envs[MAX_CPUS]; unsigned int i; void *iounits[MAX_IOUNITS], *espdma, *ledma, *nvram; qemu_irq *cpu_irqs[MAX_CPUS], sbi_irq[32], sbi_cpu_irq[MAX_CPUS], @@ -1423,7 +1419,7 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size, cpu_model = hwdef->default_cpu_model; for(i = 0; i < smp_cpus; i++) { - envs[i] = cpu_devinit(cpu_model, i, hwdef->slavio_base, &cpu_irqs[i]); + cpu_devinit(cpu_model, i, hwdef->slavio_base, &cpu_irqs[i]); } for (i = smp_cpus; i < MAX_CPUS; i++) @@ -1600,7 +1596,6 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - CPUState *env; void *iommu, *espdma, *ledma, *nvram; qemu_irq *cpu_irqs, slavio_irq[8], espdma_irq, ledma_irq; qemu_irq esp_reset; @@ -1615,7 +1610,7 @@ static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size, if (!cpu_model) cpu_model = hwdef->default_cpu_model; - env = cpu_devinit(cpu_model, 0, hwdef->slavio_base, &cpu_irqs); + cpu_devinit(cpu_model, 0, hwdef->slavio_base, &cpu_irqs); /* set up devices */ ram_init(0, RAM_size, hwdef->max_mem); |