[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/30] hw/lm32/milkymist.c: Fix misusing qemu_allocat
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 21/30] hw/lm32/milkymist.c: Fix misusing qemu_allocate_irqs for single irq |
Date: |
Wed, 3 Jun 2015 16:08:41 +0300 |
From: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/lm32/milkymist.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index e0cec7d..e755f5b 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -86,7 +86,7 @@ milkymist_init(MachineState *machine)
DriveInfo *dinfo;
MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *phys_sdram = g_new(MemoryRegion, 1);
- qemu_irq irq[32], *cpu_irq;
+ qemu_irq irq[32];
int i;
char *bios_filename;
ResetInfo *reset_info;
@@ -130,8 +130,7 @@ milkymist_init(MachineState *machine)
2, 0x00, 0x89, 0x00, 0x1d, 1);
/* create irq lines */
- cpu_irq = qemu_allocate_irqs(cpu_irq_handler, cpu, 1);
- env->pic_state = lm32_pic_init(*cpu_irq);
+ env->pic_state = lm32_pic_init(qemu_allocate_irq(cpu_irq_handler, cpu, 0));
for (i = 0; i < 32; i++) {
irq[i] = qdev_get_gpio_in(env->pic_state, i);
}
--
2.1.4
- [Qemu-devel] [PULL 30/30] configure: postfix --extra-cflags to QEMU_CFLAGS, (continued)
- [Qemu-devel] [PULL 30/30] configure: postfix --extra-cflags to QEMU_CFLAGS, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 23/30] hw/alpha/typhoon.c: Fix misusing qemu_allocate_irqs for single irq, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 13/30] hw/intc/exynos4210_gic.c: Fix memory leak by adjusting order, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 16/30] hw/isa/i82378.c: Fix misusing qemu_allocate_irqs for single irq, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 19/30] hw/ppc/prep.c: Fix misusing qemu_allocate_irqs for single irq, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 14/30] hw/i386/pc: Fix misusing qemu_allocate_irqs for single irq, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 01/30] iscsi: Remove pointless runtime check of macro value, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 27/30] translate-all: delete prototype for non-existent function, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 12/30] hw/arm/omap_sx1.c: Fix memory leak spotted by valgrind, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 02/30] microblaze: cpu: Delete MMAP_SHIFT definition, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 21/30] hw/lm32/milkymist.c: Fix misusing qemu_allocate_irqs for single irq,
Michael Tokarev <=
- [Qemu-devel] [PULL 11/30] hw/ppc/e500.c: Fix memory leak, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 09/30] vl: fix memory leak spotted by valgrind, Michael Tokarev, 2015/06/03
- [Qemu-devel] [PULL 26/30] Add -incoming help text, Michael Tokarev, 2015/06/03
- Re: [Qemu-devel] [PULL 00/30] Trivial patches for 2015-06-03, Peter Maydell, 2015/06/04