path: root/tpm.c
diff options
authorMarkus Armbruster <armbru@redhat.com>2015-03-13 11:07:24 +0100
committerMarkus Armbruster <armbru@redhat.com>2015-06-08 19:33:20 +0200
commita4c7367f7dd9348f94dc4298571ed515b8160a27 (patch)
treec2b07e89034639213052178832ed3b1e24bb4ac7 /tpm.c
parent8122928a52248e28513c79d9b9929c6d20c866ea (diff)
QemuOpts: Drop qemu_opts_foreach() parameter abort_on_failure
When the argument is non-zero, qemu_opts_foreach() stops on callback returning non-zero, and returns that value. When the argument is zero, it doesn't stop, and returns the bit-wise inclusive or of all the return values. Funky :) The callers that pass zero could just as well pass one, because their callbacks can't return anything but zero: * qemu_add_globals()'s callback qdev_add_one_global() * qemu_config_write()'s callback config_write_opts() * main()'s callbacks default_driver_check(), drive_enable_snapshot(), vnc_init_func() Drop the parameter, and always stop. 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')
1 files changed, 1 insertions, 2 deletions
diff --git a/tpm.c b/tpm.c
index 963b7ee0d8..bca3b3a98f 100644
--- a/tpm.c
+++ b/tpm.c
@@ -207,8 +207,7 @@ void tpm_cleanup(void)
int tpm_init(void)
- if (qemu_opts_foreach(qemu_find_opts("tpmdev"),
- tpm_init_tpmdev, NULL, 1) != 0) {
+ if (qemu_opts_foreach(qemu_find_opts("tpmdev"), tpm_init_tpmdev, NULL)) {
return -1;