aboutsummaryrefslogtreecommitdiff
path: root/hw/slavio_timer.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-07-15 13:43:31 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-16 17:28:51 -0500
commitee6847d19be16c789b8bd4e553b7cd6701ba1245 (patch)
tree41845b3b1e8740ce97daf0582e124c6b6e0a6873 /hw/slavio_timer.c
parentf114784f69ec3b9af342148025de14dbd1b429a5 (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/slavio_timer.c')
-rw-r--r--hw/slavio_timer.c31
1 files changed, 20 insertions, 11 deletions
diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c
index df9afb0eec..21924f8716 100644
--- a/hw/slavio_timer.c
+++ b/hw/slavio_timer.c
@@ -374,9 +374,9 @@ static SLAVIO_TIMERState *slavio_timer_init(target_phys_addr_t addr,
SLAVIO_TIMERState *d;
dev = qdev_create(NULL, "slavio_timer");
- qdev_set_prop_int(dev, "slave_index", slave_index);
- qdev_set_prop_int(dev, "num_slaves", num_slaves);
- qdev_set_prop_ptr(dev, "master", master);
+ qdev_prop_set_uint32(dev, "slave_index", slave_index);
+ qdev_prop_set_uint32(dev, "num_slaves", num_slaves);
+ qdev_prop_set_ptr(dev, "master", master);
qdev_init(dev);
s = sysbus_from_qdev(dev);
sysbus_connect_irq(s, 0, irq);
@@ -394,9 +394,6 @@ static void slavio_timer_init1(SysBusDevice *dev)
QEMUBH *bh;
sysbus_init_irq(dev, &s->irq);
- s->num_slaves = qdev_get_prop_int(&dev->qdev, "num_slaves", 0);
- s->slave_index = qdev_get_prop_int(&dev->qdev, "slave_index", 0);
- s->master = qdev_get_prop_ptr(&dev->qdev, "master");
if (!s->master || s->slave_index < s->master->num_slaves) {
bh = qemu_bh_new(slavio_timer_irq, s);
@@ -438,11 +435,23 @@ static SysBusDeviceInfo slavio_timer_info = {
.init = slavio_timer_init1,
.qdev.name = "slavio_timer",
.qdev.size = sizeof(SLAVIO_TIMERState),
- .qdev.props = (DevicePropList[]) {
- {.name = "num_slaves", .type = PROP_TYPE_INT},
- {.name = "slave_index", .type = PROP_TYPE_INT},
- {.name = "master", .type = PROP_TYPE_PTR},
- {.name = NULL}
+ .qdev.props = (Property[]) {
+ {
+ .name = "num_slaves",
+ .info = &qdev_prop_uint32,
+ .offset = offsetof(SLAVIO_TIMERState, num_slaves),
+ },
+ {
+ .name = "slave_index",
+ .info = &qdev_prop_uint32,
+ .offset = offsetof(SLAVIO_TIMERState, slave_index),
+ },
+ {
+ .name = "master",
+ .info = &qdev_prop_ptr,
+ .offset = offsetof(SLAVIO_TIMERState, master),
+ },
+ {/* end of property list */}
}
};