[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 02/32] tpm: move TpmIf in include/sysemu/tpm.h
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PULL v1 02/32] tpm: move TpmIf in include/sysemu/tpm.h |
Date: |
Sat, 16 Dec 2017 12:41:19 -0500 |
From: Marc-André Lureau <address@hidden>
This is a better location than hw/tpm, since we are going to use the
interface from outside hw/tpm.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>
---
backends/tpm.c | 1 -
hw/tpm/tpm_int.h | 22 +---------------------
include/sysemu/tpm.h | 19 +++++++++++++++++++
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/backends/tpm.c b/backends/tpm.c
index 5763f6f..1e416d7 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -17,7 +17,6 @@
#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/tpm.h"
-#include "hw/tpm/tpm_int.h"
#include "qemu/thread.h"
static void tpm_backend_worker_thread(gpointer data, gpointer user_data)
diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h
index 9c045b6..1df5883 100644
--- a/hw/tpm/tpm_int.h
+++ b/hw/tpm/tpm_int.h
@@ -13,28 +13,8 @@
#define TPM_TPM_INT_H
#include "qemu/osdep.h"
-#include "qom/object.h"
-#define TYPE_TPM_IF "tpm-if"
-#define TPM_IF_CLASS(klass) \
- OBJECT_CLASS_CHECK(TPMIfClass, (klass), TYPE_TPM_IF)
-#define TPM_IF_GET_CLASS(obj) \
- OBJECT_GET_CLASS(TPMIfClass, (obj), TYPE_TPM_IF)
-#define TPM_IF(obj) \
- INTERFACE_CHECK(TPMIf, (obj), TYPE_TPM_IF)
-
-typedef struct TPMIf {
- Object parent_obj;
-} TPMIf;
-
-typedef struct TPMIfClass {
- InterfaceClass parent_class;
-
- /* run in thread pool by backend */
- void (*request_completed)(TPMIf *obj);
-} TPMIfClass;
-
-#define TPM_STANDARD_CMDLINE_OPTS \
+#define TPM_STANDARD_CMDLINE_OPTS \
{ \
.name = "type", \
.type = QEMU_OPT_STRING, \
diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
index d7a2bd8..452cdb9 100644
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -27,6 +27,25 @@ typedef enum TPMVersion {
TPM_VERSION_2_0 = 2,
} TPMVersion;
+#define TYPE_TPM_IF "tpm-if"
+#define TPM_IF_CLASS(klass) \
+ OBJECT_CLASS_CHECK(TPMIfClass, (klass), TYPE_TPM_IF)
+#define TPM_IF_GET_CLASS(obj) \
+ OBJECT_GET_CLASS(TPMIfClass, (obj), TYPE_TPM_IF)
+#define TPM_IF(obj) \
+ INTERFACE_CHECK(TPMIf, (obj), TYPE_TPM_IF)
+
+typedef struct TPMIf {
+ Object parent_obj;
+} TPMIf;
+
+typedef struct TPMIfClass {
+ InterfaceClass parent_class;
+
+ /* run in thread pool by backend */
+ void (*request_completed)(TPMIf *obj);
+} TPMIfClass;
+
TPMVersion tpm_tis_get_tpm_version(Object *obj);
#define TYPE_TPM_TIS "tpm-tis"
--
2.5.5
- [Qemu-devel] [PULL v1 00/32] Merge tpm 2017/12/15, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 01/32] tpm-tis: remove unused locty_number, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 02/32] tpm: move TpmIf in include/sysemu/tpm.h,
Stefan Berger <=
- [Qemu-devel] [PULL v1 03/32] tpm-backend: store TPMIf interface, improve backend_init(), Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 07/32] tpm-be: ask model to the TPM interface, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 06/32] tpm-be: report error instead of front-end, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 05/32] tpm-be: call request_completed() out of thread, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 04/32] tpm-tis: no longer expose TPMState, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 08/32] tpm: remove unused opened code, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 13/32] tpm-passthrough: make it safer to destroy after creation, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 11/32] tpm-passthrough: pass TPMPassthruState to handle_device_opts, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 10/32] tpm-be: update optional function pointers, Stefan Berger, 2017/12/16
- [Qemu-devel] [PULL v1 09/32] tpm-passthrough: don't save guessed cancel_path in options, Stefan Berger, 2017/12/16