From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 7 Jul 2020 16:05:50 +0000 (+0200)
Subject: qom: Rename qdev_get_type() to object_get_type()
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=90c69fb9fdd71f5e615145fd1dc43cdef61737b3;p=qmiga%2Fqemu.git

qom: Rename qdev_get_type() to object_get_type()

Commit 2f262e06f0 lifted qdev_get_type() from qdev to object without
renaming it accordingly.  Do that now.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-23-armbru@redhat.com>
---

diff --git a/qom/object.c b/qom/object.c
index 0213e87c86..e062ac5c82 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -2379,7 +2379,7 @@ object_class_property_add_tm(ObjectClass *klass, const char *name,
                                      NULL, NULL, prop);
 }
 
-static char *qdev_get_type(Object *obj, Error **errp)
+static char *object_get_type(Object *obj, Error **errp)
 {
     return g_strdup(object_get_typename(obj));
 }
@@ -2730,7 +2730,7 @@ void object_class_property_set_description(ObjectClass *klass,
 
 static void object_class_init(ObjectClass *klass, void *data)
 {
-    object_class_property_add_str(klass, "type", qdev_get_type,
+    object_class_property_add_str(klass, "type", object_get_type,
                                   NULL);
 }