| Message ID | 20191015162705.28087-15-philmd@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge | expand |
On Tuesday, October 15, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > From: Hervé Poussineau <hpoussin@reactos.org> > > Remove i8257 instanciated in malta board, to not have it twice. > > 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-9-hpoussin@reactos.org> > [PMD: rebased] > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/isa/piix4.c | 4 ++++ > hw/mips/mips_malta.c | 2 -- > 2 files changed, 4 insertions(+), 2 deletions(-) > > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c > index 8998b0ca47..1bc91b590c 100644 > --- a/hw/isa/piix4.c > +++ b/hw/isa/piix4.c > @@ -29,6 +29,7 @@ > #include "hw/pci/pci.h" > #include "hw/isa/isa.h" > #include "hw/sysbus.h" > +#include "hw/dma/i8257.h" > #include "migration/vmstate.h" > #include "sysemu/reset.h" > #include "sysemu/runstate.h" > @@ -164,6 +165,9 @@ static void piix4_realize(PCIDevice *pci_dev, Error > **errp) > /* initialize ISA irqs */ > isa_bus_irqs(isa_bus, s->isa); > > + /* DMA */ > + i8257_dma_init(isa_bus, 0); > + > piix4_dev = pci_dev; > } > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index e499b7a6bb..df247177ca 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -28,7 +28,6 @@ > #include "cpu.h" > #include "hw/i386/pc.h" > #include "hw/isa/superio.h" > -#include "hw/dma/i8257.h" > #include "hw/char/serial.h" > #include "net/net.h" > #include "hw/boards.h" > @@ -1430,7 +1429,6 @@ void mips_malta_init(MachineState *machine) > smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, > isa_get_irq(NULL, 9), NULL, 0, NULL); > pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); > - i8257_dma_init(isa_bus, 0); > mc146818_rtc_init(isa_bus, 2000, NULL); > > /* generate SPD EEPROM data */ > -- > 2.21.0 > > >
On 15/10/2019 18.26, Philippe Mathieu-Daudé wrote: > > Remove i8257 instanciated in malta board, to not have it twice. s/instanciated/instantiated/ Thomas
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 8998b0ca47..1bc91b590c 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -29,6 +29,7 @@ #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "hw/sysbus.h" +#include "hw/dma/i8257.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" @@ -164,6 +165,9 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp) /* initialize ISA irqs */ isa_bus_irqs(isa_bus, s->isa); + /* DMA */ + i8257_dma_init(isa_bus, 0); + piix4_dev = pci_dev; } diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index e499b7a6bb..df247177ca 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -28,7 +28,6 @@ #include "cpu.h" #include "hw/i386/pc.h" #include "hw/isa/superio.h" -#include "hw/dma/i8257.h" #include "hw/char/serial.h" #include "net/net.h" #include "hw/boards.h" @@ -1430,7 +1429,6 @@ void mips_malta_init(MachineState *machine) smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, isa_get_irq(NULL, 9), NULL, 0, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); - i8257_dma_init(isa_bus, 0); mc146818_rtc_init(isa_bus, 2000, NULL); /* generate SPD EEPROM data */