| Message ID | 20220901114127.53914-6-shentey@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Instantiate VT82xx functions in host device | expand |
On 9/1/22 08:41, Bernhard Beschow wrote: > Establishes consistency with other (VIA) devices. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > --- Acked-by: Daniel Henrique Barboza <danielhb413@gmail.com> > hw/ide/via.c | 2 +- > hw/mips/fuloong2e.c | 2 +- > hw/ppc/pegasos2.c | 2 +- > include/hw/isa/vt82c686.h | 1 + > 4 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/hw/ide/via.c b/hw/ide/via.c > index 82def819c4..e1a429405d 100644 > --- a/hw/ide/via.c > +++ b/hw/ide/via.c > @@ -230,7 +230,7 @@ static void via_ide_class_init(ObjectClass *klass, void *data) > } > > static const TypeInfo via_ide_info = { > - .name = "via-ide", > + .name = TYPE_VIA_IDE, > .parent = TYPE_PCI_IDE, > .class_init = via_ide_class_init, > }; > diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c > index 5ee546f5f6..44225fbe33 100644 > --- a/hw/mips/fuloong2e.c > +++ b/hw/mips/fuloong2e.c > @@ -205,7 +205,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, > TYPE_VT82C686B_ISA); > qdev_connect_gpio_out(DEVICE(dev), 0, intc); > > - dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide"); > + dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), TYPE_VIA_IDE); > pci_ide_create_devs(dev); > > pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); > diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c > index 61f4263953..8039775f80 100644 > --- a/hw/ppc/pegasos2.c > +++ b/hw/ppc/pegasos2.c > @@ -166,7 +166,7 @@ static void pegasos2_init(MachineState *machine) > qdev_get_gpio_in_named(pm->mv, "gpp", 31)); > > /* VT8231 function 1: IDE Controller */ > - dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 1), "via-ide"); > + dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 1), TYPE_VIA_IDE); > pci_ide_create_devs(dev); > > /* VT8231 function 2-3: USB Ports */ > diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h > index 56ac141be3..87aca3e5bb 100644 > --- a/include/hw/isa/vt82c686.h > +++ b/include/hw/isa/vt82c686.h > @@ -8,6 +8,7 @@ > #define TYPE_VT8231_ISA "vt8231-isa" > #define TYPE_VT8231_PM "vt8231-pm" > #define TYPE_VIA_AC97 "via-ac97" > +#define TYPE_VIA_IDE "via-ide" > #define TYPE_VIA_MC97 "via-mc97" > > void via_isa_set_irq(PCIDevice *d, int n, int level);
diff --git a/hw/ide/via.c b/hw/ide/via.c index 82def819c4..e1a429405d 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -230,7 +230,7 @@ static void via_ide_class_init(ObjectClass *klass, void *data) } static const TypeInfo via_ide_info = { - .name = "via-ide", + .name = TYPE_VIA_IDE, .parent = TYPE_PCI_IDE, .class_init = via_ide_class_init, }; diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 5ee546f5f6..44225fbe33 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -205,7 +205,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, TYPE_VT82C686B_ISA); qdev_connect_gpio_out(DEVICE(dev), 0, intc); - dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide"); + dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), TYPE_VIA_IDE); pci_ide_create_devs(dev); pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 61f4263953..8039775f80 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -166,7 +166,7 @@ static void pegasos2_init(MachineState *machine) qdev_get_gpio_in_named(pm->mv, "gpp", 31)); /* VT8231 function 1: IDE Controller */ - dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 1), "via-ide"); + dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 1), TYPE_VIA_IDE); pci_ide_create_devs(dev); /* VT8231 function 2-3: USB Ports */ diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index 56ac141be3..87aca3e5bb 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -8,6 +8,7 @@ #define TYPE_VT8231_ISA "vt8231-isa" #define TYPE_VT8231_PM "vt8231-pm" #define TYPE_VIA_AC97 "via-ac97" +#define TYPE_VIA_IDE "via-ide" #define TYPE_VIA_MC97 "via-mc97" void via_isa_set_irq(PCIDevice *d, int n, int level);
Establishes consistency with other (VIA) devices. Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- hw/ide/via.c | 2 +- hw/mips/fuloong2e.c | 2 +- hw/ppc/pegasos2.c | 2 +- include/hw/isa/vt82c686.h | 1 + 4 files changed, 4 insertions(+), 3 deletions(-)