All properties must now use builtin registration helpers
or QAPI-based properties.

Signed-off-by: Marc-André Lureau <[email protected]>
---
 include/qom/object.h | 36 ------------------------------------
 qom/object.c         |  4 ++--
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/include/qom/object.h b/include/qom/object.h
index d0134a94281..ba2df54258b 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -1084,44 +1084,8 @@ ObjectProperty *object_property_try_add(Object *obj, 
const char *name,
                                         ObjectPropertyRelease *release,
                                         void *opaque, Error **errp);
 
-/**
- * object_property_add:
- * Same as object_property_try_add() with @errp hardcoded to
- * &error_abort.
- *
- * @obj: the object to add a property to
- * @name: the name of the property.  This can contain any character except for
- *  a forward slash.  In general, you should use hyphens '-' instead of
- *  underscores '_' when naming properties.
- * @type: the type name of the property.  This namespace is pretty loosely
- *   defined.  Sub namespaces are constructed by using a prefix and then
- *   to angle brackets.  For instance, the type 'virtio-net-pci' in the
- *   'link' namespace would be 'link<virtio-net-pci>'.
- * @get: The getter to be called to read a property.  If this is NULL, then
- *   the property cannot be read.
- * @set: the setter to be called to write a property.  If this is NULL,
- *   then the property cannot be written.
- * @release: called when the property is removed from the object.  This is
- *   meant to allow a property to free its opaque upon object
- *   destruction.  This may be NULL.
- * @opaque: an opaque pointer to pass to the callbacks for the property
- */
-ObjectProperty *object_property_add(Object *obj, const char *name,
-                                    const char *type,
-                                    ObjectPropertyAccessor *get,
-                                    ObjectPropertyAccessor *set,
-                                    ObjectPropertyRelease *release,
-                                    void *opaque);
-
 void object_property_del(Object *obj, const char *name);
 
-ObjectProperty *object_class_property_add(ObjectClass *klass, const char *name,
-                                          const char *type,
-                                          ObjectPropertyAccessor *get,
-                                          ObjectPropertyAccessor *set,
-                                          ObjectPropertyRelease *release,
-                                          void *opaque);
-
 /**
  * object_property_set_default_bool:
  * @prop: the property to set
diff --git a/qom/object.c b/qom/object.c
index 1e6c3a9f91d..c378d20c4db 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1225,7 +1225,7 @@ object_property_try_add(Object *obj, const char *name, 
const char *type,
     return prop;
 }
 
-ObjectProperty *
+static ObjectProperty *
 object_property_add(Object *obj, const char *name, const char *type,
                     ObjectPropertyAccessor *get,
                     ObjectPropertyAccessor *set,
@@ -1236,7 +1236,7 @@ object_property_add(Object *obj, const char *name, const 
char *type,
                                    opaque, &error_abort);
 }
 
-ObjectProperty *
+static ObjectProperty *
 object_class_property_add(ObjectClass *klass,
                           const char *name,
                           const char *type,

-- 
2.54.0


Reply via email to