From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Stefan Pejic" <stefan.pejic@syrmia.com>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Paul Burton" <paulburton@kernel.org>,
"Bernhard Beschow" <shentey@gmail.com>,
"BALATON Zoltan" <balaton@eik.bme.hu>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>
Subject: [PULL 07/55] hw/isa/vt82c686: Introduce TYPE_VT82C686B_USB_UHCI define
Date: Sun, 30 Oct 2022 23:27:53 +0100 [thread overview]
Message-ID: <20221030222841.42377-8-philmd@linaro.org> (raw)
In-Reply-To: <20221030222841.42377-1-philmd@linaro.org>
From: Bernhard Beschow <shentey@gmail.com>
Suggested-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20220901114127.53914-8-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/mips/fuloong2e.c | 4 ++--
hw/ppc/pegasos2.c | 4 ++--
hw/usb/vt82c686-uhci-pci.c | 4 ++--
include/hw/isa/vt82c686.h | 1 +
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index 32605901e7..6b7370f2aa 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -208,8 +208,8 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,
dev = PCI_DEVICE(object_resolve_path_component(OBJECT(via), "ide"));
pci_ide_create_devs(dev);
- pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci");
- pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), "vt82c686b-usb-uhci");
+ pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), TYPE_VT82C686B_USB_UHCI);
+ pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), TYPE_VT82C686B_USB_UHCI);
dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 4), TYPE_VT82C686B_PM);
*i2c_bus = I2C_BUS(qdev_get_child_bus(DEVICE(dev), "i2c"));
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index 76f0dee4aa..23b4156a5e 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -169,8 +169,8 @@ static void pegasos2_init(MachineState *machine)
pci_ide_create_devs(dev);
/* VT8231 function 2-3: USB Ports */
- pci_create_simple(pci_bus, PCI_DEVFN(12, 2), "vt82c686b-usb-uhci");
- pci_create_simple(pci_bus, PCI_DEVFN(12, 3), "vt82c686b-usb-uhci");
+ pci_create_simple(pci_bus, PCI_DEVFN(12, 2), TYPE_VT82C686B_USB_UHCI);
+ pci_create_simple(pci_bus, PCI_DEVFN(12, 3), TYPE_VT82C686B_USB_UHCI);
/* VT8231 function 4: Power Management Controller */
dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 4), TYPE_VT8231_PM);
diff --git a/hw/usb/vt82c686-uhci-pci.c b/hw/usb/vt82c686-uhci-pci.c
index 0bf2b72ff0..46a901f56f 100644
--- a/hw/usb/vt82c686-uhci-pci.c
+++ b/hw/usb/vt82c686-uhci-pci.c
@@ -31,7 +31,7 @@ static void usb_uhci_vt82c686b_realize(PCIDevice *dev, Error **errp)
static UHCIInfo uhci_info[] = {
{
- .name = "vt82c686b-usb-uhci",
+ .name = TYPE_VT82C686B_USB_UHCI,
.vendor_id = PCI_VENDOR_ID_VIA,
.device_id = PCI_DEVICE_ID_VIA_UHCI,
.revision = 0x01,
@@ -45,7 +45,7 @@ static UHCIInfo uhci_info[] = {
static const TypeInfo vt82c686b_usb_uhci_type_info = {
.parent = TYPE_UHCI,
- .name = "vt82c686b-usb-uhci",
+ .name = TYPE_VT82C686B_USB_UHCI,
.class_init = uhci_data_class_init,
.class_data = uhci_info,
};
diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h
index 87aca3e5bb..e6f6dd4d43 100644
--- a/include/hw/isa/vt82c686.h
+++ b/include/hw/isa/vt82c686.h
@@ -5,6 +5,7 @@
#define TYPE_VT82C686B_ISA "vt82c686b-isa"
#define TYPE_VT82C686B_PM "vt82c686b-pm"
+#define TYPE_VT82C686B_USB_UHCI "vt82c686b-usb-uhci"
#define TYPE_VT8231_ISA "vt8231-isa"
#define TYPE_VT8231_PM "vt8231-pm"
#define TYPE_VIA_AC97 "via-ac97"
--
2.37.3
next prev parent reply other threads:[~2022-10-30 22:29 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-30 22:27 [PULL 00/55] MIPS patches for 2022-10-30 Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 01/55] hw/isa/vt82c686: Resolve chip-specific realize methods Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 02/55] hw/isa/vt82c686: Resolve unneeded attribute Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 03/55] hw/isa/vt82c686: Prefer pci_address_space() over get_system_memory() Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 04/55] hw/isa/vt82c686: Reuse errp Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 05/55] hw/isa/vt82c686: Introduce TYPE_VIA_IDE define Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 06/55] hw/isa/vt82c686: Instantiate IDE function in host device Philippe Mathieu-Daudé
2022-10-30 22:27 ` Philippe Mathieu-Daudé [this message]
2022-10-30 22:27 ` [PULL 08/55] hw/isa/vt82c686: Instantiate USB functions " Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 09/55] hw/isa/vt82c686: Instantiate PM function " Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 10/55] hw/isa/vt82c686: Instantiate AC97 and MC97 functions " Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 11/55] hw/mips/fuloong2e: Inline vt82c686b_southbridge_init() and remove it Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 12/55] hw/isa/vt82c686: Embed RTCState in host device Philippe Mathieu-Daudé
2022-10-30 22:27 ` [PULL 13/55] hw/isa/vt82c686: Create rtc-time alias in boards instead Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 14/55] hw: Remove unused MAX_IDE_BUS define Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 15/55] disas/nanomips: Remove namespace img Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 16/55] disas/nanomips: Extract enums out of the NMD class Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 17/55] disas/nanomips: Delete NMD class field Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 18/55] disas/nanomips: Delete NMD class second field Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 19/55] disas/nanomips: Remove helper methods from class Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 20/55] disas/nanomips: Remove __cond " Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 21/55] disas/nanomips: Remove disasm " Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 22/55] disas/nanomips: Remove Pool tables from the class Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 23/55] disas/nanomips: Remove NMD class Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 24/55] disas/nanomips: Move typedefs etc to nanomips.cpp Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 25/55] disas/nanomips: Delete nanomips.h Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 26/55] disas/nanomips: Remove #include <sstream> Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 27/55] disas/nanomips: Delete copy functions Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 28/55] disas/nanomips: Delete wrapper functions Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 29/55] disas/nanomips: Replace std::string type Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 30/55] disas/nanomips: Remove IMMEDIATE functions Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 31/55] disas/nanomips: Remove CPR function Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 32/55] disas/nanomips: Prevent memory leaking Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 33/55] disas/nanomips: Remove function overloading Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 34/55] disas/nanomips: Expand Dis_info struct Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 35/55] disas/nanomips: Replace exception handling Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 36/55] disas/nanomips: Replace Cpp enums for C enums Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 37/55] disas/nanomips: Remove argument passing by ref Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 38/55] disas/nanomips: Rename nanomips.cpp to nanomips.c Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 39/55] disas/mips: Fix branch displacement for BEQZC and BNEZC Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 40/55] hw/i386/pc: Create DMA controllers in south bridges Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 41/55] hw/isa/piix3: Remove extra ';' outside of functions Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 42/55] hw/isa/piix3: Add size constraints to rcr_ops Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 43/55] hw/isa/piix3: Modernize reset handling Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 44/55] hw/isa/piix3: Prefer pci_address_space() over get_system_memory() Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 45/55] hw/isa/piix4: Rename wrongly named method Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 46/55] hw/ide/piix: Introduce TYPE_ macros for PIIX IDE controllers Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 47/55] hw/isa/piix3: Remove unused include Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 48/55] hw/mips/malta: Reuse dev variable Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 49/55] hw/isa/Kconfig: Fix dependencies of piix4 southbridge Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 50/55] hw/isa/piix4: Add missing initialization Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 51/55] hw/isa/piix4: Move pci_ide_create_devs() call to board code Philippe Mathieu-Daudé
2022-10-30 22:28 ` [PULL 52/55] hw/mips/boston: Don't set link_up for xilinx-pcie Philippe Mathieu-Daudé
2022-10-31 12:28 ` [PULL 00/55] MIPS patches for 2022-10-30 Philippe Mathieu-Daudé
2022-10-31 18:39 ` Stefan Hajnoczi
2022-11-08 13:59 ` Peter Maydell
2022-11-08 14:23 ` Philippe Mathieu-Daudé
2022-11-08 15:09 ` Thomas Huth
2022-11-08 15:23 ` Philippe Mathieu-Daudé
2022-11-08 17:56 ` Konstantin Kostiuk
2022-11-08 18:39 ` Paolo Bonzini
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=20221030222841.42377-8-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=aleksandar.rikalo@syrmia.com \
--cc=aurelien@aurel32.net \
--cc=balaton@eik.bme.hu \
--cc=chenhuacai@kernel.org \
--cc=danielhb413@gmail.com \
--cc=f4bug@amsat.org \
--cc=jiaxun.yang@flygoat.com \
--cc=paulburton@kernel.org \
--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).