| Message ID | 1477499426-9550-6-git-send-email-ehabkost@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 26 Oct 2016 14:30:23 -0200 Eduardo Habkost <ehabkost@redhat.com> wrote: > Instead of registering qdev static properties on instance_init, > register them as class properties, at qdev_class_set_props(). > > qdev_property_add_legacy() was replaced by an equivalent > qdev_class_property_add_legacy() function. > qdev_property_add_static(), on the other hand, can't be > eliminated yet because it is used by arm_cpu_post_init(). > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > Changes series v1 -> v2: > * (none) > > Changes v2 -> v3: > * Fix code alignemnt > * Reported-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/core/qdev.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++---------- > 1 file changed, 59 insertions(+), 12 deletions(-) > > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 85952e8..a88753c 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -739,12 +739,12 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v, > } > > /** > - * qdev_property_add_legacy: > - * @dev: Device to add the property to. > + * qdev_class_property_add_legacy: > + * @oc: Device to add the property to. s/Device/Class/ > * @prop: The qdev property definition. > * @errp: location to store error information. > * > - * Add a legacy QOM property to @dev for qdev property @prop. > + * Add a legacy QOM property to @oc for qdev property @prop. > * On error, store error in @errp. > * > * Legacy properties are string versions of QOM properties. The format of [...] "make V=1 check" fails for me with this patch applied: QTEST_QEMU_BINARY=aarch64-softmmu/qemu-system-aarch64 QTEST_QEMU_IMG=qemu-img MALLOC_PERTURB_=${MALLOC_PERTURB_:-$((RANDOM % 255 + 1))} gtester -k --verbose -m=quick tests/device-introspect-test tests/qom-test TEST: tests/device-introspect-test... (pid=275141) /aarch64/device/introspect/list: OK /aarch64/device/introspect/none: OK /aarch64/device/introspect/abstract: OK /aarch64/device/introspect/concrete: Unexpected error in object_property_find() at /home/imammedo/builds/qemu/qom/object.c:1002: Property '.disable_vnet_hdr' not found Broken pipe FAIL GTester: last random seed: R02Se62da1d190b80e3301072daa8e4eab92 (pid=275152) FAIL: tests/device-introspect-test TEST: tests/qom-test... (pid=275153)
On Thu, Oct 27, 2016 at 04:51:39PM +0200, Igor Mammedov wrote: > On Wed, 26 Oct 2016 14:30:23 -0200 > Eduardo Habkost <ehabkost@redhat.com> wrote: > > > Instead of registering qdev static properties on instance_init, > > register them as class properties, at qdev_class_set_props(). > > > > qdev_property_add_legacy() was replaced by an equivalent > > qdev_class_property_add_legacy() function. > > qdev_property_add_static(), on the other hand, can't be > > eliminated yet because it is used by arm_cpu_post_init(). > > > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > > --- > > Changes series v1 -> v2: > > * (none) > > > > Changes v2 -> v3: > > * Fix code alignemnt > > * Reported-by: Igor Mammedov <imammedo@redhat.com> > > --- > > hw/core/qdev.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++---------- > > 1 file changed, 59 insertions(+), 12 deletions(-) > > > > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > > index 85952e8..a88753c 100644 > > --- a/hw/core/qdev.c > > +++ b/hw/core/qdev.c > > @@ -739,12 +739,12 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v, > > } > > > > /** > > - * qdev_property_add_legacy: > > - * @dev: Device to add the property to. > > + * qdev_class_property_add_legacy: > > + * @oc: Device to add the property to. > s/Device/Class/ Thanks, I will fix it. > > > > * @prop: The qdev property definition. > > * @errp: location to store error information. > > * > > - * Add a legacy QOM property to @dev for qdev property @prop. > > + * Add a legacy QOM property to @oc for qdev property @prop. > > * On error, store error in @errp. > > * > > * Legacy properties are string versions of QOM properties. The format of > [...] > > "make V=1 check" fails for me with this patch applied: > > QTEST_QEMU_BINARY=aarch64-softmmu/qemu-system-aarch64 QTEST_QEMU_IMG=qemu-img MALLOC_PERTURB_=${MALLOC_PERTURB_:-$((RANDOM % 255 + 1))} gtester -k --verbose -m=quick tests/device-introspect-test tests/qom-test > TEST: tests/device-introspect-test... (pid=275141) > /aarch64/device/introspect/list: OK > /aarch64/device/introspect/none: OK > /aarch64/device/introspect/abstract: OK > /aarch64/device/introspect/concrete: Unexpected error in object_property_find() at /home/imammedo/builds/qemu/qom/object.c:1002: > Property '.disable_vnet_hdr' not found Oops! Caused by the e1000e PropertyInfo hack that I tried to remove yesterday. See "e1000e: QOM property & configuration cleanups".
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 85952e8..a88753c 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -739,12 +739,12 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v, } /** - * qdev_property_add_legacy: - * @dev: Device to add the property to. + * qdev_class_property_add_legacy: + * @oc: Device to add the property to. * @prop: The qdev property definition. * @errp: location to store error information. * - * Add a legacy QOM property to @dev for qdev property @prop. + * Add a legacy QOM property to @oc for qdev property @prop. * On error, store error in @errp. * * Legacy properties are string versions of QOM properties. The format of @@ -754,8 +754,8 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v, * Do not use this is new code! QOM Properties added through this interface * will be given names in the "legacy" namespace. */ -static void qdev_property_add_legacy(DeviceState *dev, Property *prop, - Error **errp) +static void qdev_class_property_add_legacy(ObjectClass *oc, Property *prop, + Error **errp) { gchar *name; @@ -765,11 +765,13 @@ static void qdev_property_add_legacy(DeviceState *dev, Property *prop, } name = g_strdup_printf("legacy-%s", prop->name); - object_property_add(OBJECT(dev), name, "str", - prop->info->print ? qdev_get_legacy_property : prop->info->get, - NULL, - NULL, - prop, errp); + object_class_property_add(oc, name, "str", + prop->info->print ? + qdev_get_legacy_property : + prop->info->get, + NULL, + NULL, + prop, errp); g_free(name); } @@ -844,6 +846,45 @@ void qdev_property_add_static(DeviceState *dev, Property *prop, qdev_property_set_to_default(dev, prop, &error_abort); } +/** + * qdev_class_property_add_static: + * @oc: Class to add the property to. + * @prop: The qdev property definition. + * @errp: location to store error information. + * + * Add a static QOM property to @oc for qdev property @prop. + * On error, store error in @errp. Static properties access data in a struct. + * The type of the QOM property is derived from prop->info. + */ +static void qdev_class_property_add_static(ObjectClass *oc, Property *prop, + Error **errp) +{ + Error *local_err = NULL; + + /* + * TODO qdev_prop_ptr does not have getters or setters. It must + * go now that it can be replaced with links. The test should be + * removed along with it: all static properties are read/write. + */ + if (!prop->info->get && !prop->info->set) { + return; + } + + object_class_property_add(oc, prop->name, prop->info->name, + prop->info->get, prop->info->set, + prop->info->release, + prop, &local_err); + + if (local_err) { + error_propagate(errp, local_err); + return; + } + + object_class_property_set_description(oc, prop->name, + prop->info->description, + &error_abort); +} + /* @qdev_alias_all_properties - Add alias properties to the source object for * all qdev properties on the target DeviceState. */ @@ -867,8 +908,15 @@ void qdev_alias_all_properties(DeviceState *target, Object *source) void device_class_set_props(DeviceClass *dc, Property *props) { + Property *prop; + ObjectClass *oc = OBJECT_CLASS(dc); + assert(!dc->props); dc->props = props; + for (prop = dc->props; prop && prop->name; prop++) { + qdev_class_property_add_legacy(oc, prop, &error_abort); + qdev_class_property_add_static(oc, prop, &error_abort); + } } static int qdev_add_hotpluggable_device(Object *obj, void *opaque) @@ -1068,8 +1116,7 @@ static void device_initfn(Object *obj) class = object_get_class(OBJECT(dev)); do { for (prop = DEVICE_CLASS(class)->props; prop && prop->name; prop++) { - qdev_property_add_legacy(dev, prop, &error_abort); - qdev_property_add_static(dev, prop, &error_abort); + qdev_property_set_to_default(dev, prop, &error_abort); } class = object_class_get_parent(class); } while (class != object_class_by_name(TYPE_DEVICE));
Instead of registering qdev static properties on instance_init, register them as class properties, at qdev_class_set_props(). qdev_property_add_legacy() was replaced by an equivalent qdev_class_property_add_legacy() function. qdev_property_add_static(), on the other hand, can't be eliminated yet because it is used by arm_cpu_post_init(). Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Changes series v1 -> v2: * (none) Changes v2 -> v3: * Fix code alignemnt * Reported-by: Igor Mammedov <imammedo@redhat.com> --- hw/core/qdev.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 12 deletions(-)