diff mbox

[v2,27/28] tpm-tis: use DEFINE_PROP_TPMBE

Message ID 20171106183925.16747-28-marcandre.lureau@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Marc-André Lureau Nov. 6, 2017, 6:39 p.m. UTC 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 hw/tpm/tpm_tis.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

Comments

Stefan Berger Nov. 6, 2017, 8:31 p.m. UTC | #1 
On 11/06/2017 01:39 PM, Marc-André Lureau wrote:
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

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

> ---
>   hw/tpm/tpm_tis.c | 12 ++----------
>   1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
> index dccc56ab09..a00779f3aa 100644
> --- a/hw/tpm/tpm_tis.c
> +++ b/hw/tpm/tpm_tis.c
> @@ -86,7 +86,6 @@ typedef struct TPMState {
>
>       TPMBackendCmd cmd;
>
> -    char *backend;
>       TPMBackend *be_driver;
>       TPMVersion be_tpm_version;
>   } TPMState;
> @@ -1049,7 +1048,7 @@ static const VMStateDescription vmstate_tpm_tis = {
>
>   static Property tpm_tis_properties[] = {
>       DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
> -    DEFINE_PROP_STRING("tpmdev", TPMState, backend),
> +    DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver),
>       DEFINE_PROP_END_OF_LIST(),
>   };
>
> @@ -1062,17 +1061,10 @@ static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
>           return;
>       }
>
> -    s->be_driver = qemu_find_tpm_be(s->backend);
>       if (!s->be_driver) {
> -        error_setg(errp, "backend driver with id %s could not be found",
> -                   s->backend);
> +        error_setg(errp, "'tpmdev' property is required");
>           return;
>       }
> -
> -    if (tpm_backend_init(s->be_driver, TPM_IF(s), errp)) {
> -        return;
> -    }
> -
>       if (s->irq_num > 15) {
>           error_setg(errp, "IRQ %d is outside valid range of 0 to 15",
>                      s->irq_num);
diff mbox

Patch

diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index dccc56ab09..a00779f3aa 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -86,7 +86,6 @@  typedef struct TPMState {
 
     TPMBackendCmd cmd;
 
-    char *backend;
     TPMBackend *be_driver;
     TPMVersion be_tpm_version;
 } TPMState;
@@ -1049,7 +1048,7 @@  static const VMStateDescription vmstate_tpm_tis = {
 
 static Property tpm_tis_properties[] = {
     DEFINE_PROP_UINT32("irq", TPMState, irq_num, TPM_TIS_IRQ),
-    DEFINE_PROP_STRING("tpmdev", TPMState, backend),
+    DEFINE_PROP_TPMBE("tpmdev", TPMState, be_driver),
     DEFINE_PROP_END_OF_LIST(),
 };
 
@@ -1062,17 +1061,10 @@  static void tpm_tis_realizefn(DeviceState *dev, Error **errp)
         return;
     }
 
-    s->be_driver = qemu_find_tpm_be(s->backend);
     if (!s->be_driver) {
-        error_setg(errp, "backend driver with id %s could not be found",
-                   s->backend);
+        error_setg(errp, "'tpmdev' property is required");
         return;
     }
-
-    if (tpm_backend_init(s->be_driver, TPM_IF(s), errp)) {
-        return;
-    }
-
     if (s->irq_num > 15) {
         error_setg(errp, "IRQ %d is outside valid range of 0 to 15",
                    s->irq_num);