summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-06-16 14:25:04 +0200
committerMichael Tokarev <mjt@gandalf>2016-09-13 18:12:34 +0300
commitbc82585a8fd5d38e7c2402999a7ccc9a97d762c9 (patch)
tree2cbb5544a8e6d4132a19ad19be67552661ed23c2
parent39cba610a78ad0d9dc24e6124a945a75e8f91b3d (diff)
downloadfocaccia-qemu-bc82585a8fd5d38e7c2402999a7ccc9a97d762c9.tar.gz
focaccia-qemu-bc82585a8fd5d38e7c2402999a7ccc9a97d762c9.zip
vl: remove unnecessary duplicate call to tpm_cleanup
tpm_cleanup is called from main() and also registered with atexit from
tpm_init.  The function only visits the tpm_backends linked list, and the
atexit registration happens right after tpm_init fills in the list from
-tpmdev options.  Therefore, the direct call is unnecessary.  Remove it.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--vl.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/vl.c b/vl.c
index ee557a1d3f..82cf85b1b4 100644
--- a/vl.c
+++ b/vl.c
@@ -4620,9 +4620,6 @@ int main(int argc, char **argv, char **envp)
     bdrv_close_all();
     pause_all_vcpus();
     res_free();
-#ifdef CONFIG_TPM
-    tpm_cleanup();
-#endif
 
     /* vhost-user must be cleaned up before chardevs.  */
     net_cleanup();