[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 57/62] hw/i386/pc: Inline port92_init()
From: |
Paolo Bonzini |
Subject: |
[PULL 57/62] hw/i386/pc: Inline port92_init() |
Date: |
Mon, 16 Dec 2019 17:28:41 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
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é <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/i386/pc.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 8752840..963eff4 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -707,11 +707,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,
@@ -767,8 +762,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;
}
@@ -1279,7 +1274,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);
}
--
1.8.3.1
- [PULL 52/62] pc: stubify x86 iommu, (continued)
- [PULL 52/62] pc: stubify x86 iommu, Paolo Bonzini, 2019/12/16
- [PULL 53/62] hw/i386: De-duplicate gsi_handler() to remove kvm_pc_gsi_handler(), Paolo Bonzini, 2019/12/16
- [PULL 46/62] hw: replace hw/i386/pc.h with a header just for the i8259, Paolo Bonzini, 2019/12/16
- [PULL 49/62] hw/i386/pc: Convert DPRINTF() to trace events, Paolo Bonzini, 2019/12/16
- [PULL 51/62] acpi: move PC stubs out of stubs/, Paolo Bonzini, 2019/12/16
- [PULL 56/62] hw/i386/pc: Use TYPE_PORT92 instead of hardcoded string, Paolo Bonzini, 2019/12/16
- [PULL 54/62] hw/i386: Simplify ioapic_init_gsi(), Paolo Bonzini, 2019/12/16
- [PULL 55/62] hw/isa/isa-bus: cleanup irq functions, Paolo Bonzini, 2019/12/16
- [PULL 59/62] hyperv: Use auto rcu_read macros, Paolo Bonzini, 2019/12/16
- [PULL 62/62] colo: fix return without releasing RCU, Paolo Bonzini, 2019/12/16
- [PULL 57/62] hw/i386/pc: Inline port92_init(),
Paolo Bonzini <=
- [PULL 58/62] hw/i386/pc: Extract the port92 device, Paolo Bonzini, 2019/12/16
- [PULL 60/62] qsp: Use WITH_RCU_READ_LOCK_GUARD, Paolo Bonzini, 2019/12/16
- [PULL 61/62] memory: use RCU_READ_LOCK_GUARD, Paolo Bonzini, 2019/12/16
- Re: [PULL 00/62] Misc patches for 2019-12-16, Peter Maydell, 2019/12/17