diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-07-15 13:43:31 +0200 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-16 17:28:51 -0500 |
commit | ee6847d19be16c789b8bd4e553b7cd6701ba1245 (patch) | |
tree | 41845b3b1e8740ce97daf0582e124c6b6e0a6873 /hw/etraxfs_pic.c | |
parent | f114784f69ec3b9af342148025de14dbd1b429a5 (diff) | |
download | qemu-ee6847d19be16c789b8bd4e553b7cd6701ba1245.zip qemu-ee6847d19be16c789b8bd4e553b7cd6701ba1245.tar.gz qemu-ee6847d19be16c789b8bd4e553b7cd6701ba1245.tar.bz2 |
qdev: rework device properties.
This patch is a major overhaul of the device properties. The properties
are saved directly in the device state struct now, the linked list of
property values is gone.
Advantages:
* We don't have to maintain the list with the property values.
* The value in the property list and the value actually used by
the device can't go out of sync any more (used to happen for
the pci.devfn == -1 case) because there is only one place where
the value is stored.
* A record describing the property is required now, you can't set
random properties any more.
There are bus-specific and device-specific properties. The former
should be used for properties common to all bus drivers. Typical
use case is bus addressing, i.e. pci.devfn and i2c.address.
Properties have a PropertyInfo struct attached with name, size and
function pointers to parse and print properties. A few common property
types have PropertyInfos defined in qdev-properties.c. Drivers are free
to implement their own very special property parsers if needed.
Properties can have default values. If unset they are zero-filled.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/etraxfs_pic.c')
-rw-r--r-- | hw/etraxfs_pic.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/hw/etraxfs_pic.c b/hw/etraxfs_pic.c index 1c67427..e627218 100644 --- a/hw/etraxfs_pic.c +++ b/hw/etraxfs_pic.c @@ -140,7 +140,6 @@ static void etraxfs_pic_init(SysBusDevice *dev) struct etrax_pic *s = FROM_SYSBUS(typeof (*s), dev); int intr_vect_regs; - s->interrupt_vector = qdev_get_prop_ptr(&dev->qdev, "interrupt_vector"); qdev_init_gpio_in(&dev->qdev, irq_handler, 32); sysbus_init_irq(dev, &s->parent_irq); sysbus_init_irq(dev, &s->parent_nmi); @@ -149,10 +148,23 @@ static void etraxfs_pic_init(SysBusDevice *dev) sysbus_init_mmio(dev, R_MAX * 4, intr_vect_regs); } +static SysBusDeviceInfo etraxfs_pic_info = { + .init = etraxfs_pic_init, + .qdev.name = "etraxfs,pic", + .qdev.size = sizeof(struct etrax_pic), + .qdev.props = (Property[]) { + { + .name = "interrupt_vector", + .info = &qdev_prop_ptr, + .offset = offsetof(struct etrax_pic, interrupt_vector), + }, + {/* end of list */} + } +}; + static void etraxfs_pic_register(void) { - sysbus_register_dev("etraxfs,pic", sizeof (struct etrax_pic), - etraxfs_pic_init); + sysbus_register_withprop(&etraxfs_pic_info); } device_init(etraxfs_pic_register) |