[PULL 22/29] qom: make errp last param in methods taking va_list
object_new_with_props can't put 'errp' last due to the use of
variadic arguments. That constraint does not apply to the use
of va_list with object_new_with_propv, so follow normal practice
with 'errp' placement.
The same rationale applies to object_set_propv.
Reviewed-by: Philippe Mathieu-Daudé
Reviewed-by: Marc-André Lureau
Signed-off-by: Daniel P. Berrangé
---
include/qom/object.h| 10 +-
qom/object.c| 20 ++--
tests/unit/check-qom-proplist.c | 4 ++--
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index 2a2829343d..a905a9e42f 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -689,16 +689,16 @@ Object *object_new_with_props(const char *typename,
* @typename: The name of the type of the object to instantiate.
* @parent: the parent object
* @id: The unique ID of the object
- * @errp: pointer to error object
* @vargs: list of property names and values
+ * @errp: pointer to error object
*
* See object_new_with_props() for documentation.
*/
Object *object_new_with_propv(const char *typename,
Object *parent,
const char *id,
- Error **errp,
- va_list vargs);
+ va_list vargs,
+ Error **errp);
/**
* object_set_props:
@@ -739,14 +739,14 @@ bool object_set_props(Object *obj, Error **errp, ...)
G_GNUC_NULL_TERMINATED;
/**
* object_set_propv:
* @obj: the object instance to set properties on
- * @errp: pointer to error object
* @vargs: list of property names and values
+ * @errp: pointer to error object
*
* See object_set_props() for documentation.
*
* Returns: %true on success, %false on error.
*/
-bool object_set_propv(Object *obj, Error **errp, va_list vargs);
+bool object_set_propv(Object *obj, va_list vargs, Error **errp);
/**
* object_initialize:
diff --git a/qom/object.c b/qom/object.c
index 08fc840f39..ecae322d2a 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -541,7 +541,7 @@ bool object_initialize_child_with_propsv(Object *parentobj,
object_initialize(childobj, size, type);
obj = OBJECT(childobj);
-if (!object_set_propv(obj, errp, vargs)) {
+if (!object_set_propv(obj, vargs, errp)) {
goto out;
}
@@ -740,7 +740,7 @@ Object *object_new_with_props(const char *typename,
Object *obj;
va_start(vargs, errp);
-obj = object_new_with_propv(typename, parent, id, errp, vargs);
+obj = object_new_with_propv(typename, parent, id, vargs, errp);
va_end(vargs);
return obj;
@@ -750,8 +750,8 @@ Object *object_new_with_props(const char *typename,
Object *object_new_with_propv(const char *typename,
Object *parent,
const char *id,
- Error **errp,
- va_list vargs)
+ va_list vargs,
+ Error **errp)
{
Object *obj;
ObjectClass *klass;
@@ -776,7 +776,7 @@ Object *object_new_with_propv(const char *typename,
}
obj = object_new_with_type(klass->type);
-if (!object_set_propv(obj, errp, vargs)) {
+if (!object_set_propv(obj, vargs, errp)) {
goto error;
}
@@ -804,14 +804,14 @@ Object *object_new_with_propv(const char *typename,
bool object_set_props(Object *obj,
- Error **errp,
- ...)
+ Error **errp,
+ ...)
{
va_list vargs;
bool ret;
va_start(vargs, errp);
-ret = object_set_propv(obj, errp, vargs);
+ret = object_set_propv(obj, vargs, errp);
va_end(vargs);
return ret;
@@ -819,8 +819,8 @@ bool object_set_props(Object *obj,
bool object_set_propv(Object *obj,
- Error **errp,
- va_list vargs)
+ va_list vargs,
+ Error **errp)
{
const char *propname;
diff --git a/tests/unit/check-qom-proplist.c b/tests/unit/check-qom-proplist.c
index ee3c6fb32b..7f31735459 100644
--- a/tests/unit/check-qom-proplist.c
+++ b/tests/unit/check-qom-proplist.c
@@ -373,8 +373,8 @@ static Object *new_helper(Error **errp,
obj = object_new_with_propv(TYPE_DUMMY,
parent,
"dummy0",
-errp,
-vargs);
+vargs,
+errp);
va_end(vargs);
return obj;
}
--
2.54.0
[PULL 22/29] qom: make errp last param in methods taking va_list
object_new_with_props can't put 'errp' last due to the use of
variadic arguments. That constraint does not apply to the use
of va_list with object_new_with_propv, so follow normal practice
with 'errp' placement.
The same rationale applies to object_set_propv.
Reviewed-by: Philippe Mathieu-Daudé
Reviewed-by: Marc-André Lureau
Signed-off-by: Daniel P. Berrangé
---
include/qom/object.h| 10 +-
qom/object.c| 20 ++--
tests/unit/check-qom-proplist.c | 4 ++--
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index 2a2829343d..a905a9e42f 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -689,16 +689,16 @@ Object *object_new_with_props(const char *typename,
* @typename: The name of the type of the object to instantiate.
* @parent: the parent object
* @id: The unique ID of the object
- * @errp: pointer to error object
* @vargs: list of property names and values
+ * @errp: pointer to error object
*
* See object_new_with_props() for documentation.
*/
Object *object_new_with_propv(const char *typename,
Object *parent,
const char *id,
- Error **errp,
- va_list vargs);
+ va_list vargs,
+ Error **errp);
/**
* object_set_props:
@@ -739,14 +739,14 @@ bool object_set_props(Object *obj, Error **errp, ...)
G_GNUC_NULL_TERMINATED;
/**
* object_set_propv:
* @obj: the object instance to set properties on
- * @errp: pointer to error object
* @vargs: list of property names and values
+ * @errp: pointer to error object
*
* See object_set_props() for documentation.
*
* Returns: %true on success, %false on error.
*/
-bool object_set_propv(Object *obj, Error **errp, va_list vargs);
+bool object_set_propv(Object *obj, va_list vargs, Error **errp);
/**
* object_initialize:
diff --git a/qom/object.c b/qom/object.c
index 08fc840f39..ecae322d2a 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -541,7 +541,7 @@ bool object_initialize_child_with_propsv(Object *parentobj,
object_initialize(childobj, size, type);
obj = OBJECT(childobj);
-if (!object_set_propv(obj, errp, vargs)) {
+if (!object_set_propv(obj, vargs, errp)) {
goto out;
}
@@ -740,7 +740,7 @@ Object *object_new_with_props(const char *typename,
Object *obj;
va_start(vargs, errp);
-obj = object_new_with_propv(typename, parent, id, errp, vargs);
+obj = object_new_with_propv(typename, parent, id, vargs, errp);
va_end(vargs);
return obj;
@@ -750,8 +750,8 @@ Object *object_new_with_props(const char *typename,
Object *object_new_with_propv(const char *typename,
Object *parent,
const char *id,
- Error **errp,
- va_list vargs)
+ va_list vargs,
+ Error **errp)
{
Object *obj;
ObjectClass *klass;
@@ -776,7 +776,7 @@ Object *object_new_with_propv(const char *typename,
}
obj = object_new_with_type(klass->type);
-if (!object_set_propv(obj, errp, vargs)) {
+if (!object_set_propv(obj, vargs, errp)) {
goto error;
}
@@ -804,14 +804,14 @@ Object *object_new_with_propv(const char *typename,
bool object_set_props(Object *obj,
- Error **errp,
- ...)
+ Error **errp,
+ ...)
{
va_list vargs;
bool ret;
va_start(vargs, errp);
-ret = object_set_propv(obj, errp, vargs);
+ret = object_set_propv(obj, vargs, errp);
va_end(vargs);
return ret;
@@ -819,8 +819,8 @@ bool object_set_props(Object *obj,
bool object_set_propv(Object *obj,
- Error **errp,
- va_list vargs)
+ va_list vargs,
+ Error **errp)
{
const char *propname;
diff --git a/tests/unit/check-qom-proplist.c b/tests/unit/check-qom-proplist.c
index ee3c6fb32b..7f31735459 100644
--- a/tests/unit/check-qom-proplist.c
+++ b/tests/unit/check-qom-proplist.c
@@ -373,8 +373,8 @@ static Object *new_helper(Error **errp,
obj = object_new_with_propv(TYPE_DUMMY,
parent,
"dummy0",
-errp,
-vargs);
+vargs,
+errp);
va_end(vargs);
return obj;
}
--
2.54.0
