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

QemuOpts: Convert qemu_opts_foreach() to Error

Browse source 
Retain the function value for now, to permit selective conversion of
its callers.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2015-03-13 13:35:14 +01:00
parent a4c7367f7d
commit 28d0de7a4f
12 changed files with 72 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/qemu-option.c
View file

@ -1047,13 +1047,14 @@ void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp)
}
/**
* For each member of @list, call @func(member, @opaque).
* For each member of @list, call @func(@opaque, member, @errp).
* Call it with the current location temporarily set to the member's.
* @func() may store an Error through @errp, but must return non-zero then.
* When @func() returns non-zero, break the loop and return that value.
* Return zero when the loop completes.
*/
int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,
void *opaque)
void *opaque, Error **errp)
{
Location loc;
QemuOpts *opts;
@ -1062,10 +1063,11 @@ int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,
loc_push_none(&loc);
QTAILQ_FOREACH(opts, &list->head, next) {
loc_restore(&opts->loc);
rc = func(opts, opaque);
rc = func(opaque, opts, errp);
if (rc) {
return rc;
}
assert(!errp || !*errp);
}
loc_pop(&loc);
return 0;