Skip to content

Commit d4ef00a

Browse files
Shannon ZhaoMichael Tokarev
authored andcommitted
hw/lm32/lm32_boards.c: Fix misusing qemu_allocate_irqs for single irq
Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
1 parent aaaee0b commit d4ef00a

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

hw/lm32/lm32_boards.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static void lm32_evr_init(MachineState *machine)
7878
DriveInfo *dinfo;
7979
MemoryRegion *address_space_mem = get_system_memory();
8080
MemoryRegion *phys_ram = g_new(MemoryRegion, 1);
81-
qemu_irq *cpu_irq, irq[32];
81+
qemu_irq irq[32];
8282
ResetInfo *reset_info;
8383
int i;
8484

@@ -123,8 +123,7 @@ static void lm32_evr_init(MachineState *machine)
123123
1, 2, 0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1);
124124

125125
/* 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));
128127
for (i = 0; i < 32; i++) {
129128
irq[i] = qdev_get_gpio_in(env->pic_state, i);
130129
}
@@ -173,7 +172,7 @@ static void lm32_uclinux_init(MachineState *machine)
173172
DriveInfo *dinfo;
174173
MemoryRegion *address_space_mem = get_system_memory();
175174
MemoryRegion *phys_ram = g_new(MemoryRegion, 1);
176-
qemu_irq *cpu_irq, irq[32];
175+
qemu_irq irq[32];
177176
HWSetup *hw;
178177
ResetInfo *reset_info;
179178
int i;
@@ -225,8 +224,7 @@ static void lm32_uclinux_init(MachineState *machine)
225224
1, 2, 0x01, 0x7e, 0x43, 0x00, 0x555, 0x2aa, 1);
226225

227226
/* 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));
230228
for (i = 0; i < 32; i++) {
231229
irq[i] = qdev_get_gpio_in(env->pic_state, i);
232230
}

0 commit comments

Comments
 (0)