[Qemu-commits] [qemu/qemu] a18bb4: qom: Fix object_property_add_alias() with [*]

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1
      
https://github.com/qemu/qemu/commit/a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1
  Author: Andreas Färber <address@hidden>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M qom/object.c

  Log Message:
  -----------
  qom: Fix object_property_add_alias() with [*]

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 <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Cc: Michael S. Tsirkin <address@hidden>
Cc: address@hidden (v2.2+)
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 033a20359aaf93f4d8aa2be12558901e8e028baa
      
https://github.com/qemu/qemu/commit/033a20359aaf93f4d8aa2be12558901e8e028baa
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M qom/object.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' 
into staging

QOM infrastructure fixes and device conversions

* Fix for adding alias properties with [*]

# gpg: Signature made Tue Mar 31 11:59:00 2015 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <address@hidden>"
# gpg:                 aka "Andreas Färber <address@hidden>"

* remotes/afaerber/tags/qom-devices-for-peter:
  qom: Fix object_property_add_alias() with [*]

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/9e0ad3472dae...033a20359aaf