| Message ID | 20191015162705.28087-16-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 i8254 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-10-hpoussin@reactos.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/isa/piix4.c | 4 ++++ > hw/mips/mips_malta.c | 4 ---- > 2 files changed, 4 insertions(+), 4 deletions(-) > > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c > index 1bc91b590c..0b0a0ecab1 100644 > --- a/hw/isa/piix4.c > +++ b/hw/isa/piix4.c > @@ -30,6 +30,7 @@ > #include "hw/isa/isa.h" > #include "hw/sysbus.h" > #include "hw/dma/i8257.h" > +#include "hw/timer/i8254.h" > #include "migration/vmstate.h" > #include "sysemu/reset.h" > #include "sysemu/runstate.h" > @@ -165,6 +166,9 @@ static void piix4_realize(PCIDevice *pci_dev, Error > **errp) > /* initialize ISA irqs */ > isa_bus_irqs(isa_bus, s->isa); > > + /* initialize pit */ > + i8254_pit_init(isa_bus, 0x40, 0, NULL); > + > /* DMA */ > i8257_dma_init(isa_bus, 0); > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index df247177ca..16d7a0e785 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -45,7 +45,6 @@ > #include "hw/loader.h" > #include "elf.h" > #include "hw/timer/mc146818rtc.h" > -#include "hw/timer/i8254.h" > #include "exec/address-spaces.h" > #include "hw/sysbus.h" /* SysBusDevice */ > #include "qemu/host-utils.h" > @@ -99,8 +98,6 @@ typedef struct { > qemu_irq i8259[16]; > } MaltaState; > > -static ISADevice *pit; > - > static struct _loaderparams { > int ram_size, ram_low_size; > const char *kernel_filename; > @@ -1428,7 +1425,6 @@ void mips_malta_init(MachineState *machine) > pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); > 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); > mc146818_rtc_init(isa_bus, 2000, NULL); > > /* generate SPD EEPROM data */ > -- > 2.21.0 > > >
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 1bc91b590c..0b0a0ecab1 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -30,6 +30,7 @@ #include "hw/isa/isa.h" #include "hw/sysbus.h" #include "hw/dma/i8257.h" +#include "hw/timer/i8254.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" @@ -165,6 +166,9 @@ static void piix4_realize(PCIDevice *pci_dev, Error **errp) /* initialize ISA irqs */ isa_bus_irqs(isa_bus, s->isa); + /* initialize pit */ + i8254_pit_init(isa_bus, 0x40, 0, NULL); + /* DMA */ i8257_dma_init(isa_bus, 0); diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index df247177ca..16d7a0e785 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -45,7 +45,6 @@ #include "hw/loader.h" #include "elf.h" #include "hw/timer/mc146818rtc.h" -#include "hw/timer/i8254.h" #include "exec/address-spaces.h" #include "hw/sysbus.h" /* SysBusDevice */ #include "qemu/host-utils.h" @@ -99,8 +98,6 @@ typedef struct { qemu_irq i8259[16]; } MaltaState; -static ISADevice *pit; - static struct _loaderparams { int ram_size, ram_low_size; const char *kernel_filename; @@ -1428,7 +1425,6 @@ void mips_malta_init(MachineState *machine) pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); 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); mc146818_rtc_init(isa_bus, 2000, NULL); /* generate SPD EEPROM data */