From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi09b-00013i-Kg for qemu-devel@nongnu.org; Thu, 08 Sep 2016 10:18:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bi09X-0000af-Fj for qemu-devel@nongnu.org; Thu, 08 Sep 2016 10:18:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41734) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi09X-0000aY-7q for qemu-devel@nongnu.org; Thu, 08 Sep 2016 10:18:07 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 8 Sep 2016 18:17:07 +0400 Message-Id: <20160908141720.30641-13-marcandre.lureau@redhat.com> In-Reply-To: <20160908141720.30641-1-marcandre.lureau@redhat.com> References: <20160908141720.30641-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULLv2 12/25] pc: simplify passing qemu_irq List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, eblake@redhat.com, armbru@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= qemu_irq is already a pointer, no need to have an extra pointer level. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake --- 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; } =20 -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_ou= t); + qdev_connect_gpio_out_named(DEVICE(dev), PORT92_A20_LINE, 0, a20_out= ); } =20 static const VMStateDescription vmstate_port92_isa =3D { @@ -1594,7 +1594,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq= *gsi, =20 a20_line =3D qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2= ); i8042 =3D 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 =3D 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 =3D isa_create_simple(isa_bus, "port92"); - port92_init(port92, &a20_line[1]); + port92_init(port92, a20_line[1]); =20 DMA_init(isa_bus, 0); =20 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); } =20 -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)= ; } =20 static const VMStateDescription vmstate_kbd_isa =3D { 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_i= rq, 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); =20 /* pc.c */ extern int fd_bootchk; --=20 2.10.0