[Qemu-devel] [PULL for-2.3 0/1] QOM devices patch queue 2015-03-31

[Qemu-devel] [PULL for-2.3 0/1] QOM devices patch queue 2015-03-31

[Andreas Färber]

Hello Peter,

This is my QOM (devices) patch queue. Please pull.

Regards,
Andreas

Cc: Peter Maydell <peter.maydell@linaro.org>

The following changes since commit adbeb458eece2263039e5a1f6501b87ae3713319:

  Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150330' into staging (2015-03-31 09:56:48 +0100)

are available in the git repository at:

  git://github.com/afaerber/qemu-cpu.git tags/qom-devices-for-peter

for you to fetch changes up to a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1:

  qom: Fix object_property_add_alias() with [*] (2015-03-31 12:56:48 +0200)

----------------------------------------------------------------
QOM infrastructure fixes and device conversions

* Fix for adding alias properties with [*]

----------------------------------------------------------------
Andreas Färber (1):
      qom: Fix object_property_add_alias() with [*]

 qom/object.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PULL 1/1] qom: Fix object_property_add_alias() with [*]

[Andreas Färber]

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().

Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: qemu-stable@nongnu.org (v2.2+)
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);
 
-- 
2.1.4

Re: [Qemu-devel] [PULL for-2.3 0/1] QOM devices patch queue 2015-03-31

[Peter Maydell]

On 31 March 2015 at 12:06, Andreas Färber <afaerber@suse.de> wrote:
> Hello Peter,
>
> This is my QOM (devices) patch queue. Please pull.
>
> Regards,
> Andreas
>
> Cc: Peter Maydell <peter.maydell@linaro.org>
>
> The following changes since commit adbeb458eece2263039e5a1f6501b87ae3713319:
>
>   Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150330' into staging (2015-03-31 09:56:48 +0100)
>
> are available in the git repository at:
>
>   git://github.com/afaerber/qemu-cpu.git tags/qom-devices-for-peter
>
> for you to fetch changes up to a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1:
>
>   qom: Fix object_property_add_alias() with [*] (2015-03-31 12:56:48 +0200)
>
> ----------------------------------------------------------------
> QOM infrastructure fixes and device conversions
>
> * Fix for adding alias properties with [*]

Applied, thanks.

-- PMM