mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 17:53:56 -06:00
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>
This commit is contained in:
parent
f114784f69
commit
ee6847d19b
47 changed files with 921 additions and 391 deletions
22
hw/armv7m.c
22
hw/armv7m.c
|
@ -127,7 +127,6 @@ static void bitband_init(SysBusDevice *dev)
|
|||
BitBandState *s = FROM_SYSBUS(BitBandState, dev);
|
||||
int iomemtype;
|
||||
|
||||
s->base = qdev_get_prop_int(&dev->qdev, "base", 0);
|
||||
iomemtype = cpu_register_io_memory(bitband_readfn, bitband_writefn,
|
||||
&s->base);
|
||||
sysbus_init_mmio(dev, 0x02000000, iomemtype);
|
||||
|
@ -138,12 +137,12 @@ static void armv7m_bitband_init(void)
|
|||
DeviceState *dev;
|
||||
|
||||
dev = qdev_create(NULL, "ARM,bitband-memory");
|
||||
qdev_set_prop_int(dev, "base", 0x20000000);
|
||||
qdev_prop_set_uint32(dev, "base", 0x20000000);
|
||||
qdev_init(dev);
|
||||
sysbus_mmio_map(sysbus_from_qdev(dev), 0, 0x22000000);
|
||||
|
||||
dev = qdev_create(NULL, "ARM,bitband-memory");
|
||||
qdev_set_prop_int(dev, "base", 0x40000000);
|
||||
qdev_prop_set_uint32(dev, "base", 0x40000000);
|
||||
qdev_init(dev);
|
||||
sysbus_mmio_map(sysbus_from_qdev(dev), 0, 0x42000000);
|
||||
}
|
||||
|
@ -238,10 +237,23 @@ qemu_irq *armv7m_init(int flash_size, int sram_size,
|
|||
return pic;
|
||||
}
|
||||
|
||||
static SysBusDeviceInfo bitband_info = {
|
||||
.init = bitband_init,
|
||||
.qdev.name = "ARM,bitband-memory",
|
||||
.qdev.size = sizeof(BitBandState),
|
||||
.qdev.props = (Property[]) {
|
||||
{
|
||||
.name = "base",
|
||||
.info = &qdev_prop_hex32,
|
||||
.offset = offsetof(BitBandState, base),
|
||||
},
|
||||
{/* end of list */}
|
||||
}
|
||||
};
|
||||
|
||||
static void armv7m_register_devices(void)
|
||||
{
|
||||
sysbus_register_dev("ARM,bitband-memory", sizeof(BitBandState),
|
||||
bitband_init);
|
||||
sysbus_register_withprop(&bitband_info);
|
||||
}
|
||||
|
||||
device_init(armv7m_register_devices)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue