diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0011-tpm-Move-tpm_cleanup-to-right-place.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0011-tpm-Move-tpm_cleanup-to-right-place.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0011-tpm-Move-tpm_cleanup-to-right-place.patch b/meta/recipes-devtools/qemu/qemu/0011-tpm-Move-tpm_cleanup-to-right-place.patch deleted file mode 100644 index f4998e1681..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0011-tpm-Move-tpm_cleanup-to-right-place.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From 22429d175911af2e57617a30e0ac097af74f2791 Mon Sep 17 00:00:00 2001 | ||
2 | From: Amarnath Valluri <amarnath.valluri@intel.com> | ||
3 | Date: Fri, 29 Sep 2017 12:57:33 +0300 | ||
4 | Subject: [PATCH 11/12] tpm: Move tpm_cleanup() to right place | ||
5 | |||
6 | As Emulator TPM backend uses chardev, tpm cleanup should happen before chardev | ||
7 | similar to other vhost-users. | ||
8 | |||
9 | Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> | ||
10 | |||
11 | Upstream-Status: Backport [c37cacabf2285b0731b44c1f667781fdd4f2b658] | ||
12 | --- | ||
13 | tpm.c | 1 - | ||
14 | vl.c | 1 + | ||
15 | 2 files changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/tpm.c b/tpm.c | ||
18 | index cac400ef3e..4a9d3d739e 100644 | ||
19 | --- a/tpm.c | ||
20 | +++ b/tpm.c | ||
21 | @@ -173,7 +173,6 @@ int tpm_init(void) | ||
22 | return -1; | ||
23 | } | ||
24 | |||
25 | - atexit(tpm_cleanup); | ||
26 | return 0; | ||
27 | } | ||
28 | |||
29 | diff --git a/vl.c b/vl.c | ||
30 | index 8e247cc2a2..5df0b7f205 100644 | ||
31 | --- a/vl.c | ||
32 | +++ b/vl.c | ||
33 | @@ -4797,6 +4797,7 @@ int main(int argc, char **argv, char **envp) | ||
34 | res_free(); | ||
35 | |||
36 | /* vhost-user must be cleaned up before chardevs. */ | ||
37 | + tpm_cleanup(); | ||
38 | net_cleanup(); | ||
39 | audio_cleanup(); | ||
40 | monitor_cleanup(); | ||
41 | -- | ||
42 | 2.11.0 | ||
43 | |||