From: Gonglei <arei.gonglei@huawei.com>
Date: Tue, 7 Oct 2014 06:33:22 +0000 (+0800)
Subject: qdev: Set the object property's description to the qdev property's.
X-Git-Tag: qemu-xen-4.6.0-rc1~134^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b8c9cd5c8cf2a105dab8ac3e5799e3b27bfda9d5;p=qemu-upstream-4.6-testing.git

qdev: Set the object property's description to the qdev property's.

Set all static qdev properties' descriptions to object property's
description.

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 7685e0728..a1e924777 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -826,6 +826,11 @@ void qdev_property_add_static(DeviceState *dev, Property *prop,
         error_propagate(errp, local_err);
         return;
     }
+
+    object_property_set_description(obj, prop->name,
+                                    prop->info->description,
+                                    &error_abort);
+
     if (prop->qtype == QTYPE_NONE) {
         return;
     }