| Message ID | 20220513175445.89616-2-shentey@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | QOM'ify PIIX southbridge creation | expand |
On 13/05/2022 18:54, Bernhard Beschow wrote: > 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); Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> ATB, Mark.
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);
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(-)