@@ -78,7 +78,7 @@ static void lm32_evr_init(MachineState *machine)
78
78
DriveInfo * dinfo ;
79
79
MemoryRegion * address_space_mem = get_system_memory ();
80
80
MemoryRegion * phys_ram = g_new (MemoryRegion , 1 );
81
- qemu_irq * cpu_irq , irq [32 ];
81
+ qemu_irq irq [32 ];
82
82
ResetInfo * reset_info ;
83
83
int i ;
84
84
@@ -123,8 +123,7 @@ static void lm32_evr_init(MachineState *machine)
123
123
1 , 2 , 0x01 , 0x7e , 0x43 , 0x00 , 0x555 , 0x2aa , 1 );
124
124
125
125
/* create irq lines */
126
- cpu_irq = qemu_allocate_irqs (cpu_irq_handler , cpu , 1 );
127
- env -> pic_state = lm32_pic_init (* cpu_irq );
126
+ env -> pic_state = lm32_pic_init (qemu_allocate_irq (cpu_irq_handler , cpu , 0 ));
128
127
for (i = 0 ; i < 32 ; i ++ ) {
129
128
irq [i ] = qdev_get_gpio_in (env -> pic_state , i );
130
129
}
@@ -173,7 +172,7 @@ static void lm32_uclinux_init(MachineState *machine)
173
172
DriveInfo * dinfo ;
174
173
MemoryRegion * address_space_mem = get_system_memory ();
175
174
MemoryRegion * phys_ram = g_new (MemoryRegion , 1 );
176
- qemu_irq * cpu_irq , irq [32 ];
175
+ qemu_irq irq [32 ];
177
176
HWSetup * hw ;
178
177
ResetInfo * reset_info ;
179
178
int i ;
@@ -225,8 +224,7 @@ static void lm32_uclinux_init(MachineState *machine)
225
224
1 , 2 , 0x01 , 0x7e , 0x43 , 0x00 , 0x555 , 0x2aa , 1 );
226
225
227
226
/* create irq lines */
228
- cpu_irq = qemu_allocate_irqs (cpu_irq_handler , env , 1 );
229
- env -> pic_state = lm32_pic_init (* cpu_irq );
227
+ env -> pic_state = lm32_pic_init (qemu_allocate_irq (cpu_irq_handler , env , 0 ));
230
228
for (i = 0 ; i < 32 ; i ++ ) {
231
229
irq [i ] = qdev_get_gpio_in (env -> pic_state , i );
232
230
}
0 commit comments