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/isa-bus.c | |
| parent | 316940b06273c43ec8d58fcb0908267f7fa5d333 (diff) | |
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/isa-bus.c')
| -rw-r--r-- | hw/isa-bus.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 2843b5132c..fde066acc9 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -35,11 +35,6 @@ static struct BusInfo isa_bus_info = { .name = "ISA", .size = sizeof(ISABus), .print_dev = isabus_dev_print, - .props = (Property[]) { - DEFINE_PROP_HEX32("iobase", ISADevice, iobase[0], -1), - DEFINE_PROP_HEX32("iobase2", ISADevice, iobase[1], -1), - DEFINE_PROP_END_OF_LIST(), - } }; ISABus *isa_bus_new(DeviceState *dev) @@ -122,8 +117,7 @@ void isa_qdev_register(ISADeviceInfo *info) qdev_register(&info->qdev); } -ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2, - uint32_t irq, uint32 irq2) +ISADevice *isa_create_simple(const char *name, uint32_t irq, uint32 irq2) { DeviceState *dev; ISADevice *isa; @@ -134,8 +128,6 @@ ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2 } dev = qdev_create(&isabus->qbus, name); isa = DO_UPCAST(ISADevice, qdev, dev); - isa->iobase[0] = iobase; - isa->iobase[1] = iobase2; qdev_init(dev); if (irq != -1) { isa_connect_irq(isa, 0, irq); |