diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-03-13 13:35:14 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-06-09 07:37:37 +0200 |
| commit | 28d0de7a4fb721b06de72970bd163f5183c2188b (patch) | |
| tree | 3ce566258a1d828e7b84eed69e8b24f5f1b07d3f /block | |
| parent | a4c7367f7dd9348f94dc4298571ed515b8160a27 (diff) | |
| download | qemu-28d0de7a4fb721b06de72970bd163f5183c2188b.tar.gz qemu-28d0de7a4fb721b06de72970bd163f5183c2188b.tar.bz2 qemu-28d0de7a4fb721b06de72970bd163f5183c2188b.zip | |
QemuOpts: Convert qemu_opts_foreach() to Error
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blkdebug.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blkdebug.c b/block/blkdebug.c index 58f5105cc8..be0d273799 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -219,7 +219,7 @@ struct add_rule_data { Error **errp; }; -static int add_rule(QemuOpts *opts, void *opaque) +static int add_rule(void *opaque, QemuOpts *opts, Error **errp) { struct add_rule_data *d = opaque; BDRVBlkdebugState *s = d->s; @@ -320,7 +320,7 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, d.s = s; d.action = ACTION_INJECT_ERROR; d.errp = &local_err; - qemu_opts_foreach(&inject_error_opts, add_rule, &d); + qemu_opts_foreach(&inject_error_opts, add_rule, &d, NULL); if (local_err) { error_propagate(errp, local_err); ret = -EINVAL; @@ -328,7 +328,7 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, } d.action = ACTION_SET_STATE; - qemu_opts_foreach(&set_state_opts, add_rule, &d); + qemu_opts_foreach(&set_state_opts, add_rule, &d, NULL); if (local_err) { error_propagate(errp, local_err); ret = -EINVAL; |