| Message ID | 20220528192057.30910-2-shentey@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | QOM'ify PIIX southbridge creation | expand |
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 <shentey@gmail.com> > Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@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/ ATB, Mark.
On Sun, May 29, 2022 at 11:05 AM Mark Cave-Ayland < mark.cave-ayland@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 <shentey@gmail.com> > > Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@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. >
Am 30. Mai 2022 13:19:33 UTC schrieb "Philippe Mathieu-Daudé" <f4bug@amsat.org>: >On 29/5/22 20:09, Bernhard Beschow wrote: >> On Sun, May 29, 2022 at 11:05 AM Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk <mailto:mark.cave-ayland@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 <shentey@gmail.com >> <mailto:shentey@gmail.com>> >> > Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk >> <mailto:mark.cave-ayland@ilande.co.uk>> >> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org >> <mailto:f4bug@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(-) > >> 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. > >Can do. Also, "include/" in subject is not helpful. I'll take care of this in v4. Thanks, Bernhard
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);