summaryrefslogtreecommitdiffstats
path: root/hw/i386/pc.c
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2019-12-13 11:50:59 +0100
committerPaolo Bonzini2019-12-17 19:33:51 +0100
commit1820b70eb3fd8acf25d22485a58d0def8ad72234 (patch)
tree9c7b42f2922120c41280f3dce484a55374c5bdb3 /hw/i386/pc.c
parenthw/i386/pc: Use TYPE_PORT92 instead of hardcoded string (diff)
downloadqemu-1820b70eb3fd8acf25d22485a58d0def8ad72234.tar.gz
qemu-1820b70eb3fd8acf25d22485a58d0def8ad72234.tar.xz
qemu-1820b70eb3fd8acf25d22485a58d0def8ad72234.zip
hw/i386/pc: Inline port92_init()
This one-line function is not very helpful, so remove it by inlining the call to qdev_connect_gpio_out_named(). Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/i386/pc.c')
-rw-r--r--hw/i386/pc.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 67fddcc8c9..e36053f2a7 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -710,11 +710,6 @@ static uint64_t port92_read(void *opaque, hwaddr addr,
return ret;
}
-static void port92_init(ISADevice *dev, qemu_irq a20_out)
-{
- qdev_connect_gpio_out_named(DEVICE(dev), PORT92_A20_LINE, 0, a20_out);
-}
-
static const VMStateDescription vmstate_port92_isa = {
.name = "port92",
.version_id = 1,
@@ -770,8 +765,8 @@ static void port92_class_initfn(ObjectClass *klass, void *data)
dc->vmsd = &vmstate_port92_isa;
/*
* Reason: unlike ordinary ISA devices, this one needs additional
- * wiring: its A20 output line needs to be wired up by
- * port92_init().
+ * wiring: its A20 output line needs to be wired up with
+ * qdev_connect_gpio_out_named().
*/
dc->user_creatable = false;
}
@@ -1282,7 +1277,8 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
i8042_setup_a20_line(i8042, a20_line[0]);
- port92_init(port92, a20_line[1]);
+ qdev_connect_gpio_out_named(DEVICE(port92),
+ PORT92_A20_LINE, 0, a20_line[1]);
g_free(a20_line);
}