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/arm_sysctl.c | |
parent | f114784f69ec3b9af342148025de14dbd1b429a5 (diff) |
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/arm_sysctl.c')
-rw-r--r-- | hw/arm_sysctl.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c index c9d1e3ff15..bb005c8015 100644 --- a/hw/arm_sysctl.c +++ b/hw/arm_sysctl.c @@ -194,7 +194,6 @@ static void arm_sysctl_init1(SysBusDevice *dev) arm_sysctl_state *s = FROM_SYSBUS(arm_sysctl_state, dev); int iomemtype; - s->sys_id = qdev_get_prop_int(&dev->qdev, "sys_id", 0); /* The MPcore bootloader uses these flags to start secondary CPUs. We don't use a bootloader, so do this here. */ s->flags = 3; @@ -210,15 +209,28 @@ void arm_sysctl_init(uint32_t base, uint32_t sys_id) DeviceState *dev; dev = qdev_create(NULL, "realview_sysctl"); - qdev_set_prop_int(dev, "sys_id", sys_id); + qdev_prop_set_uint32(dev, "sys_id", sys_id); qdev_init(dev); sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); } +static SysBusDeviceInfo arm_sysctl_info = { + .init = arm_sysctl_init1, + .qdev.name = "realview_sysctl", + .qdev.size = sizeof(arm_sysctl_state), + .qdev.props = (Property[]) { + { + .name = "sys_id", + .info = &qdev_prop_uint32, + .offset = offsetof(arm_sysctl_state, sys_id), + }, + {/* end of list */} + } +}; + static void arm_sysctl_register_devices(void) { - sysbus_register_dev("realview_sysctl", sizeof(arm_sysctl_state), - arm_sysctl_init1); + sysbus_register_withprop(&arm_sysctl_info); } device_init(arm_sysctl_register_devices) |