[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 41/49] hw: Reuse TYPE_I8042 define
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 41/49] hw: Reuse TYPE_I8042 define |
Date: |
Sat, 11 Jun 2022 12:33:04 +0200 |
From: Bernhard Beschow <shentey@gmail.com>
TYPE_I8042 is exported, so reuse it for consistency.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20220520180109.8224-2-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/i386/pc.c | 4 ++--
hw/sparc64/sun4u.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 1b6067ff22..af9e5edb04 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1097,7 +1097,7 @@ static void pc_superio_init(ISABus *isa_bus, bool
create_fdctrl,
return;
}
- i8042 = isa_create_simple(isa_bus, "i8042");
+ i8042 = isa_create_simple(isa_bus, TYPE_I8042);
if (!no_vmport) {
isa_create_simple(isa_bus, TYPE_VMPORT);
vmmouse = isa_try_new("vmmouse");
@@ -1105,7 +1105,7 @@ static void pc_superio_init(ISABus *isa_bus, bool
create_fdctrl,
vmmouse = NULL;
}
if (vmmouse) {
- object_property_set_link(OBJECT(vmmouse), "i8042", OBJECT(i8042),
+ object_property_set_link(OBJECT(vmmouse), TYPE_I8042, OBJECT(i8042),
&error_abort);
isa_realize_and_unref(vmmouse, isa_bus, &error_fatal);
}
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index d1bc77d27e..0e27715ac4 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -334,7 +334,7 @@ static void ebus_realize(PCIDevice *pci_dev, Error **errp)
parallel_hds_isa_init(s->isa_bus, MAX_PARALLEL_PORTS);
/* Keyboard */
- isa_create_simple(s->isa_bus, "i8042");
+ isa_create_simple(s->isa_bus, TYPE_I8042);
/* Floppy */
for (i = 0; i < MAX_FD; i++) {
--
2.36.1
- [PULL 32/49] hw/isa/piix4: QOM'ify PIIX4 PM creation, (continued)
- [PULL 32/49] hw/isa/piix4: QOM'ify PIIX4 PM creation, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 34/49] hw/isa/piix3: Move pci_map_irq_fn near pci_set_irq_fn, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 36/49] hw/isa/piix3: Factor out ISABus retrieval from piix3_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 33/49] hw/isa/piix4: Inline and remove piix4_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 37/49] hw/isa/piix3: Inline and remove piix3_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 35/49] hw/isa/piix3: QOM'ify PCI device creation and wiring, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 38/49] hw/i386/microvm-dt: Force explicit failure if retrieving QOM property fails, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 39/49] hw/i386/microvm-dt: Determine mc146818rtc's IRQ number from QOM property, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 40/49] hw/rtc/mc146818rtc: QOM'ify io_base offset, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 44/49] hw/i386/pc: Unexport functions used only internally, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 41/49] hw: Reuse TYPE_I8042 define,
Philippe Mathieu-Daudé <=
- [PULL 42/49] hw/audio/cs4231a: Const'ify global tables, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 43/49] hw/i386/pc: Unexport PC_CPU_MODEL_IDS macro, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 47/49] accel/tcg/cpu-exec: Unexport dump_drift_info(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 46/49] hw/net/fsl_etsec/etsec: Remove obsolete and unused etsec_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 48/49] accel/tcg: Inline dump_opcount_info() and remove it, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 45/49] hw/i386/pc: Remove orphan declarations, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 49/49] docs/devel: Fix link to developer mailing lists, Philippe Mathieu-Daudé, 2022/06/11
- Re: [PULL 00/49] MIPS patches for 2022-06-11, Philippe Mathieu-Daudé, 2022/06/11
- Re: [PULL 00/49] MIPS patches for 2022-06-11, Richard Henderson, 2022/06/11