From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, "John Snow" <jsnow@redhat.com>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
qemu-block@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"BALATON Zoltan" <balaton@eik.bme.hu>,
"Bernhard Beschow" <shentey@gmail.com>
Subject: [PATCH v5 07/13] hw/isa/vt82c686: Introduce TYPE_VT82C686B_USB_UHCI define
Date: Thu, 1 Sep 2022 13:41:21 +0200 [thread overview]
Message-ID: <20220901114127.53914-8-shentey@gmail.com> (raw)
In-Reply-To: <20220901114127.53914-1-shentey@gmail.com>
Suggested-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
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 8bc528a560..70776558c9 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-09-01 11:57 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 11:41 [PATCH v5 00/13] Instantiate VT82xx functions in host device Bernhard Beschow
2022-09-01 11:41 ` [PATCH v5 01/13] hw/isa/vt82c686: Resolve chip-specific realize methods Bernhard Beschow
2022-09-01 11:41 ` [PATCH v5 02/13] hw/isa/vt82c686: Resolve unneeded attribute Bernhard Beschow
2022-09-01 11:41 ` [PATCH v5 03/13] hw/isa/vt82c686: Prefer pci_address_space() over get_system_memory() Bernhard Beschow
2022-09-01 11:41 ` [PATCH v5 04/13] hw/isa/vt82c686: Reuse errp Bernhard Beschow
2022-09-01 11:41 ` [PATCH v5 05/13] hw/isa/vt82c686: Introduce TYPE_VIA_IDE define Bernhard Beschow
2022-09-08 10:20 ` Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 06/13] hw/isa/vt82c686: Instantiate IDE function in host device Bernhard Beschow
2022-09-08 10:20 ` Daniel Henrique Barboza
2022-09-01 11:41 ` Bernhard Beschow [this message]
2022-09-08 10:20 ` [PATCH v5 07/13] hw/isa/vt82c686: Introduce TYPE_VT82C686B_USB_UHCI define Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 08/13] hw/isa/vt82c686: Instantiate USB functions in host device Bernhard Beschow
2022-09-08 10:20 ` Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 09/13] hw/isa/vt82c686: Instantiate PM function " Bernhard Beschow
2022-09-08 10:20 ` Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 10/13] hw/isa/vt82c686: Instantiate AC97 and MC97 functions " Bernhard Beschow
2022-09-08 10:21 ` Daniel Henrique Barboza
2022-09-01 11:41 ` [PATCH v5 11/13] hw/mips/fuloong2e: Inline vt82c686b_southbridge_init() and remove it Bernhard Beschow
2022-09-16 14:34 ` Philippe Mathieu-Daudé via
2022-09-01 11:41 ` [PATCH v5 12/13] hw/isa/vt82c686: Embed RTCState in host device Bernhard Beschow
2022-09-01 11:41 ` [PATCH v5 13/13] hw/isa/vt82c686: Create rtc-time alias in boards instead Bernhard Beschow
2022-09-08 10:21 ` Daniel Henrique Barboza
2022-09-16 14:34 ` Philippe Mathieu-Daudé via
2022-09-01 11:47 ` [PATCH v5 00/13] Instantiate VT82xx functions in host device Bernhard Beschow
2022-09-08 8:34 ` Bernhard Beschow
2022-09-08 10:22 ` BALATON Zoltan
2022-09-08 10:25 ` Daniel Henrique Barboza
2022-09-12 19:50 ` Bernhard Beschow
2022-09-16 14:36 ` Philippe Mathieu-Daudé via
2022-09-16 17:54 ` Bernhard Beschow
2022-10-27 8:21 ` Bernhard Beschow
2022-10-27 9:47 ` Daniel Henrique Barboza
2022-10-27 22:11 ` Philippe Mathieu-Daudé
2022-10-28 7:48 ` Bernhard Beschow
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=20220901114127.53914-8-shentey@gmail.com \
--to=shentey@gmail.com \
--cc=balaton@eik.bme.hu \
--cc=chenhuacai@kernel.org \
--cc=f4bug@amsat.org \
--cc=jiaxun.yang@flygoat.com \
--cc=jsnow@redhat.com \
--cc=kraxel@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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).