| Message ID | 1427649571-4497-1-git-send-email-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
On 2015/3/30 1:19, Andreas Färber wrote: > Commit 8074264 (qom: Add description field in ObjectProperty struct) > introduced property descriptions and copied them for alias properties. > > Instead of using the caller-supplied property name, use the returned > property name for setting the description. This avoids an Error when > setting a property description for a property with literal "[*]" that > doesn't exist due to automatic property naming in object_property_add(). > > Cc: Gonglei <arei.gonglei@huawei.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > qom/object.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/qom/object.c b/qom/object.c > index d167038..b8dff43 100644 > --- a/qom/object.c > +++ b/qom/object.c > @@ -1761,7 +1761,7 @@ void object_property_add_alias(Object *obj, const char *name, > } > op->resolve = property_resolve_alias; > > - object_property_set_description(obj, name, > + object_property_set_description(obj, op->name, > target_prop->description, > &error_abort); > Looks good to me. I think this is a candidate for 2.3 rc2. Cc: qemu-stable <qemu-stable@nongnu.org> Reviewed-by: Gonglei <arei.gonglei@huawei.com> Regards, -Gonglei
On 29/03/2015 19:19, Andreas Färber wrote: > Commit 8074264 (qom: Add description field in ObjectProperty struct) > introduced property descriptions and copied them for alias properties. > > Instead of using the caller-supplied property name, use the returned > property name for setting the description. This avoids an Error when > setting a property description for a property with literal "[*]" that > doesn't exist due to automatic property naming in object_property_add(). > > Cc: Gonglei <arei.gonglei@huawei.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > qom/object.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/qom/object.c b/qom/object.c > index d167038..b8dff43 100644 > --- a/qom/object.c > +++ b/qom/object.c > @@ -1761,7 +1761,7 @@ void object_property_add_alias(Object *obj, const char *name, > } > op->resolve = property_resolve_alias; > > - object_property_set_description(obj, name, > + object_property_set_description(obj, op->name, > target_prop->description, > &error_abort); > > Acked-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/qom/object.c b/qom/object.c index d167038..b8dff43 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1761,7 +1761,7 @@ void object_property_add_alias(Object *obj, const char *name, } op->resolve = property_resolve_alias; - object_property_set_description(obj, name, + object_property_set_description(obj, op->name, target_prop->description, &error_abort);
Commit 8074264 (qom: Add description field in ObjectProperty struct) introduced property descriptions and copied them for alias properties. Instead of using the caller-supplied property name, use the returned property name for setting the description. This avoids an Error when setting a property description for a property with literal "[*]" that doesn't exist due to automatic property naming in object_property_add(). Cc: Gonglei <arei.gonglei@huawei.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de> --- qom/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)