diff options
author | Gerd Hoffmann | 2009-07-15 13:43:31 +0200 |
---|---|---|
committer | Anthony Liguori | 2009-07-17 00:28:51 +0200 |
commit | ee6847d19be16c789b8bd4e553b7cd6701ba1245 (patch) | |
tree | 41845b3b1e8740ce97daf0582e124c6b6e0a6873 /hw/iommu.c | |
parent | monitor: Add port write command (diff) | |
download | qemu-ee6847d19be16c789b8bd4e553b7cd6701ba1245.tar.gz qemu-ee6847d19be16c789b8bd4e553b7cd6701ba1245.tar.xz qemu-ee6847d19be16c789b8bd4e553b7cd6701ba1245.zip |
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/iommu.c')
-rw-r--r-- | hw/iommu.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/hw/iommu.c b/hw/iommu.c index f12b79756b..abf517f1dc 100644 --- a/hw/iommu.c +++ b/hw/iommu.c @@ -373,7 +373,7 @@ void *iommu_init(target_phys_addr_t addr, uint32_t version, qemu_irq irq) IOMMUState *d; dev = qdev_create(NULL, "iommu"); - qdev_set_prop_int(dev, "version", version); + qdev_prop_set_uint32(dev, "version", version); qdev_init(dev); s = sysbus_from_qdev(dev); sysbus_connect_irq(s, 0, irq); @@ -391,8 +391,6 @@ static void iommu_init1(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq); - s->version = qdev_get_prop_int(&dev->qdev, "version", 0); - io = cpu_register_io_memory(iommu_mem_read, iommu_mem_write, s); sysbus_init_mmio(dev, IOMMU_NREGS * sizeof(uint32_t), io); @@ -405,9 +403,13 @@ static SysBusDeviceInfo iommu_info = { .init = iommu_init1, .qdev.name = "iommu", .qdev.size = sizeof(IOMMUState), - .qdev.props = (DevicePropList[]) { - {.name = "version", .type = PROP_TYPE_INT}, - {.name = NULL} + .qdev.props = (Property[]) { + { + .name = "version", + .info = &qdev_prop_uint32, + .offset = offsetof(IOMMUState, version), + }, + {/* end of property list */} } }; |