starred/qemu-qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qom: make errp last param in methods taking va_list

Browse Source 
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é <philmd@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé
2026-04-17 15:41:26 +01:00
parent ab67e622d0
commit 23f3d3d3bb
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
qom/object.c
View File

@@ -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;