From: "Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Stefan Pejic" <stefan.pejic@syrmia.com>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Bernhard Beschow" <shentey@gmail.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 41/49] hw: Reuse TYPE_I8042 define
Date: Sat, 11 Jun 2022 12:33:04 +0200 [thread overview]
Message-ID: <20220611103312.67773-42-philippe.mathieu.daude@gmail.com> (raw)
In-Reply-To: <20220611103312.67773-1-philippe.mathieu.daude@gmail.com>
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
next prev parent reply other threads:[~2022-06-11 11:22 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-11 10:32 [PULL 00/49] MIPS patches for 2022-06-11 Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 01/49] target/mips: Fix WatchHi.M handling Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 02/49] target/mips: Fix SAT_S trans helper Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 03/49] target/mips: Fix df_extract_val() and df_extract_df() dfe lookup Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 04/49] target/mips: Fix msa checking condition in trans_msa_elm_fn() Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 05/49] target/mips: Do not treat msa INSERT as NOP when wd is zero Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 06/49] target/mips: Fix store adress of high 64bit in helper_msa_st_b() Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 07/49] target/mips: Fix FTRUNC_S and FTRUNC_U trans helper Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 08/49] target/mips: Fix emulation of nanoMIPS MTHLIP instruction Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 09/49] target/mips: Fix emulation of nanoMIPS EXTRV_S.H instruction Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 10/49] target/mips: Fix emulation of nanoMIPS BPOSGE32C instruction Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 11/49] target/mips: Fix emulation of nanoMIPS BNEC[32] instruction Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 12/49] target/mips: Fix handling of unaligned memory access for nanoMIPS ISA Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 13/49] target/mips: Add missing default cases for some nanoMIPS pools Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 14/49] target/mips: Undeprecate nanoMIPS ISA support in QEMU Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 15/49] hw/block/fdc-sysbus: Always mark sysbus floppy controllers as not having DMA Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 16/49] hw/acpi/piix4: move xen_enabled() logic from piix4_pm_init() to piix4_pm_realize() Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 17/49] hw/acpi/piix4: change smm_enabled from int to bool Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 18/49] hw/acpi/piix4: convert smm_enabled bool to qdev property Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 19/49] hw/acpi/piix4: move PIIX4PMState into separate piix4.h header Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 20/49] hw/acpi/piix4: alter piix4_pm_init() to return PIIX4PMState Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 21/49] hw/acpi/piix4: rename piix4_pm_init() to piix4_pm_initfn() Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 22/49] hw/acpi/piix4: use qdev gpio to wire up sci_irq Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 23/49] hw/acpi/piix4: use qdev gpio to wire up smi_irq Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 24/49] hw/i386/pc_piix: create PIIX4_PM device directly instead of using piix4_pm_initfn() Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 25/49] hw/isa/piix4.c: " Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 26/49] hw/acpi/piix4: remove unused piix4_pm_initfn() function Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 27/49] hw/southbridge/piix: Aggregate all PIIX southbridge type names Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 28/49] hw/isa/piix4: Use object_initialize_child() for embedded struct Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 29/49] hw/isa/piix4: Move pci_map_irq_fn' near pci_set_irq_fn Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 30/49] hw/isa/piix4: QOM'ify PCI device creation and wiring Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 31/49] hw/isa/piix4: Factor out ISABus retrieval from piix4_create() Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 32/49] hw/isa/piix4: QOM'ify PIIX4 PM creation Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 33/49] hw/isa/piix4: Inline and remove piix4_create() Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 34/49] hw/isa/piix3: Move pci_map_irq_fn near pci_set_irq_fn Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 35/49] hw/isa/piix3: QOM'ify PCI device creation and wiring Philippe Mathieu-Daudé
2022-06-11 10:32 ` [PULL 36/49] hw/isa/piix3: Factor out ISABus retrieval from piix3_create() Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 37/49] hw/isa/piix3: Inline and remove piix3_create() Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 38/49] hw/i386/microvm-dt: Force explicit failure if retrieving QOM property fails Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 39/49] hw/i386/microvm-dt: Determine mc146818rtc's IRQ number from QOM property Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 40/49] hw/rtc/mc146818rtc: QOM'ify io_base offset Philippe Mathieu-Daudé
2022-06-11 10:33 ` Philippe Mathieu-Daudé [this message]
2022-06-11 10:33 ` [PULL 42/49] hw/audio/cs4231a: Const'ify global tables Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 43/49] hw/i386/pc: Unexport PC_CPU_MODEL_IDS macro Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 44/49] hw/i386/pc: Unexport functions used only internally Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 45/49] hw/i386/pc: Remove orphan declarations Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 46/49] hw/net/fsl_etsec/etsec: Remove obsolete and unused etsec_create() Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 47/49] accel/tcg/cpu-exec: Unexport dump_drift_info() Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 48/49] accel/tcg: Inline dump_opcount_info() and remove it Philippe Mathieu-Daudé
2022-06-11 10:33 ` [PULL 49/49] docs/devel: Fix link to developer mailing lists Philippe Mathieu-Daudé
2022-06-11 22:00 ` [PULL 00/49] MIPS patches for 2022-06-11 Philippe Mathieu-Daudé via
2022-06-12 3:50 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220611103312.67773-42-philippe.mathieu.daude@gmail.com \
--to=philippe.mathieu.daude@gmail.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=aurelien@aurel32.net \
--cc=f4bug@amsat.org \
--cc=hpoussin@reactos.org \
--cc=jiaxun.yang@flygoat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-devel@nongnu.org \
--cc=shentey@gmail.com \
--cc=stefan.pejic@syrmia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).