|
@@ -749,7 +749,7 @@ const PropertyInfo qdev_prop_array = {
|
|
|
|
|
|
/* --- public helpers --- */
|
|
/* --- public helpers --- */
|
|
|
|
|
|
-static Property *qdev_prop_walk(Property *props, const char *name)
|
|
|
|
|
|
+static const Property *qdev_prop_walk(const Property *props, const char *name)
|
|
{
|
|
{
|
|
if (!props) {
|
|
if (!props) {
|
|
return NULL;
|
|
return NULL;
|
|
@@ -763,10 +763,10 @@ static Property *qdev_prop_walk(Property *props, const char *name)
|
|
return NULL;
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
|
|
-static Property *qdev_prop_find(DeviceState *dev, const char *name)
|
|
|
|
|
|
+static const Property *qdev_prop_find(DeviceState *dev, const char *name)
|
|
{
|
|
{
|
|
ObjectClass *class;
|
|
ObjectClass *class;
|
|
- Property *prop;
|
|
|
|
|
|
+ const Property *prop;
|
|
|
|
|
|
/* device properties */
|
|
/* device properties */
|
|
class = object_get_class(OBJECT(dev));
|
|
class = object_get_class(OBJECT(dev));
|
|
@@ -840,7 +840,7 @@ void qdev_prop_set_string(DeviceState *dev, const char *name, const char *value)
|
|
|
|
|
|
void qdev_prop_set_enum(DeviceState *dev, const char *name, int value)
|
|
void qdev_prop_set_enum(DeviceState *dev, const char *name, int value)
|
|
{
|
|
{
|
|
- Property *prop;
|
|
|
|
|
|
+ const Property *prop;
|
|
|
|
|
|
prop = qdev_prop_find(dev, name);
|
|
prop = qdev_prop_find(dev, name);
|
|
object_property_set_str(OBJECT(dev), name,
|
|
object_property_set_str(OBJECT(dev), name,
|
|
@@ -956,7 +956,7 @@ const PropertyInfo qdev_prop_size = {
|
|
/* --- object link property --- */
|
|
/* --- object link property --- */
|
|
|
|
|
|
static ObjectProperty *create_link_property(ObjectClass *oc, const char *name,
|
|
static ObjectProperty *create_link_property(ObjectClass *oc, const char *name,
|
|
- Property *prop)
|
|
|
|
|
|
+ const Property *prop)
|
|
{
|
|
{
|
|
return object_class_property_add_link(oc, name, prop->link_type,
|
|
return object_class_property_add_link(oc, name, prop->link_type,
|
|
prop->offset,
|
|
prop->offset,
|
|
@@ -969,7 +969,7 @@ const PropertyInfo qdev_prop_link = {
|
|
.create = create_link_property,
|
|
.create = create_link_property,
|
|
};
|
|
};
|
|
|
|
|
|
-void qdev_property_add_static(DeviceState *dev, Property *prop)
|
|
|
|
|
|
+void qdev_property_add_static(DeviceState *dev, const Property *prop)
|
|
{
|
|
{
|
|
Object *obj = OBJECT(dev);
|
|
Object *obj = OBJECT(dev);
|
|
ObjectProperty *op;
|
|
ObjectProperty *op;
|
|
@@ -980,7 +980,7 @@ void qdev_property_add_static(DeviceState *dev, Property *prop)
|
|
field_prop_getter(prop->info),
|
|
field_prop_getter(prop->info),
|
|
field_prop_setter(prop->info),
|
|
field_prop_setter(prop->info),
|
|
prop->info->release,
|
|
prop->info->release,
|
|
- prop);
|
|
|
|
|
|
+ (Property *)prop);
|
|
|
|
|
|
object_property_set_description(obj, prop->name,
|
|
object_property_set_description(obj, prop->name,
|
|
prop->info->description);
|
|
prop->info->description);
|
|
@@ -994,7 +994,7 @@ void qdev_property_add_static(DeviceState *dev, Property *prop)
|
|
}
|
|
}
|
|
|
|
|
|
static void qdev_class_add_property(DeviceClass *klass, const char *name,
|
|
static void qdev_class_add_property(DeviceClass *klass, const char *name,
|
|
- Property *prop)
|
|
|
|
|
|
+ const Property *prop)
|
|
{
|
|
{
|
|
ObjectClass *oc = OBJECT_CLASS(klass);
|
|
ObjectClass *oc = OBJECT_CLASS(klass);
|
|
ObjectProperty *op;
|
|
ObjectProperty *op;
|
|
@@ -1007,7 +1007,7 @@ static void qdev_class_add_property(DeviceClass *klass, const char *name,
|
|
field_prop_getter(prop->info),
|
|
field_prop_getter(prop->info),
|
|
field_prop_setter(prop->info),
|
|
field_prop_setter(prop->info),
|
|
prop->info->release,
|
|
prop->info->release,
|
|
- prop);
|
|
|
|
|
|
+ (Property *)prop);
|
|
}
|
|
}
|
|
if (prop->set_default) {
|
|
if (prop->set_default) {
|
|
prop->info->set_default_value(op, prop);
|
|
prop->info->set_default_value(op, prop);
|
|
@@ -1046,7 +1046,7 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v,
|
|
* Do not use this in new code! QOM Properties added through this interface
|
|
* Do not use this in new code! QOM Properties added through this interface
|
|
* will be given names in the "legacy" namespace.
|
|
* will be given names in the "legacy" namespace.
|
|
*/
|
|
*/
|
|
-static void qdev_class_add_legacy_property(DeviceClass *dc, Property *prop)
|
|
|
|
|
|
+static void qdev_class_add_legacy_property(DeviceClass *dc, const Property *prop)
|
|
{
|
|
{
|
|
g_autofree char *name = NULL;
|
|
g_autofree char *name = NULL;
|
|
|
|
|
|
@@ -1058,12 +1058,12 @@ static void qdev_class_add_legacy_property(DeviceClass *dc, Property *prop)
|
|
name = g_strdup_printf("legacy-%s", prop->name);
|
|
name = g_strdup_printf("legacy-%s", prop->name);
|
|
object_class_property_add(OBJECT_CLASS(dc), name, "str",
|
|
object_class_property_add(OBJECT_CLASS(dc), name, "str",
|
|
prop->info->print ? qdev_get_legacy_property : prop->info->get,
|
|
prop->info->print ? qdev_get_legacy_property : prop->info->get,
|
|
- NULL, NULL, prop);
|
|
|
|
|
|
+ NULL, NULL, (Property *)prop);
|
|
}
|
|
}
|
|
|
|
|
|
-void device_class_set_props(DeviceClass *dc, Property *props)
|
|
|
|
|
|
+void device_class_set_props(DeviceClass *dc, const Property *props)
|
|
{
|
|
{
|
|
- Property *prop;
|
|
|
|
|
|
+ const Property *prop;
|
|
|
|
|
|
dc->props_ = props;
|
|
dc->props_ = props;
|
|
for (prop = props; prop && prop->name; prop++) {
|
|
for (prop = props; prop && prop->name; prop++) {
|