aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2018-10-17 10:26:53 +0200
committerMarkus Armbruster <armbru@redhat.com>2018-10-19 14:51:34 +0200
commitd10e05f15d5c3dd5e5cc59c5dfff460d89d48580 (patch)
treeb596887154c53d8d45dfa71b38f81b6e304b868e /vl.c
parent4f7ec696f4b124364c1b145dbe835984edc4c887 (diff)
downloadqemu-d10e05f15d5c3dd5e5cc59c5dfff460d89d48580.zip
qemu-d10e05f15d5c3dd5e5cc59c5dfff460d89d48580.tar.gz
qemu-d10e05f15d5c3dd5e5cc59c5dfff460d89d48580.tar.bz2
tpm: Clean up error reporting in tpm_init_tpmdev()
Calling error_report() in a function that takes an Error ** argument is suspicious. tpm_init_tpmdev() does that, and then fails without setting an error. Its caller main(), via tpm_init() and qemu_opts_foreach(), is fine with it, but clean it up anyway. Cc: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Message-Id: <20181017082702.5581-30-armbru@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/vl.c b/vl.c
index 2ff0c5f..2f265b9 100644
--- a/vl.c
+++ b/vl.c
@@ -4360,9 +4360,7 @@ int main(int argc, char **argv, char **envp)
user_creatable_add_opts_foreach,
object_create_delayed, &error_fatal);
- if (tpm_init() < 0) {
- exit(1);
- }
+ tpm_init();
/* init the bluetooth world */
if (foreach_device_config(DEV_BT, bt_parse))