On Sun, May 29, 2022 at 11:05 AM Mark Cave-Ayland <
mark.cave-ayl...@ilande.co.uk> wrote:
> On 28/05/2022 20:20, Bernhard Beschow wrote:
>
> > TYPE_PIIX3_PCI_DEVICE resides there as already, so add the remaining
> > ones, too.
> >
> > Signed-off-by: Bernhard Beschow <shen...@gmail.com>
> > Reviewed-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
> > Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> > ---
> > hw/isa/piix3.c | 3 ---
> > include/hw/isa/isa.h | 2 --
> > include/hw/southbridge/piix.h | 4 ++++
> > 3 files changed, 4 insertions(+), 5 deletions(-)
> >
> > diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
> > index dab901c9ad..d96ce2b788 100644
> > --- a/hw/isa/piix3.c
> > +++ b/hw/isa/piix3.c
> > @@ -35,9 +35,6 @@
> >
> > #define XEN_PIIX_NUM_PIRQS 128ULL
> >
> > -#define TYPE_PIIX3_DEVICE "PIIX3"
> > -#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
> > -
> > static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq)
> > {
> > qemu_set_irq(piix3->pic[pic_irq],
> > 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 976b4da582..3b97186f75 100644
> > --- a/include/hw/southbridge/piix.h
> > +++ b/include/hw/southbridge/piix.h
> > @@ -64,6 +64,10 @@ typedef struct PIIXState PIIX3State;
> > DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE,
> > TYPE_PIIX3_PCI_DEVICE)
> >
> > +#define TYPE_PIIX3_DEVICE "PIIX3"
> > +#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
> > +#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);
>
> One tiny nit here: there's a typo in the subject line which I missed when
> reviewing v2.
>
> s/soughbridge/southbridge/
>
Ack. Will fix in v3.
Best regards,
Bernhard
>
>
> ATB,
>
> Mark.
>
