Marc-André, may I have your R-by with the appended fixup?

diff --git a/include/qom/object.h b/include/qom/object.h
index 9338f0b986..70d8ea3e29 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1189,7 +1189,7 @@ void object_unref(void *obj);
  */
 ObjectProperty *object_property_try_add(Object *obj, const char *name,
                                         const char *type,
-                                        QAPITypeInfo *qapi_type,
+                                        const QAPITypeInfo *qapi_type,
                                         ObjectPropertyAccessor *get,
                                         ObjectPropertyAccessor *set,
                                         ObjectPropertyRelease *release,
diff --git a/qom/object.c b/qom/object.c
index f244bff6ae..cd0590c3fd 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1340,7 +1340,7 @@ void object_unref(void *objptr)
 
 ObjectProperty *
 object_property_try_add(Object *obj, const char *name, const char *type,
-                        QAPITypeInfo *qapi_type,
+                        const QAPITypeInfo *qapi_type,
                         ObjectPropertyAccessor *get,
                         ObjectPropertyAccessor *set,
                         ObjectPropertyRelease *release,
@@ -1358,7 +1358,7 @@ object_property_try_add(Object *obj, const char *name, 
const char *type,
         for (i = 0; i < INT16_MAX; ++i) {
             char *full_name = g_strdup_printf("%s[%d]", name_no_array, i);
 
-            ret = object_property_try_add(obj, full_name, type, NULL,
+            ret = object_property_try_add(obj, full_name, type, qapi_type,
                                           get, set, release, opaque, NULL);
             g_free(full_name);
             if (ret) {
@@ -1401,8 +1401,8 @@ object_property_add(Object *obj, const char *name, const 
char *type,
                     ObjectPropertyRelease *release,
                     void *opaque)
 {
-    return object_property_try_add(obj, name, type, NULL, get, set, release,
-                                   opaque, &error_abort);
+    return object_property_try_add(obj, name, type, qapi_type,
+                                   get, set, release, opaque, &error_abort);
 }
 
 ObjectProperty *


Reply via email to