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/syborg_serial.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/syborg_serial.c')
-rw-r--r-- | hw/syborg_serial.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/hw/syborg_serial.c b/hw/syborg_serial.c index f430508018..f69342154a 100644 --- a/hw/syborg_serial.c +++ b/hw/syborg_serial.c @@ -59,7 +59,7 @@ enum { typedef struct { SysBusDevice busdev; uint32_t int_enable; - int fifo_size; + uint32_t fifo_size; uint32_t *read_fifo; int read_pos; int read_count; @@ -329,7 +329,6 @@ static void syborg_serial_init(SysBusDevice *dev) qemu_chr_add_handlers(s->chr, syborg_serial_can_receive, syborg_serial_receive, syborg_serial_event, s); } - s->fifo_size = qdev_get_prop_int(&dev->qdev, "fifo-size", 16); if (s->fifo_size <= 0) { fprintf(stderr, "syborg_serial: fifo too small\n"); s->fifo_size = 16; @@ -340,10 +339,24 @@ static void syborg_serial_init(SysBusDevice *dev) syborg_serial_save, syborg_serial_load, s); } +static SysBusDeviceInfo syborg_serial_info = { + .init = syborg_serial_init, + .qdev.name = "syborg,serial", + .qdev.size = sizeof(SyborgSerialState), + .qdev.props = (Property[]) { + { + .name = "fifo-size", + .info = &qdev_prop_uint32, + .offset = offsetof(SyborgSerialState, fifo_size), + .defval = (uint32_t[]) { 16 }, + }, + {/* end of list */} + } +}; + static void syborg_serial_register_devices(void) { - sysbus_register_dev("syborg,serial", sizeof(SyborgSerialState), - syborg_serial_init); + sysbus_register_withprop(&syborg_serial_info); } device_init(syborg_serial_register_devices) |