[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/6] include/hw: Move TYPE_PIIX4_PCI_DEVICE to southbridge/piix.h
From: |
Bernhard Beschow |
Subject: |
[PATCH 1/6] include/hw: Move TYPE_PIIX4_PCI_DEVICE to southbridge/piix.h |
Date: |
Fri, 13 May 2022 19:54:40 +0200 |
TYPE_PIIX3_PCI_DEVICE resides there as well.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
include/hw/isa/isa.h | 2 --
include/hw/southbridge/piix.h | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 034d706ba1..e9fa2f5cea 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -144,6 +144,4 @@ static inline ISABus *isa_bus_from_device(ISADevice *d)
return ISA_BUS(qdev_get_parent_bus(DEVICE(d)));
}
-#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
-
#endif
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index f63f83e5c6..a304fc6041 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -70,6 +70,8 @@ typedef struct PIIXState PIIX3State;
DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE,
TYPE_PIIX3_PCI_DEVICE)
+#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
+
PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus);
DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus);
--
2.36.1
- [PATCH 0/6] QOM'ify PIIX southbridge creation, Bernhard Beschow, 2022/05/13
- [PATCH 1/6] include/hw: Move TYPE_PIIX4_PCI_DEVICE to southbridge/piix.h,
Bernhard Beschow <=
- [PATCH 2/6] hw/isa/piix{3, 4}: Move pci_map_irq_fn's near pci_set_irq_fn's, Bernhard Beschow, 2022/05/13
- [PATCH 3/6] hw/isa/piix{3,4}: QOM'ify PCI device creation and wiring, Bernhard Beschow, 2022/05/13
- [PATCH 4/6] hw/isa/piix{3, 4}: Factor out ISABus retrieval from create() functions, Bernhard Beschow, 2022/05/13
- [PATCH 5/6] hw/isa/piix4: Factor out SM bus initialization from create() function, Bernhard Beschow, 2022/05/13