[Qemu-devel] [PATCH 05/42] tpm: replace tpm_get_backend_driver() to drop be_drivers

Marc-André Lureau posted 42 patches 8 years, 4 months ago
[Qemu-devel] [PATCH 05/42] tpm: replace tpm_get_backend_driver() to drop be_drivers
Posted by Marc-André Lureau 8 years, 4 months ago
Use tpm_driver_find_by_type() instead.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 tpm.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tpm.c b/tpm.c
index 04de8da5fd..ad2ed6a0da 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.14.1.146.gd35faa819


Re: [Qemu-devel] [PATCH 05/42] tpm: replace tpm_get_backend_driver() to drop be_drivers
Posted by Stefan Berger 8 years, 4 months ago
On 10/09/2017 06:55 PM, Marc-André Lureau wrote:
> Use tpm_driver_find_by_type() instead.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>


> ---
>   tpm.c | 11 +++--------
>   1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/tpm.c b/tpm.c
> index 04de8da5fd..ad2ed6a0da 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");