[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 42/46] hw/pci-host/bonito: Use 'bonito_pci' for PCI function #0 co
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 42/46] hw/pci-host/bonito: Use 'bonito_pci' for PCI function #0 code |
Date: |
Fri, 13 Jan 2023 16:45:28 +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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230105130710.49264-4-philmd@linaro.org>
---
hw/pci-host/bonito.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 5c0928ffe6..9c26aa2ad9 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -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,14 +763,14 @@ 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;
@@ -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
- [PULL 31/46] hw/isa/piix3: Decouple INTx-to-LNKx routing which is board-specific, (continued)
- [PULL 31/46] hw/isa/piix3: Decouple INTx-to-LNKx routing which is board-specific, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 32/46] hw/isa/piix4: Decouple INTx-to-LNKx routing which is board-specific, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 33/46] hw/mips/Kconfig: Track Malta's PIIX dependencies via Kconfig, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 35/46] hw/intc/i8259: Make using the isa_pic singleton more type-safe, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 34/46] hw/usb/hcd-uhci: Introduce TYPE_ defines for device models, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 36/46] hw/intc: Extract the IRQ counting functions into a separate file, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 38/46] hw/rtc/mc146818rtc: Make the mc146818 RTC device target independent, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 39/46] softmmu/rtc: Emit warning when using driftfix=slew on systems without mc146818, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 40/46] hw/pci-host/bonito: Convert to 3-phase reset, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 41/46] hw/pci-host/bonito: Use 'bonito_host' for PCI host bridge code, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 42/46] hw/pci-host/bonito: Use 'bonito_pci' for PCI function #0 code,
Philippe Mathieu-Daudé <=
- [PULL 44/46] hw/mips/boston: Rename MachineState 'mc' pointer to 'ms', Philippe Mathieu-Daudé, 2023/01/13
- [PULL 43/46] hw/pci-host/bonito: Declare TYPE_BONITO_PCI_HOST_BRIDGE in header, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 37/46] hw/core/qdev-properties-system: Allow the 'slew' policy only on x86, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 46/46] scripts/git.orderfile: Display MAINTAINERS changes first, Philippe Mathieu-Daudé, 2023/01/13
- [PULL 45/46] target/mips: Restrict 'qapi-commands-machine.h' to system emulation, Philippe Mathieu-Daudé, 2023/01/13
- Re: [PULL 00/46] MIPS patches for 2023-01-13, Peter Maydell, 2023/01/13