aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmarnath Valluri <amarnath.valluri@intel.com>2017-09-29 14:10:21 +0300
committerStefan Berger <stefanb@linux.vnet.ibm.com>2017-10-13 07:34:33 -0400
commitc37cacabf2285b0731b44c1f667781fdd4f2b658 (patch)
tree9bcb28253609552e9070e1ddee67323da1ec0e42
parentf4ede81eed29e6140374177d1f2808248c5b5650 (diff)
tpm: Move tpm_cleanup() to right place
As Emulator TPM backend uses chardev, tpm cleanup should happen before chardev similar to other vhost-users. Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com> Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
-rw-r--r--tpm.c1
-rw-r--r--vl.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/tpm.c b/tpm.c
index 3b8c7ed3b6..3122227156 100644
--- a/tpm.c
+++ b/tpm.c
@@ -172,7 +172,6 @@ int tpm_init(void)
return -1;
}
- atexit(tpm_cleanup);
return 0;
}
diff --git a/vl.c b/vl.c
index d7c349233f..0723835bbf 100644
--- a/vl.c
+++ b/vl.c
@@ -4905,6 +4905,7 @@ int main(int argc, char **argv, char **envp)
res_free();
/* vhost-user must be cleaned up before chardevs. */
+ tpm_cleanup();
net_cleanup();
audio_cleanup();
monitor_cleanup();