diff mbox

[3/3] object: make some funcs static

Message ID 20161212173151.18092-3-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau Dec. 12, 2016, 5:31 p.m. UTC
There is no need to have those functions as public API.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 qom/object.c         |  4 ++--
 include/qom/object.h | 24 ------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

Comments

Michael Tokarev Jan. 12, 2017, 10:48 a.m. UTC | #1
12.12.2016 20:31, Marc-André Lureau wrote:
> There is no need to have those functions as public API.

Were "some" being object_initialize_with_type() and
object_new_with_type().

I'm applying this to -trivial, and Cc'ing Andreas, maybe
he will say more.

Thanks,

> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  qom/object.c         |  4 ++--
>  include/qom/object.h | 24 ------------------------
>  2 files changed, 2 insertions(+), 26 deletions(-)
> 
> diff --git a/qom/object.c b/qom/object.c
> index 7a05e35ed9..eb3d0f64e4 100644
> --- a/qom/object.c
> +++ b/qom/object.c
> @@ -351,7 +351,7 @@ static void object_post_init_with_type(Object *obj, TypeImpl *ti)
>      }
>  }
>  
> -void object_initialize_with_type(void *data, size_t size, TypeImpl *type)
> +static void object_initialize_with_type(void *data, size_t size, TypeImpl *type)
>  {
>      Object *obj = data;
>  
> @@ -467,7 +467,7 @@ static void object_finalize(void *data)
>      }
>  }
>  
> -Object *object_new_with_type(Type type)
> +static Object *object_new_with_type(Type type)
>  {
>      Object *obj;
>  
> diff --git a/include/qom/object.h b/include/qom/object.h
> index c5456db05d..e9791a210e 100644
> --- a/include/qom/object.h
> +++ b/include/qom/object.h
> @@ -586,18 +586,6 @@ struct InterfaceClass
>   */
>  Object *object_new(const char *typename);
>  
> -/**
> - * object_new_with_type:
> - * @type: The type of the object to instantiate.
> - *
> - * This function will initialize a new object using heap allocated memory.
> - * The returned object has a reference count of 1, and will be freed when
> - * the last reference is dropped.
> - *
> - * Returns: The newly allocated and instantiated object.
> - */
> -Object *object_new_with_type(Type type);
> -
>  /**
>   * object_new_with_props:
>   * @typename:  The name of the type of the object to instantiate.
> @@ -726,18 +714,6 @@ int object_set_propv(Object *obj,
>                       Error **errp,
>                       va_list vargs);
>  
> -/**
> - * object_initialize_with_type:
> - * @data: A pointer to the memory to be used for the object.
> - * @size: The maximum size available at @data for the object.
> - * @type: The type of the object to instantiate.
> - *
> - * This function will initialize an object.  The memory for the object should
> - * have already been allocated.  The returned object has a reference count of 1,
> - * and will be finalized when the last reference is dropped.
> - */
> -void object_initialize_with_type(void *data, size_t size, Type type);
> -
>  /**
>   * object_initialize:
>   * @obj: A pointer to the memory to be used for the object.
>
Paolo Bonzini Jan. 12, 2017, 3:38 p.m. UTC | #2
On 12/01/2017 11:48, Michael Tokarev wrote:
> 12.12.2016 20:31, Marc-André Lureau wrote:
>> There is no need to have those functions as public API.
> 
> Were "some" being object_initialize_with_type() and
> object_new_with_type().
> 
> I'm applying this to -trivial, and Cc'ing Andreas, maybe
> he will say more.

The idea here was to allow caching the type and speed up things.  But I
guess that QOM objects are very heavyweight, and thus we won't have for
example SCSIRequest as a QOM object.

Paolo

> Thanks,
> 
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>> ---
>>  qom/object.c         |  4 ++--
>>  include/qom/object.h | 24 ------------------------
>>  2 files changed, 2 insertions(+), 26 deletions(-)
>>
>> diff --git a/qom/object.c b/qom/object.c
>> index 7a05e35ed9..eb3d0f64e4 100644
>> --- a/qom/object.c
>> +++ b/qom/object.c
>> @@ -351,7 +351,7 @@ static void object_post_init_with_type(Object *obj, TypeImpl *ti)
>>      }
>>  }
>>  
>> -void object_initialize_with_type(void *data, size_t size, TypeImpl *type)
>> +static void object_initialize_with_type(void *data, size_t size, TypeImpl *type)
>>  {
>>      Object *obj = data;
>>  
>> @@ -467,7 +467,7 @@ static void object_finalize(void *data)
>>      }
>>  }
>>  
>> -Object *object_new_with_type(Type type)
>> +static Object *object_new_with_type(Type type)
>>  {
>>      Object *obj;
>>  
>> diff --git a/include/qom/object.h b/include/qom/object.h
>> index c5456db05d..e9791a210e 100644
>> --- a/include/qom/object.h
>> +++ b/include/qom/object.h
>> @@ -586,18 +586,6 @@ struct InterfaceClass
>>   */
>>  Object *object_new(const char *typename);
>>  
>> -/**
>> - * object_new_with_type:
>> - * @type: The type of the object to instantiate.
>> - *
>> - * This function will initialize a new object using heap allocated memory.
>> - * The returned object has a reference count of 1, and will be freed when
>> - * the last reference is dropped.
>> - *
>> - * Returns: The newly allocated and instantiated object.
>> - */
>> -Object *object_new_with_type(Type type);
>> -
>>  /**
>>   * object_new_with_props:
>>   * @typename:  The name of the type of the object to instantiate.
>> @@ -726,18 +714,6 @@ int object_set_propv(Object *obj,
>>                       Error **errp,
>>                       va_list vargs);
>>  
>> -/**
>> - * object_initialize_with_type:
>> - * @data: A pointer to the memory to be used for the object.
>> - * @size: The maximum size available at @data for the object.
>> - * @type: The type of the object to instantiate.
>> - *
>> - * This function will initialize an object.  The memory for the object should
>> - * have already been allocated.  The returned object has a reference count of 1,
>> - * and will be finalized when the last reference is dropped.
>> - */
>> -void object_initialize_with_type(void *data, size_t size, Type type);
>> -
>>  /**
>>   * object_initialize:
>>   * @obj: A pointer to the memory to be used for the object.
>>
> 
> 
>
diff mbox

Patch

diff --git a/qom/object.c b/qom/object.c
index 7a05e35ed9..eb3d0f64e4 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -351,7 +351,7 @@  static void object_post_init_with_type(Object *obj, TypeImpl *ti)
     }
 }
 
-void object_initialize_with_type(void *data, size_t size, TypeImpl *type)
+static void object_initialize_with_type(void *data, size_t size, TypeImpl *type)
 {
     Object *obj = data;
 
@@ -467,7 +467,7 @@  static void object_finalize(void *data)
     }
 }
 
-Object *object_new_with_type(Type type)
+static Object *object_new_with_type(Type type)
 {
     Object *obj;
 
diff --git a/include/qom/object.h b/include/qom/object.h
index c5456db05d..e9791a210e 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -586,18 +586,6 @@  struct InterfaceClass
  */
 Object *object_new(const char *typename);
 
-/**
- * object_new_with_type:
- * @type: The type of the object to instantiate.
- *
- * This function will initialize a new object using heap allocated memory.
- * The returned object has a reference count of 1, and will be freed when
- * the last reference is dropped.
- *
- * Returns: The newly allocated and instantiated object.
- */
-Object *object_new_with_type(Type type);
-
 /**
  * object_new_with_props:
  * @typename:  The name of the type of the object to instantiate.
@@ -726,18 +714,6 @@  int object_set_propv(Object *obj,
                      Error **errp,
                      va_list vargs);
 
-/**
- * object_initialize_with_type:
- * @data: A pointer to the memory to be used for the object.
- * @size: The maximum size available at @data for the object.
- * @type: The type of the object to instantiate.
- *
- * This function will initialize an object.  The memory for the object should
- * have already been allocated.  The returned object has a reference count of 1,
- * and will be finalized when the last reference is dropped.
- */
-void object_initialize_with_type(void *data, size_t size, Type type);
-
 /**
  * object_initialize:
  * @obj: A pointer to the memory to be used for the object.