On 12/27/20 2:10 AM, BALATON Zoltan via wrote: > Also rename VT82C686B type to lower case to match other device names.
If possible do not split the commit description in 2 (one part in subject and the other part here) as this is annoying to read. > > Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu> > --- > hw/isa/vt82c686.c | 9 --------- > hw/mips/fuloong2e.c | 4 +++- > include/hw/isa/vt82c686.h | 3 +-- > 3 files changed, 4 insertions(+), 12 deletions(-) > > diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c > index 758c54172b..1c1239cade 100644 > --- a/hw/isa/vt82c686.c > +++ b/hw/isa/vt82c686.c > @@ -49,7 +49,6 @@ struct VT82C686BState { > SuperIOConfig superio_conf; > }; > > -#define TYPE_VT82C686B "VT82C686B" > OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B) > > static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data, > @@ -367,14 +366,6 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp) > &vt82c->superio); > } > > -ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn) > -{ > - PCIDevice *d; > - > - d = pci_create_simple_multifunction(bus, devfn, true, TYPE_VT82C686B); > - return ISA_BUS(qdev_get_child_bus(DEVICE(d), "isa.0")); > -} > - > static void via_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c > index 3b0489f781..60d2020033 100644 > --- a/hw/mips/fuloong2e.c > +++ b/hw/mips/fuloong2e.c > @@ -240,7 +240,9 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, > int slot, qemu_irq intc, > ISABus *isa_bus; > PCIDevice *dev; > > - isa_bus = vt82c686b_isa_init(pci_bus, PCI_DEVFN(slot, 0)); > + dev = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), true, > + TYPE_VT82C686B); Good cleanup. Preferably using TYPE_VT82C686B_ISA: Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> > + isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(dev), "isa.0")); > assert(isa_bus); > *p_isa_bus = isa_bus; > /* Interrupt controller */ > diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h > index ff80a926dc..89e205a1be 100644 > --- a/include/hw/isa/vt82c686.h > +++ b/include/hw/isa/vt82c686.h > @@ -1,13 +1,12 @@ > #ifndef HW_VT82C686_H > #define HW_VT82C686_H > > - > +#define TYPE_VT82C686B "vt82c686b" > #define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" > #define TYPE_VIA_AC97 "via-ac97" > #define TYPE_VIA_MC97 "via-mc97" > > /* vt82c686.c */ > -ISABus *vt82c686b_isa_init(PCIBus * bus, int devfn); > I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, > qemu_irq sci_irq); > >