mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdev/isa: make pc use qdev for i8042 setup.

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
This commit is contained in:
Gerd Hoffmann 2009-07-31 12:30:17 +02:00 committed by Anthony Liguori
parent f75247f172
commit b399963830
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/pc.c
View File

@ -1116,6 +1116,7 @@ static void pc_init1(ram_addr_t ram_size,
int bios_size, isa_bios_size, oprom_area_size; int bios_size, isa_bios_size, oprom_area_size;
PCIBus *pci_bus; PCIBus *pci_bus;
PCIDevice *pci_dev; PCIDevice *pci_dev;
ISADevice *isa_dev;
int piix3_devfn = -1; int piix3_devfn = -1;
CPUState *env; CPUState *env;
qemu_irq *cpu_irq; qemu_irq *cpu_irq;
@ -1362,7 +1363,9 @@ static void pc_init1(ram_addr_t ram_size,
} }
} }
i8042_init(i8259[1], i8259[12], 0x60); isa_dev = isa_create_simple("i8042", 0x60, 0x64);
isa_connect_irq(isa_dev, 0, i8259[1]);
isa_connect_irq(isa_dev, 1, i8259[12]);
DMA_init(0); DMA_init(0);
#ifdef HAS_AUDIO #ifdef HAS_AUDIO
audio_init(pci_enabled ? pci_bus : NULL, i8259); audio_init(pci_enabled ? pci_bus : NULL, i8259);