diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-10-10 00:55:58 +0200 |
|---|---|---|
| committer | Stefan Berger <stefanb@linux.vnet.ibm.com> | 2017-10-19 11:42:30 -0400 |
| commit | 5086bf978445406312a4ff4127a7e2e8ac0fc655 (patch) | |
| tree | ea236b148708191754e406ba8f431d5d4b707add /hw/tpm | |
| parent | d2809766250d0e6b358588819c6c2e422685edfe (diff) | |
| download | qemu-5086bf978445406312a4ff4127a7e2e8ac0fc655.zip qemu-5086bf978445406312a4ff4127a7e2e8ac0fc655.tar.gz qemu-5086bf978445406312a4ff4127a7e2e8ac0fc655.tar.bz2 | |
tpm-tis: move TPMState to TIS header
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Diffstat (limited to 'hw/tpm')
| -rw-r--r-- | hw/tpm/tpm_int.h | 23 | ||||
| -rw-r--r-- | hw/tpm/tpm_tis.h | 19 | ||||
| -rw-r--r-- | hw/tpm/tpm_util.c | 1 |
3 files changed, 22 insertions, 21 deletions
diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h index 252c408..e231d0e 100644 --- a/hw/tpm/tpm_int.h +++ b/hw/tpm/tpm_int.h @@ -12,28 +12,9 @@ #ifndef TPM_TPM_INT_H #define TPM_TPM_INT_H -#include "exec/memory.h" -#include "tpm_tis.h" +#include "qemu/osdep.h" -/* overall state of the TPM interface */ -struct TPMState { - ISADevice busdev; - MemoryRegion mmio; - - union { - TPMTISEmuState tis; - } s; - - TPMBackendCmd cmd; - - char *backend; - TPMBackend *be_driver; - TPMVersion be_tpm_version; -}; - -#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS) - -#define TPM_STANDARD_CMDLINE_OPTS \ +#define TPM_STANDARD_CMDLINE_OPTS \ { \ .name = "type", \ .type = QEMU_OPT_STRING, \ diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h index 31e612a..30e35ee 100644 --- a/hw/tpm/tpm_tis.h +++ b/hw/tpm/tpm_tis.h @@ -72,4 +72,23 @@ typedef struct TPMTISEmuState { uint32_t irq_num; } TPMTISEmuState; +/* overall state of the TPM interface */ +struct TPMState { + ISADevice busdev; + MemoryRegion mmio; + + union { + TPMTISEmuState tis; + } s; + + uint8_t locty_number; + TPMBackendCmd cmd; + + char *backend; + TPMBackend *be_driver; + TPMVersion be_tpm_version; +}; + +#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS) + #endif /* TPM_TPM_TIS_H */ diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c index 73d7796..daf1faa 100644 --- a/hw/tpm/tpm_util.c +++ b/hw/tpm/tpm_util.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "tpm_util.h" #include "tpm_int.h" +#include "exec/memory.h" /* * Write an error message in the given output buffer. |