[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/42] tpm-tis: move TPMState to TIS header
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 17/42] tpm-tis: move TPMState to TIS header |
Date: |
Tue, 10 Oct 2017 00:55:58 +0200 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/tpm/tpm_int.h | 23 ++---------------------
hw/tpm/tpm_tis.h | 19 +++++++++++++++++++
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 252c4082ef..e231d0eb4f 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 31e612a7f4..30e35eef64 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 fb929f6e92..7dc5b08824 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.
--
2.14.1.146.gd35faa819
- Re: [Qemu-devel] [PATCH 12/42] tpm: remove needless cast, (continued)
- [Qemu-devel] [PATCH 13/42] tpm: remove locty argument from receive_cb, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 14/42] tpm: add TPMBackendCmd to hold the request state, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 16/42] tpm: remove locty_data from TPMState, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 15/42] tpm-emulator: fix error handling, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 17/42] tpm-tis: move TPMState to TIS header,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 18/42] tpm-tis: remove tpm_tis.h header, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 19/42] tpm-tis: fold TPMTISEmuState in TPMState, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 20/42] tpm: add a QOM TPM interface, Marc-André Lureau, 2017/10/09
- [Qemu-devel] [PATCH 21/42] tpm: move recv_data_callback to TPM interface, Marc-André Lureau, 2017/10/09