diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-06-07 13:49:13 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-06-07 14:55:33 +0200 |
| commit | 4a17cc4f285d7ffe41847bf728cd88c736237416 (patch) | |
| tree | 8660ca33cdb5f9852502a9287587ff27b5a529bc /include/hw/audio | |
| parent | 2ae0e48d5fd2cb7c5bc5c392edf2dc33ac2959d0 (diff) | |
| download | focaccia-qemu-4a17cc4f285d7ffe41847bf728cd88c736237416.tar.gz focaccia-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 'include/hw/audio')
| -rw-r--r-- | include/hw/audio/pcspk.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/include/hw/audio/pcspk.h b/include/hw/audio/pcspk.h index 7625137991..ef95dd1360 100644 --- a/include/hw/audio/pcspk.h +++ b/include/hw/audio/pcspk.h @@ -32,14 +32,16 @@ static inline ISADevice *pcspk_init(ISABus *bus, ISADevice *pit) { - ISADevice *dev; + DeviceState *dev; + ISADevice *isadev; - dev = isa_create(bus, TYPE_PC_SPEAKER); - qdev_prop_set_uint32(&dev->qdev, "iobase", 0x61); - qdev_prop_set_ptr(&dev->qdev, "pit", pit); - qdev_init_nofail(&dev->qdev); + isadev = isa_create(bus, TYPE_PC_SPEAKER); + dev = DEVICE(isadev); + qdev_prop_set_uint32(dev, "iobase", 0x61); + qdev_prop_set_ptr(dev, "pit", pit); + qdev_init_nofail(dev); - return dev; + return isadev; } #endif /* !HW_PCSPK_H */ |