On 2021/12/18 21:04, Philippe Mathieu-Daudé wrote:
Since the named GPIO lines are a "public" interface to the device, we can directly call qdev_connect_gpio_out_named(), making it consistent with how the other A20 input source (port92) is wired. Suggested-by: Peter Maydell <peter.mayd...@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- include/hw/input/i8042.h | 1 - hw/i386/pc.c | 3 ++- hw/input/pckbd.c | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-)
Reviewed-by: Yanan Wang <wangyana...@huawei.com> Thanks, Yanan
diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h index 1d90432daef..1cd53b8d221 100644 --- a/include/hw/input/i8042.h +++ b/include/hw/input/i8042.h @@ -21,6 +21,5 @@ 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(ISAKBDState *isa); -void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);#endif /* HW_INPUT_I8042_H */diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a2ef40ecbc2..e2f7cd4aec6 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1045,7 +1045,8 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport) port92 = isa_create_simple(isa_bus, TYPE_PORT92);a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);- i8042_setup_a20_line(i8042, a20_line[0]); + qdev_connect_gpio_out_named(DEVICE(i8042), + I8042_A20_LINE, 0, a20_line[0]); qdev_connect_gpio_out_named(DEVICE(port92), PORT92_A20_LINE, 0, a20_line[1]); g_free(a20_line); diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index baba62f357a..7fd4477d742 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -680,11 +680,6 @@ void i8042_isa_mouse_fake_event(ISAKBDState *isa) ps2_mouse_fake_event(s->mouse); }-void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out)-{ - qdev_connect_gpio_out_named(DEVICE(dev), I8042_A20_LINE, 0, a20_out); -} - static const VMStateDescription vmstate_kbd_isa = { .name = "pckbd", .version_id = 3,
