diff options
| author | Andreas Färber | 2013-06-07 13:49:13 +0200 |
|---|---|---|
| committer | Andreas Färber | 2013-06-07 14:55:33 +0200 |
| commit | 4a17cc4f285d7ffe41847bf728cd88c736237416 (patch) | |
| tree | 8660ca33cdb5f9852502a9287587ff27b5a529bc /hw/isa | |
| parent | isa: QOM'ify ISABus (diff) | |
| download | qemu-4a17cc4f285d7ffe41847bf728cd88c736237416.tar.gz qemu-4a17cc4f285d7ffe41847bf728cd88c736237416.tar.xz qemu-4a17cc4f285d7ffe41847bf728cd88c736237416.zip | |
isa: QOM'ify ISADevice
Rename its parent field and use DEVICE() where necessary.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/isa')
| -rw-r--r-- | hw/isa/i82378.c | 2 | ||||
| -rw-r--r-- | hw/isa/isa-bus.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 278e178173..a24cb98cba 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -201,7 +201,7 @@ static void i82378_init(DeviceState *dev, I82378State *s) /* 2 82C37 (dma) */ isa = isa_create_simple(isabus, "i82374"); - qdev_connect_gpio_out(&isa->qdev, 0, s->out[1]); + qdev_connect_gpio_out(DEVICE(isa), 0, s->out[1]); /* timer */ isa_create_simple(isabus, "mc146818rtc"); diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 7aa9b89b5c..136d17ede0 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -156,7 +156,7 @@ ISADevice *isa_create_simple(ISABus *bus, const char *name) ISADevice *dev; dev = isa_create(bus, name); - qdev_init_nofail(&dev->qdev); + qdev_init_nofail(DEVICE(dev)); return dev; } @@ -240,7 +240,7 @@ static void isabus_register_types(void) static char *isabus_get_fw_dev_path(DeviceState *dev) { - ISADevice *d = (ISADevice*)dev; + ISADevice *d = ISA_DEVICE(dev); char path[40]; int off; |