aboutsummaryrefslogtreecommitdiff
path: root/tpm.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-03-13 13:35:14 +0100
committerMarkus Armbruster <armbru@redhat.com>2015-06-09 07:37:37 +0200
commit28d0de7a4fb721b06de72970bd163f5183c2188b (patch)
tree3ce566258a1d828e7b84eed69e8b24f5f1b07d3f /tpm.c
parenta4c7367f7dd9348f94dc4298571ed515b8160a27 (diff)
downloadqemu-28d0de7a4fb721b06de72970bd163f5183c2188b.zip
qemu-28d0de7a4fb721b06de72970bd163f5183c2188b.tar.gz
qemu-28d0de7a4fb721b06de72970bd163f5183c2188b.tar.bz2
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 'tpm.c')
-rw-r--r--tpm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tpm.c b/tpm.c
index bca3b3a..a3f3b7f 100644
--- a/tpm.c
+++ b/tpm.c
@@ -182,7 +182,7 @@ static int configure_tpm(QemuOpts *opts)
return 0;
}
-static int tpm_init_tpmdev(QemuOpts *opts, void *dummy)
+static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp)
{
return configure_tpm(opts);
}
@@ -207,12 +207,12 @@ void tpm_cleanup(void)
*/
int tpm_init(void)
{
- if (qemu_opts_foreach(qemu_find_opts("tpmdev"), tpm_init_tpmdev, NULL)) {
+ if (qemu_opts_foreach(qemu_find_opts("tpmdev"),
+ tpm_init_tpmdev, NULL, NULL)) {
return -1;
}
atexit(tpm_cleanup);
-
return 0;
}