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 /include | |
| 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 'include')
| -rw-r--r-- | include/qemu/option.h | 4 | ||||
| -rw-r--r-- | include/ui/console.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/qemu/option.h b/include/qemu/option.h index 2edf58f61f..a3850b23a4 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -125,9 +125,9 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict, QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict); void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp); -typedef int (*qemu_opts_loopfunc)(QemuOpts *opts, void *opaque); +typedef int (*qemu_opts_loopfunc)(void *opaque, QemuOpts *opts, Error **errp); int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, - void *opaque); + void *opaque, Error **errp); void qemu_opts_print(QemuOpts *opts, const char *sep); void qemu_opts_print_help(QemuOptsList *list); void qemu_opts_free(QemuOptsList *list); diff --git a/include/ui/console.h b/include/ui/console.h index 06e47399f1..de92523bbb 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -370,7 +370,7 @@ char *vnc_display_local_addr(const char *id); int vnc_display_password(const char *id, const char *password); int vnc_display_pw_expire(const char *id, time_t expires); QemuOpts *vnc_parse_func(const char *str); -int vnc_init_func(QemuOpts *opts, void *opaque); +int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp); #else static inline int vnc_display_password(const char *id, const char *password) { |