[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/8] hw/pci-host/bonito: Use 'bonito_pci' for PCI function #0 cod
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 3/8] hw/pci-host/bonito: Use 'bonito_pci' for PCI function #0 code |
Date: |
Thu, 5 Jan 2023 14:07:05 +0100 |
To make it easier to differentiate between the Host Bridge
object and its PCI function #0, rename bonito* as bonito_pci*.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/pci-host/bonito.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index a804731f49..80ec424f86 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -617,7 +617,7 @@ static void bonito_reset_hold(Object *obj)
s->regs[BONITO_PCIMAP] = 0x6140;
}
-static const VMStateDescription vmstate_bonito = {
+static const VMStateDescription vmstate_bonito_pci = {
.name = "Bonito",
.version_id = 1,
.minimum_version_id = 1,
@@ -653,7 +653,7 @@ static void bonito_host_realize(DeviceState *dev, Error
**errp)
create_unimplemented_device("pci.io", BONITO_PCIIO_BASE, 1 * MiB);
}
-static void bonito_realize(PCIDevice *dev, Error **errp)
+static void bonito_pci_realize(PCIDevice *dev, Error **errp)
{
PCIBonitoState *s = PCI_BONITO(dev);
SysBusDevice *sysbus = SYS_BUS_DEVICE(s->pcihost);
@@ -763,20 +763,20 @@ PCIBus *bonito_init(qemu_irq *pic)
return phb->bus;
}
-static void bonito_class_init(ObjectClass *klass, void *data)
+static void bonito_pci_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
rc->phases.hold = bonito_reset_hold;
- k->realize = bonito_realize;
+ k->realize = bonito_pci_realize;
k->vendor_id = 0xdf53;
k->device_id = 0x00d5;
k->revision = 0x01;
k->class_id = PCI_CLASS_BRIDGE_HOST;
dc->desc = "Host bridge";
- dc->vmsd = &vmstate_bonito;
+ dc->vmsd = &vmstate_bonito_pci;
/*
* PCI-facing part of the host bridge, not usable without the
* host-facing part, which can't be device_add'ed, yet.
@@ -784,11 +784,11 @@ static void bonito_class_init(ObjectClass *klass, void
*data)
dc->user_creatable = false;
}
-static const TypeInfo bonito_info = {
+static const TypeInfo bonito_pci_info = {
.name = TYPE_PCI_BONITO,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIBonitoState),
- .class_init = bonito_class_init,
+ .class_init = bonito_pci_class_init,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
{ },
@@ -812,7 +812,7 @@ static const TypeInfo bonito_host_info = {
static void bonito_register_types(void)
{
type_register_static(&bonito_host_info);
- type_register_static(&bonito_info);
+ type_register_static(&bonito_pci_info);
}
type_init(bonito_register_types)
--
2.38.1
- [PATCH 0/8] hw/pci-host/bonito: Housekeeping, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 1/8] hw/pci-host/bonito: Convert to 3-phase reset, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 2/8] hw/pci-host/bonito: Use 'bonito_host' for PCI host bridge code, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 3/8] hw/pci-host/bonito: Use 'bonito_pci' for PCI function #0 code,
Philippe Mathieu-Daudé <=
- [PATCH 4/8] hw/pci-host/bonito: Set reference using object_property_add_const_link(), Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 8/8] hw/mips/fuloong2e: Open code bonito_init(), Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 5/8] hw/pci-host/bonito: Create PCI function #0 in bridge realize() handler, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 7/8] hw/pci-host/bonito: Declare TYPE_BONITO_PCI_HOST_BRIDGE in header, Philippe Mathieu-Daudé, 2023/01/05
- [PATCH 6/8] hw/pci-host/bonito: Sysbus'ify outgoing IRQ, Philippe Mathieu-Daudé, 2023/01/05