diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-01-23 12:11:38 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-01-24 20:59:15 +0100 |
| commit | 385d8f222a30687f17ffff7a1a697be18de1cbe8 (patch) | |
| tree | aa1045a43daead08d9d60e924a5ddc173ef0e7d2 /hw/core/qdev.c | |
| parent | 4f67d30b5e74e060b8dbe10528829b47345cd6e8 (diff) | |
qdev: rename DeviceClass.props
Ensure that conflicts in the future will cause a syntax error.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/core/qdev.c')
| -rw-r--r-- | hw/core/qdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 8047ac9c26..100e266ec5 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -751,7 +751,7 @@ void qdev_alias_all_properties(DeviceState *target, Object *source) do { DeviceClass *dc = DEVICE_CLASS(class); - for (prop = dc->props; prop && prop->name; prop++) { + for (prop = dc->props_; prop && prop->name; prop++) { object_property_add_alias(source, prop->name, OBJECT(target), prop->name, &error_abort); @@ -954,7 +954,7 @@ static void device_initfn(Object *obj) class = object_get_class(OBJECT(dev)); do { - for (prop = DEVICE_CLASS(class)->props; prop && prop->name; prop++) { + for (prop = DEVICE_CLASS(class)->props_; prop && prop->name; prop++) { qdev_property_add_legacy(dev, prop, &error_abort); qdev_property_add_static(dev, prop); } @@ -1013,7 +1013,7 @@ static void device_class_base_init(ObjectClass *class, void *data) /* We explicitly look up properties in the superclasses, * so do not propagate them to the subclasses. */ - klass->props = NULL; + klass->props_ = NULL; } static void device_unparent(Object *obj) @@ -1063,7 +1063,7 @@ static void device_class_init(ObjectClass *class, void *data) void device_class_set_props(DeviceClass *dc, Property *props) { - dc->props = props; + dc->props_ = props; } void device_class_set_parent_reset(DeviceClass *dc, |