motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 01:03:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qom: Put name parameter before value / visitor parameter

Browse source 
The object_property_set_FOO() setters take property name and value in
an unusual order:

    void object_property_set_FOO(Object *obj, FOO_TYPE value,
                                 const char *name, Error **errp)

Having to pass value before name feels grating.  Swap them.

Same for object_property_set(), object_property_get(), and
object_property_parse().

Convert callers with this Coccinelle script:

    @@
    identifier fun = {
        object_property_get, object_property_parse, object_property_set_str,
        object_property_set_link, object_property_set_bool,
        object_property_set_int, object_property_set_uint, object_property_set,
        object_property_set_qobject
    };
    expression obj, v, name, errp;
    @@
    -    fun(obj, v, name, errp)
    +    fun(obj, name, v, errp)

Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information".  Convert that one manually.

Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.

Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually.  The other files using RXCPU that way don't need
conversion.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
This commit is contained in:
Markus Armbruster 2020-07-07 18:05:54 +02:00
parent 1c94a35164
commit 5325cc34a2
138 changed files with 712 additions and 741 deletions
Download patch file Download diff file Expand all files Collapse all files

44
include/qom/object.h
View file

@ -1203,26 +1203,26 @@ void object_unparent(Object *obj);
/**
* object_property_get:
* @obj: the object
* @name: the name of the property
* @v: the visitor that will receive the property value. This should be an
* Output visitor and the data will be written with @name as the name.
* @name: the name of the property
* @errp: returns an error if this function fails
*
* Reads a property from a object.
*/
void object_property_get(Object *obj, Visitor *v, const char *name,
void object_property_get(Object *obj, const char *name, Visitor *v,
Error **errp);
/**
* object_property_set_str:
* @value: the value to be written to the property
* @name: the name of the property
* @value: the value to be written to the property
* @errp: returns an error if this function fails
*
* Writes a string value to a property.
*/
void object_property_set_str(Object *obj, const char *value,
const char *name, Error **errp);
void object_property_set_str(Object *obj, const char *name,
const char *value, Error **errp);
/**
* object_property_get_str:
@ -1239,8 +1239,8 @@ char *object_property_get_str(Object *obj, const char *name,
/**
* object_property_set_link:
* @value: the value to be written to the property
* @name: the name of the property
* @value: the value to be written to the property
* @errp: returns an error if this function fails
*
* Writes an object's canonical path to a property.
@ -1250,8 +1250,8 @@ char *object_property_get_str(Object *obj, const char *name,
* unreferenced, and a reference is added to the new target object.
*
*/
void object_property_set_link(Object *obj, Object *value,
const char *name, Error **errp);
void object_property_set_link(Object *obj, const char *name,
Object *value, Error **errp);
/**
* object_property_get_link:
@ -1268,14 +1268,14 @@ Object *object_property_get_link(Object *obj, const char *name,
/**
* object_property_set_bool:
* @value: the value to be written to the property
* @name: the name of the property
* @value: the value to be written to the property
* @errp: returns an error if this function fails
*
* Writes a bool value to a property.
*/
void object_property_set_bool(Object *obj, bool value,
const char *name, Error **errp);
void object_property_set_bool(Object *obj, const char *name,
bool value, Error **errp);
/**
* object_property_get_bool:
@ -1291,14 +1291,14 @@ bool object_property_get_bool(Object *obj, const char *name,
/**
* object_property_set_int:
* @value: the value to be written to the property
* @name: the name of the property
* @value: the value to be written to the property
* @errp: returns an error if this function fails
*
* Writes an integer value to a property.
*/
void object_property_set_int(Object *obj, int64_t value,
const char *name, Error **errp);
void object_property_set_int(Object *obj, const char *name,
int64_t value, Error **errp);
/**
* object_property_get_int:
@ -1314,14 +1314,14 @@ int64_t object_property_get_int(Object *obj, const char *name,
/**
* object_property_set_uint:
* @value: the value to be written to the property
* @name: the name of the property
* @value: the value to be written to the property
* @errp: returns an error if this function fails
*
* Writes an unsigned integer value to a property.
*/
void object_property_set_uint(Object *obj, uint64_t value,
const char *name, Error **errp);
void object_property_set_uint(Object *obj, const char *name,
uint64_t value, Error **errp);
/**
* object_property_get_uint:
@ -1352,28 +1352,28 @@ int object_property_get_enum(Object *obj, const char *name,
/**
* object_property_set:
* @obj: the object
* @name: the name of the property
* @v: the visitor that will be used to write the property value. This should
* be an Input visitor and the data will be first read with @name as the
* name and then written as the property value.
* @name: the name of the property
* @errp: returns an error if this function fails
*
* Writes a property to a object.
*/
void object_property_set(Object *obj, Visitor *v, const char *name,
void object_property_set(Object *obj, const char *name, Visitor *v,
Error **errp);
/**
* object_property_parse:
* @obj: the object
* @string: the string that will be used to parse the property value.
* @name: the name of the property
* @string: the string that will be used to parse the property value.
* @errp: returns an error if this function fails
*
* Parses a string and writes the result into a property of an object.
*/
void object_property_parse(Object *obj, const char *string,
const char *name, Error **errp);
void object_property_parse(Object *obj, const char *name,
const char *string, Error **errp);
/**
* object_property_print:

7
include/qom/qom-qobject.h
View file

@ -28,13 +28,14 @@ struct QObject *object_property_get_qobject(Object *obj, const char *name,
/**
* object_property_set_qobject:
* @obj: the object
* @ret: The value that will be written to the property.
* @name: the name of the property
* @value: The value that will be written to the property.
* @errp: returns an error if this function fails
*
* Writes a property to a object.
*/
void object_property_set_qobject(Object *obj, struct QObject *qobj,
const char *name, struct Error **errp);
void object_property_set_qobject(Object *obj,
const char *name, struct QObject *value,
struct Error **errp);
#endif