david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qom: register qdev properties also as non-legacy properties

Browse Source 
Push legacy properties into a "legacy-..." namespace, and make them
available with correct types too.

For now, all properties come in both variants.  This need not be the
case for string properties.  We will revisit this after -device is
changed to actually use the legacy properties.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2011-12-18 17:05:11 +01:00 committed by Anthony Liguori
parent cafe5bdb9a
commit ca2cc78888
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/qdev.c
View File

@ -80,6 +80,9 @@ static DeviceInfo *qdev_find_info(BusInfo *bus_info, const char *name)
return NULL; return NULL;
} }
static void qdev_property_add_legacy(DeviceState *dev, Property *prop,
Error **errp);
static DeviceState *qdev_create_from_info(BusState *bus, DeviceInfo *info) static DeviceState *qdev_create_from_info(BusState *bus, DeviceInfo *info)
{ {
DeviceState *dev; DeviceState *dev;
@ -104,10 +107,12 @@ static DeviceState *qdev_create_from_info(BusState *bus, DeviceInfo *info)
for (prop = dev->info->props; prop && prop->name; prop++) { for (prop = dev->info->props; prop && prop->name; prop++) {
qdev_property_add_legacy(dev, prop, NULL); qdev_property_add_legacy(dev, prop, NULL);
qdev_property_add_static(dev, prop, NULL);
} }
for (prop = dev->info->bus_info->props; prop && prop->name; prop++) { for (prop = dev->info->bus_info->props; prop && prop->name; prop++) {
qdev_property_add_legacy(dev, prop, NULL); qdev_property_add_legacy(dev, prop, NULL);
qdev_property_add_static(dev, prop, NULL);
} }
qdev_property_add_str(dev, "type", qdev_get_type, NULL, NULL); qdev_property_add_str(dev, "type", qdev_get_type, NULL, NULL);
@ -1172,7 +1177,7 @@ static void qdev_set_legacy_property(DeviceState *dev, Visitor *v, void *opaque,
* @qdev_add_legacy_property - adds a legacy property * @qdev_add_legacy_property - adds a legacy property
* *
* Do not use this is new code! Properties added through this interface will * Do not use this is new code! Properties added through this interface will
* be given types in the "legacy<>" type namespace. * be given names and types in the "legacy" namespace.
* *
* Legacy properties are always processed as strings. The format of the string * Legacy properties are always processed as strings. The format of the string
* depends on the property type. * depends on the property type.
@ -1180,18 +1185,35 @@ static void qdev_set_legacy_property(DeviceState *dev, Visitor *v, void *opaque,
void qdev_property_add_legacy(DeviceState *dev, Property *prop, void qdev_property_add_legacy(DeviceState *dev, Property *prop,
Error **errp) Error **errp)
{ {
gchar *type; gchar *name, *type;
name = g_strdup_printf("legacy-%s", prop->name);
type = g_strdup_printf("legacy<%s>", type = g_strdup_printf("legacy<%s>",
prop->info->legacy_name ?: prop->info->name); prop->info->legacy_name ?: prop->info->name);
qdev_property_add(dev, prop->name, type, qdev_property_add(dev, name, type,
prop->info->print ? qdev_get_legacy_property : NULL, prop->info->print ? qdev_get_legacy_property : NULL,
prop->info->parse ? qdev_set_legacy_property : NULL, prop->info->parse ? qdev_set_legacy_property : NULL,
NULL, NULL,
prop, errp); prop, errp);
g_free(type); g_free(type);
g_free(name);
}
/**
* @qdev_property_add_static - add a @Property to a device.
*
* Static properties access data in a struct. The actual type of the
* property and the field depends on the property type.
*/
void qdev_property_add_static(DeviceState *dev, Property *prop,
Error **errp)
{
qdev_property_add(dev, prop->name, prop->info->name,
prop->info->get, prop->info->set,
NULL,
prop, errp);
} }
DeviceState *qdev_get_root(void) DeviceState *qdev_get_root(void)

7
hw/qdev.h
View File

@ -487,11 +487,10 @@ const char *qdev_property_get_type(DeviceState *dev, const char *name,
Error **errp); Error **errp);
/** /**
* @qdev_property_add_legacy - add a legacy @Property to a device * @qdev_property_add_static - add a @Property to a device referencing a
* * field in a struct.
* DO NOT USE THIS IN NEW CODE!
*/ */
void qdev_property_add_legacy(DeviceState *dev, Property *prop, Error **errp); void qdev_property_add_static(DeviceState *dev, Property *prop, Error **errp);
/** /**
* @qdev_get_root - returns the root device of the composition tree * @qdev_get_root - returns the root device of the composition tree