| Message ID | 20171009225623.29232-24-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | TPM: code cleanup & CRB device | expand |
On 10/09/2017 06:56 PM, Marc-André Lureau wrote: > Now that there is an interface instead. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com> > --- > include/sysemu/tpm.h | 2 -- > hw/tpm/tpm_tis.c | 4 ++-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h > index c8afa179e5..62b073beeb 100644 > --- a/include/sysemu/tpm.h > +++ b/include/sysemu/tpm.h > @@ -14,8 +14,6 @@ > > #include "qemu/option.h" > > -typedef struct TPMState TPMState; > - > int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); > int tpm_init(void); > void tpm_cleanup(void); > diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c > index c24be57136..b3757bfbda 100644 > --- a/hw/tpm/tpm_tis.c > +++ b/hw/tpm/tpm_tis.c > @@ -72,7 +72,7 @@ typedef struct TPMLocality { > TPMSizedBuffer r_buffer; > } TPMLocality; > > -struct TPMState { > +typedef struct TPMState { > ISADevice busdev; > MemoryRegion mmio; > > @@ -95,7 +95,7 @@ struct TPMState { > char *backend; > TPMBackend *be_driver; > TPMVersion be_tpm_version; > -}; > +} TPMState; > > #define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS) >
diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index c8afa179e5..62b073beeb 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -14,8 +14,6 @@ #include "qemu/option.h" -typedef struct TPMState TPMState; - int tpm_config_parse(QemuOptsList *opts_list, const char *optarg); int tpm_init(void); void tpm_cleanup(void); diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index c24be57136..b3757bfbda 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -72,7 +72,7 @@ typedef struct TPMLocality { TPMSizedBuffer r_buffer; } TPMLocality; -struct TPMState { +typedef struct TPMState { ISADevice busdev; MemoryRegion mmio; @@ -95,7 +95,7 @@ struct TPMState { char *backend; TPMBackend *be_driver; TPMVersion be_tpm_version; -}; +} TPMState; #define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
Now that there is an interface instead. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- include/sysemu/tpm.h | 2 -- hw/tpm/tpm_tis.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)