diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-02-01 20:31:40 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-17 09:58:22 -0600 |
commit | 319ba9f52737fc79de5c2c6abd059933398b72d5 (patch) | |
tree | 4a75cc9962156d27d4b17955b4cbac19bb211ab1 /hw/mips_jazz.c | |
parent | b1277b03d46b2aeb22f0829aaa1c0f5fe6dd38fe (diff) | |
download | qemu-319ba9f52737fc79de5c2c6abd059933398b72d5.tar.gz qemu-319ba9f52737fc79de5c2c6abd059933398b72d5.tar.bz2 qemu-319ba9f52737fc79de5c2c6abd059933398b72d5.zip |
i8254: Pass alternative IRQ output object on initialization
HPET legacy emulation will require control over the PIT IRQ output. To
enable this, add support for an alternative IRQ output object to the PIT
factory function. If the isa_irq number is < 0, this object will be
used.
This also removes the IRQ number property from the PIT class as we now
use a generic GPIO output pin that is connected by the factory function.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mips_jazz.c')
-rw-r--r-- | hw/mips_jazz.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 61dee4defb..b61b2181d9 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -192,7 +192,7 @@ static void mips_jazz_init(MemoryRegion *address_space, isa_bus_irqs(isa_bus, i8259); cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); DMA_init(0, cpu_exit_irq); - pit = pit_init(isa_bus, 0x40, 0); + pit = pit_init(isa_bus, 0x40, 0, NULL); pcspk_init(pit); /* ISA IO space at 0x90000000 */ |