| Message ID | 20191018134754.16362-6-philmd@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> 于2019年10月18日周五 下午9:53写道： > From: Hervé Poussineau <hpoussin@reactos.org> > > Other piix4 parts are already named piix4-ide and piix4-usb-uhci. > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Acked-by: Michael S. Tsirkin <mst@redhat.com> > Acked-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > Message-Id: <20171216090228.28505-15-hpoussin@reactos.org> > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > [PMD: rebased] > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > hw/isa/piix4.c | 1 - > hw/mips/mips_malta.c | 2 +- > include/hw/isa/isa.h | 2 ++ > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c > index 9c37c85ae2..ac9383a658 100644 > --- a/hw/isa/piix4.c > +++ b/hw/isa/piix4.c > @@ -45,7 +45,6 @@ typedef struct PIIX4State { > uint8_t rcr; > } PIIX4State; > > -#define TYPE_PIIX4_PCI_DEVICE "PIIX4" > #define PIIX4_PCI_DEVICE(obj) \ > OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index 7d25ab6c23..e499b7a6bb 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -1414,7 +1414,7 @@ void mips_malta_init(MachineState *machine) > ide_drive_get(hd, ARRAY_SIZE(hd)); > > pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), > - true, "PIIX4"); > + true, TYPE_PIIX4_PCI_DEVICE); > dev = DEVICE(pci); > isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0")); > piix4_devfn = pci->devfn; > diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h > index 018ada4f6f..79f703fd6c 100644 > --- a/include/hw/isa/isa.h > +++ b/include/hw/isa/isa.h > @@ -147,4 +147,6 @@ 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 > -- > 2.21.0 > > >
El vie, 18-10-2019 a las 15:47 +0200, Philippe Mathieu-Daudé escribió: > From: Hervé Poussineau <hpoussin@reactos.org> > > Other piix4 parts are already named piix4-ide and piix4-usb-uhci. > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Acked-by: Michael S. Tsirkin <mst@redhat.com> > Acked-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > Message-Id: <20171216090228.28505-15-hpoussin@reactos.org> > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > [PMD: rebased] > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/isa/piix4.c | 1 - > hw/mips/mips_malta.c | 2 +- > include/hw/isa/isa.h | 2 ++ > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c > index 9c37c85ae2..ac9383a658 100644 > --- a/hw/isa/piix4.c > +++ b/hw/isa/piix4.c > @@ -45,7 +45,6 @@ typedef struct PIIX4State { > uint8_t rcr; > } PIIX4State; > > -#define TYPE_PIIX4_PCI_DEVICE "PIIX4" > #define PIIX4_PCI_DEVICE(obj) \ > OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index 7d25ab6c23..e499b7a6bb 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -1414,7 +1414,7 @@ void mips_malta_init(MachineState *machine) > ide_drive_get(hd, ARRAY_SIZE(hd)); > > pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), > - true, "PIIX4"); > + true, > TYPE_PIIX4_PCI_DEVICE); > dev = DEVICE(pci); > isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0")); > piix4_devfn = pci->devfn; > diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h > index 018ada4f6f..79f703fd6c 100644 > --- a/include/hw/isa/isa.h > +++ b/include/hw/isa/isa.h > @@ -147,4 +147,6 @@ 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 Reviewed-by: Esteban Bosse <estebanbosse@gmail.com>
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 9c37c85ae2..ac9383a658 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -45,7 +45,6 @@ typedef struct PIIX4State { uint8_t rcr; } PIIX4State; -#define TYPE_PIIX4_PCI_DEVICE "PIIX4" #define PIIX4_PCI_DEVICE(obj) \ OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 7d25ab6c23..e499b7a6bb 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1414,7 +1414,7 @@ void mips_malta_init(MachineState *machine) ide_drive_get(hd, ARRAY_SIZE(hd)); pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), - true, "PIIX4"); + true, TYPE_PIIX4_PCI_DEVICE); dev = DEVICE(pci); isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0")); piix4_devfn = pci->devfn; diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 018ada4f6f..79f703fd6c 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -147,4 +147,6 @@ 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