Skip to content

Commit

Permalink
qdev: move instance properties to class properties
Browse files Browse the repository at this point in the history
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200110153039.1379601-21-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
elmarco authored and bonzini committed Jan 24, 2020
1 parent 385d8f2 commit c68fc93
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions hw/core/qdev.c
Expand Up @@ -944,14 +944,6 @@ static void device_initfn(Object *obj)
dev->realized = false;
dev->allow_unplug_during_migration = false;

object_property_add_bool(obj, "realized",
device_get_realized, device_set_realized, NULL);
object_property_add_bool(obj, "hotpluggable",
device_get_hotpluggable, NULL, NULL);
object_property_add_bool(obj, "hotplugged",
device_get_hotplugged, NULL,
&error_abort);

class = object_get_class(OBJECT(dev));
do {
for (prop = DEVICE_CLASS(class)->props_; prop && prop->name; prop++) {
Expand All @@ -961,9 +953,6 @@ static void device_initfn(Object *obj)
class = object_class_get_parent(class);
} while (class != object_class_by_name(TYPE_DEVICE));

object_property_add_link(OBJECT(dev), "parent_bus", TYPE_BUS,
(Object **)&dev->parent_bus, NULL, 0,
&error_abort);
QLIST_INIT(&dev->gpios);
}

Expand Down Expand Up @@ -1059,6 +1048,19 @@ static void device_class_init(ObjectClass *class, void *data)
dc->hotpluggable = true;
dc->user_creatable = true;
vc->get_id = device_vmstate_if_get_id;

object_class_property_add_bool(class, "realized",
device_get_realized, device_set_realized,
&error_abort);
object_class_property_add_bool(class, "hotpluggable",
device_get_hotpluggable, NULL,
&error_abort);
object_class_property_add_bool(class, "hotplugged",
device_get_hotplugged, NULL,
&error_abort);
object_class_property_add_link(class, "parent_bus", TYPE_BUS,
offsetof(DeviceState, parent_bus), NULL, 0,
&error_abort);
}

void device_class_set_props(DeviceClass *dc, Property *props)
Expand Down

0 comments on commit c68fc93

Please sign in to comment.