diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0003-tpm-backend-Remove-unneeded-member-variable-from-bac.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0003-tpm-backend-Remove-unneeded-member-variable-from-bac.patch | 75 |
1 files changed, 0 insertions, 75 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0003-tpm-backend-Remove-unneeded-member-variable-from-bac.patch b/meta/recipes-devtools/qemu/qemu/0003-tpm-backend-Remove-unneeded-member-variable-from-bac.patch deleted file mode 100644 index 6b94eba720..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0003-tpm-backend-Remove-unneeded-member-variable-from-bac.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | From cac845f55b8f27e5c90e0f2e3dcbeea7013df67c Mon Sep 17 00:00:00 2001 | ||
2 | From: Amarnath Valluri <amarnath.valluri@intel.com> | ||
3 | Date: Thu, 30 Mar 2017 15:55:17 +0300 | ||
4 | Subject: [PATCH 03/12] tpm-backend: Remove unneeded member variable from | ||
5 | backend class | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | TPMDriverOps inside TPMBackend is not required, as it is supposed to be a class | ||
11 | member. The only possible reason for keeping in TPMBackend was, to get the | ||
12 | backend type in tpm.c where dedicated backend api, tpm_backend_get_type() is | ||
13 | present. | ||
14 | |||
15 | Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> | ||
16 | Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> | ||
17 | Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com> | ||
18 | |||
19 | Upstream-Status: Backport [fb4b0c6765471dad2363875989e7661ca5f9a608] | ||
20 | --- | ||
21 | hw/tpm/tpm_passthrough.c | 4 ---- | ||
22 | include/sysemu/tpm_backend.h | 1 - | ||
23 | tpm.c | 2 +- | ||
24 | 3 files changed, 1 insertion(+), 6 deletions(-) | ||
25 | |||
26 | diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c | ||
27 | index 9234eb3459..a0baf5f080 100644 | ||
28 | --- a/hw/tpm/tpm_passthrough.c | ||
29 | +++ b/hw/tpm/tpm_passthrough.c | ||
30 | @@ -46,8 +46,6 @@ | ||
31 | #define TPM_PASSTHROUGH(obj) \ | ||
32 | OBJECT_CHECK(TPMPassthruState, (obj), TYPE_TPM_PASSTHROUGH) | ||
33 | |||
34 | -static const TPMDriverOps tpm_passthrough_driver; | ||
35 | - | ||
36 | /* data structures */ | ||
37 | typedef struct TPMPassthruThreadParams { | ||
38 | TPMState *tpm_state; | ||
39 | @@ -462,8 +460,6 @@ static TPMBackend *tpm_passthrough_create(QemuOpts *opts, const char *id) | ||
40 | /* let frontend set the fe_model to proper value */ | ||
41 | tb->fe_model = -1; | ||
42 | |||
43 | - tb->ops = &tpm_passthrough_driver; | ||
44 | - | ||
45 | if (tpm_passthrough_handle_device_opts(opts, tb)) { | ||
46 | goto err_exit; | ||
47 | } | ||
48 | diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h | ||
49 | index b0a9731aee..3708413035 100644 | ||
50 | --- a/include/sysemu/tpm_backend.h | ||
51 | +++ b/include/sysemu/tpm_backend.h | ||
52 | @@ -50,7 +50,6 @@ struct TPMBackend { | ||
53 | enum TpmModel fe_model; | ||
54 | char *path; | ||
55 | char *cancel_path; | ||
56 | - const TPMDriverOps *ops; | ||
57 | |||
58 | QLIST_ENTRY(TPMBackend) list; | ||
59 | }; | ||
60 | diff --git a/tpm.c b/tpm.c | ||
61 | index 2dbea70645..b7166ca200 100644 | ||
62 | --- a/tpm.c | ||
63 | +++ b/tpm.c | ||
64 | @@ -212,7 +212,7 @@ static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv) | ||
65 | res->model = drv->fe_model; | ||
66 | res->options = g_new0(TpmTypeOptions, 1); | ||
67 | |||
68 | - switch (drv->ops->type) { | ||
69 | + switch (tpm_backend_get_type(drv)) { | ||
70 | case TPM_TYPE_PASSTHROUGH: | ||
71 | res->options->type = TPM_TYPE_OPTIONS_KIND_PASSTHROUGH; | ||
72 | tpo = g_new0(TPMPassthroughOptions, 1); | ||
73 | -- | ||
74 | 2.11.0 | ||
75 | |||