[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 05/21] tpm: replace tpm_get_backend_driver() to dr
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PULL v1 05/21] tpm: replace tpm_get_backend_driver() to drop be_drivers |
Date: |
Thu, 19 Oct 2017 14:02:39 -0400 |
From: Marc-André Lureau <address@hidden>
Use tpm_driver_find_by_type() instead.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>
---
tpm.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/tpm.c b/tpm.c
index 04de8da..ad2ed6a 100644
--- a/tpm.c
+++ b/tpm.c
@@ -31,13 +31,6 @@ void tpm_register_model(enum TpmModel model)
tpm_models[model] = true;
}
-static const TPMDriverOps *tpm_get_backend_driver(const char *type)
-{
- int i = qapi_enum_parse(&TpmType_lookup, type, -1, NULL);
-
- return i >= 0 ? be_drivers[i] : NULL;
-}
-
#ifdef CONFIG_TPM
void tpm_register_driver(const TPMDriverOps *tdo)
@@ -110,6 +103,7 @@ static int configure_tpm(QemuOpts *opts)
const TPMDriverOps *be;
TPMBackend *drv;
Error *local_err = NULL;
+ int i;
if (!QLIST_EMPTY(&tpm_backends)) {
error_report("Only one TPM is allowed.");
@@ -129,7 +123,8 @@ static int configure_tpm(QemuOpts *opts)
return 1;
}
- be = tpm_get_backend_driver(value);
+ i = qapi_enum_parse(&TpmType_lookup, value, -1, NULL);
+ be = i >= 0 ? tpm_driver_find_by_type(i) : NULL;
if (be == NULL) {
error_report(QERR_INVALID_PARAMETER_VALUE,
"type", "a TPM backend type");
--
2.5.5
- [Qemu-devel] [PULL v1 15/21] tpm-emulator: fix error handling, (continued)
- [Qemu-devel] [PULL v1 15/21] tpm-emulator: fix error handling, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 14/21] tpm: add TPMBackendCmd to hold the request state, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 18/21] tpm-tis: remove tpm_tis.h header, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 17/21] tpm-tis: move TPMState to TIS header, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 19/21] tpm-tis: fold TPMTISEmuState in TPMState, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 10/21] tpm: remove configure_tpm() hop, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 07/21] tpm: move TPMSizedBuffer to tpm_tis.h, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 08/21] tpm: remove TPMDriverOps, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 02/21] tpm-tis: remove RAISE_STS_IRQ, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 03/21] tpm: make tpm_get_backend_driver() static, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 05/21] tpm: replace tpm_get_backend_driver() to drop be_drivers,
Stefan Berger <=
- Re: [Qemu-devel] [PULL v1 00/21] Merge tpm 2017/10/19, Peter Maydell, 2017/10/20