ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sun4u: Pass SPARCCPU to cpu_set_ivec_irq() 

Needed for moving halted field to CPUState.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Andreas Färber 2012-10-12 04:23:08 +02:00 committed by Blue Swirl
parent ce18c558f0
commit b64ba4b232
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/sun4u.c
View File

@ -321,7 +321,8 @@ static void cpu_kick_irq(SPARCCPU *cpu)
static void cpu_set_ivec_irq(void *opaque, int irq, int level) static void cpu_set_ivec_irq(void *opaque, int irq, int level)
{ {
CPUSPARCState *env = opaque; SPARCCPU *cpu = opaque;
CPUSPARCState *env = &cpu->env;
if (level) { if (level) {
if (!(env->ivec_status & 0x20)) { if (!(env->ivec_status & 0x20)) {
@ -802,7 +803,6 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
const struct hwdef *hwdef) const struct hwdef *hwdef)
{ {
SPARCCPU *cpu; SPARCCPU *cpu;
CPUSPARCState *env;
M48t59State *nvram; M48t59State *nvram;
unsigned int i; unsigned int i;
uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_entry; uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_entry;
@ -815,14 +815,13 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
/* init CPUs */ /* init CPUs */
cpu = cpu_devinit(cpu_model, hwdef); cpu = cpu_devinit(cpu_model, hwdef);
env = &cpu->env;
/* set up devices */ /* set up devices */
ram_init(0, RAM_size); ram_init(0, RAM_size);
prom_init(hwdef->prom_addr, bios_name); prom_init(hwdef->prom_addr, bios_name);
ivec_irqs = qemu_allocate_irqs(cpu_set_ivec_irq, env, IVEC_MAX); ivec_irqs = qemu_allocate_irqs(cpu_set_ivec_irq, cpu, IVEC_MAX);
pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &pci_bus2, pci_bus = pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, &pci_bus2,
&pci_bus3, &pbm_irqs); &pci_bus3, &pbm_irqs);
pci_vga_init(pci_bus); pci_vga_init(pci_bus);