diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2013-06-15 10:53:44 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-06-15 10:53:44 +0000 |
| commit | 371a775dc18ece3ff7d77328d1ee28cb2d473706 (patch) | |
| tree | 328c5e856f25c5f0176d9361b641e8061e093ae2 /include/hw/isa/isa.h | |
| parent | 22bfa16ed3d4c9d534dcfe6f2381a654f32296b9 (diff) | |
| parent | fef7fbc92496f5f6d2b7395263830bce15ebf410 (diff) | |
Merge branch 'realize-isa.v2' of git://github.com/afaerber/qemu-cpu
* 'realize-isa.v2' of git://github.com/afaerber/qemu-cpu:
qdev: Drop FROM_QBUS() macro
isa: QOM'ify ISADevice
isa: QOM'ify ISABus
i8259: Convert PICCommonState to use QOM realizefn
kvm/i8259: QOM'ify some more
i8259: QOM'ify some more
i8254: Convert PITCommonState to QOM realizefn
kvm/i8254: QOM'ify some more
i8254: QOM'ify some more
isa: Use realizefn for ISADevice
cs4231a: QOM'ify some more
gus: QOM'ify some more
Diffstat (limited to 'include/hw/isa/isa.h')
| -rw-r--r-- | include/hw/isa/isa.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 82da37c11d..e1bf96ca69 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -22,17 +22,22 @@ typedef struct ISADeviceClass { DeviceClass parent_class; - int (*init)(ISADevice *dev); } ISADeviceClass; struct ISABus { - BusState qbus; + /*< private >*/ + BusState parent_obj; + /*< public >*/ + MemoryRegion *address_space_io; qemu_irq *irqs; }; struct ISADevice { - DeviceState qdev; + /*< private >*/ + DeviceState parent_obj; + /*< public >*/ + uint32_t isairq[2]; int nirqs; int ioport_id; |