diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-09-10 11:43:26 +0200 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2009-09-10 19:47:58 +0400 |
| commit | 86c861578453b544fa67ad50d28c4460bee068c5 (patch) | |
| tree | 639b1de76d4c0fdbd8ae2501da3288bc62ae28ce /hw/pc.c | |
| parent | 316940b06273c43ec8d58fcb0908267f7fa5d333 (diff) | |
| download | focaccia-qemu-86c861578453b544fa67ad50d28c4460bee068c5.tar.gz focaccia-qemu-86c861578453b544fa67ad50d28c4460bee068c5.zip | |
qdev: drop iobase properties from isa bus
Lot of ISA devices work at fixed addresses, so having iobase as bus property doesn't make much sense. Devices which can have different iobases will get a device property. Also simply hard-code stuff which can't be configured anyway. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/pc.c')
| -rw-r--r-- | hw/pc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pc.c b/hw/pc.c index 872cb3ad5b..0219961348 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1373,7 +1373,7 @@ static void pc_init1(ram_addr_t ram_size, } } - isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12); + isa_dev = isa_create_simple("i8042", 1, 12); DMA_init(0); #ifdef HAS_AUDIO audio_init(pci_enabled ? pci_bus : NULL, isa_irq); @@ -1383,7 +1383,7 @@ static void pc_init1(ram_addr_t ram_size, dinfo = drive_get(IF_FLOPPY, 0, i); fd[i] = dinfo ? dinfo->bdrv : NULL; } - floppy_controller = fdctrl_init_isa(6, 2, 0x3f0, fd); + floppy_controller = fdctrl_init_isa(fd); cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd); |