[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 17/21] tpm-tis: move TPMState to TIS header
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PULL v1 17/21] tpm-tis: move TPMState to TIS header |
Date: |
Thu, 19 Oct 2017 14:02:51 -0400 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <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 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.
--
2.5.5
- [Qemu-devel] [PULL v1 11/21] tpm: remove unused TPMBackendCmd, (continued)
- [Qemu-devel] [PULL v1 11/21] tpm: remove unused TPMBackendCmd, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 09/21] tpm: remove init() class method, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 04/21] tpm: lookup tpm backend class in tpm_driver_find_by_type(), Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 13/21] tpm: remove locty argument from receive_cb, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 12/21] tpm: remove needless cast, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 20/21] tpm: add a QOM TPM interface, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 06/21] tpm: remove tpm_register_driver(), Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 15/21] tpm-emulator: fix error handling, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 14/21] tpm: add TPMBackendCmd to hold the request state, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 18/21] tpm-tis: remove tpm_tis.h header, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 17/21] tpm-tis: move TPMState to TIS header,
Stefan Berger <=
- [Qemu-devel] [PULL v1 19/21] tpm-tis: fold TPMTISEmuState in TPMState, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 10/21] tpm: remove configure_tpm() hop, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 07/21] tpm: move TPMSizedBuffer to tpm_tis.h, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 08/21] tpm: remove TPMDriverOps, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 02/21] tpm-tis: remove RAISE_STS_IRQ, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 03/21] tpm: make tpm_get_backend_driver() static, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 05/21] tpm: replace tpm_get_backend_driver() to drop be_drivers, Stefan Berger, 2017/10/19
- Re: [Qemu-devel] [PULL v1 00/21] Merge tpm 2017/10/19, Peter Maydell, 2017/10/20