[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv2 12/25] pc: simplify passing qemu_irq
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULLv2 12/25] pc: simplify passing qemu_irq |
Date: |
Thu, 8 Sep 2016 18:17:07 +0400 |
qemu_irq is already a pointer, no need to have an extra pointer level.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
hw/i386/pc.c | 8 ++++----
hw/input/pckbd.c | 4 ++--
include/hw/i386/pc.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 022dd1b..15966ce 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -530,9 +530,9 @@ static uint64_t port92_read(void *opaque, hwaddr addr,
return ret;
}
-static void port92_init(ISADevice *dev, qemu_irq *a20_out)
+static void port92_init(ISADevice *dev, qemu_irq a20_out)
{
- qdev_connect_gpio_out_named(DEVICE(dev), PORT92_A20_LINE, 0, *a20_out);
+ qdev_connect_gpio_out_named(DEVICE(dev), PORT92_A20_LINE, 0, a20_out);
}
static const VMStateDescription vmstate_port92_isa = {
@@ -1594,7 +1594,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
i8042 = isa_create_simple(isa_bus, "i8042");
- i8042_setup_a20_line(i8042, &a20_line[0]);
+ i8042_setup_a20_line(i8042, a20_line[0]);
if (!no_vmport) {
vmport_init(isa_bus);
vmmouse = isa_try_create(isa_bus, "vmmouse");
@@ -1607,7 +1607,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
qdev_init_nofail(dev);
}
port92 = isa_create_simple(isa_bus, "port92");
- port92_init(port92, &a20_line[1]);
+ port92_init(port92, a20_line[1]);
DMA_init(isa_bus, 0);
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index dc57e2c..d414288 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -499,9 +499,9 @@ void i8042_isa_mouse_fake_event(void *opaque)
ps2_mouse_fake_event(s->mouse);
}
-void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out)
+void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out)
{
- qdev_connect_gpio_out_named(DEVICE(dev), I8042_A20_LINE, 0, *a20_out);
+ qdev_connect_gpio_out_named(DEVICE(dev), I8042_A20_LINE, 0, a20_out);
}
static const VMStateDescription vmstate_kbd_isa = {
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 74c175c..330c1f2 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -220,7 +220,7 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
MemoryRegion *region, ram_addr_t size,
hwaddr mask);
void i8042_isa_mouse_fake_event(void *opaque);
-void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out);
+void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);
/* pc.c */
extern int fd_bootchk;
--
2.10.0
- [Qemu-devel] [PULLv2 02/25] glib-compat: add g_(s)list_free_full(), (continued)
- [Qemu-devel] [PULLv2 02/25] glib-compat: add g_(s)list_free_full(), Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 04/25] qga: free remaining leaking state, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 03/25] qga: free the whole blacklist, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 05/25] tests: fix test-cutils leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 07/25] tests: fix test-iov leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 08/25] tests: fix check-qom-interface leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 06/25] tests: fix test-vmstate leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 10/25] tests: fix leak in test-string-input-visitor, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 09/25] tests: fix check-qom-proplist leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 11/25] portio: keep references on portio, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 12/25] pc: simplify passing qemu_irq,
Marc-André Lureau <=
- [Qemu-devel] [PULLv2 13/25] pc: don't leak a20_line, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 14/25] machine: use class base init generated name, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 16/25] tests: fix qom-test leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 15/25] acpi-build: fix array leak, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 17/25] pc: free i8259, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 18/25] pc: keep gsi reference, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 20/25] ipmi: free extern timer, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 19/25] sd: free timer, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 22/25] tests: add qtest_add_data_func_full, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 23/25] tests: pc-cpu-test leaks fixes, Marc-André Lureau, 2016/09/08