@@ -29,6 +29,7 @@
#include "hw/pci/pci.h"
#include "hw/isa/isa.h"
#include "hw/sysbus.h"
+#include "hw/timer/i8254.h"
PCIDevice *piix4_dev;
@@ -158,6 +159,9 @@ static void piix4_realize(PCIDevice *pci, Error **errp)
/* initialize ISA irqs */
isa_bus_irqs(isa_bus, s->isa);
+ /* initialize pit */
+ pit_init(isa_bus, 0x40, 0, NULL);
+
/* DMA */
DMA_init(isa_bus, 0);
@@ -99,8 +99,6 @@ typedef struct {
qemu_irq i8259[16];
} MaltaState;
-static ISADevice *pit;
-
static struct _loaderparams {
int ram_size, ram_low_size;
const char *kernel_filename;
@@ -1204,7 +1202,6 @@ void mips_malta_init(MachineState *machine)
isa_get_irq(NULL, 9), NULL, 0, NULL);
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
g_free(smbus_eeprom_buf);
- pit = pit_init(isa_bus, 0x40, 0, NULL);
/* Super I/O */
isa_create_simple(isa_bus, "i8042");
Remove i8254 instanciated in malta board, to not have it twice. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> --- hw/isa/piix4.c | 4 ++++ hw/mips/mips_malta.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-)