diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-07-15 18:42:05 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-09-08 18:05:21 +0400 |
| commit | d80fe99de48b39dbb5f9f8d1d958b87a9bfeb853 (patch) | |
| tree | 875cb344ebbb410412a29f2385179d17b47d3328 /hw | |
| parent | e305a16510afa74eec20390479e349402e55ef4c (diff) | |
| download | qemu-d80fe99de48b39dbb5f9f8d1d958b87a9bfeb853.zip qemu-d80fe99de48b39dbb5f9f8d1d958b87a9bfeb853.tar.gz qemu-d80fe99de48b39dbb5f9f8d1d958b87a9bfeb853.tar.bz2 | |
pc: simplify passing qemu_irq
qemu_irq is already a pointer, no need to have an extra pointer level.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc.c | 8 | ||||
| -rw-r--r-- | hw/input/pckbd.c | 4 |
2 files changed, 6 insertions, 6 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 = { |