summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2013-04-02 22:14:51 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-04-03 15:06:03 -0500
commit8243b0464b247ff460178a15f1fe306ef9c70b49 (patch)
treea852cec95a1bdd2a774f9f98e51e69173680dd2b
parenteabb21aac9665097676b97fa3e053ae2982eba1e (diff)
downloadqemu-8243b0464b247ff460178a15f1fe306ef9c70b49.tar.gz
tpm: Fix several compiler warnings (redefined data types)
Signed-off-by: Stefan Weil <sw@weilnetz.de> Message-id: 1364933691-21197-1-git-send-email-sw@weilnetz.de Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--tpm/tpm_int.h9
-rw-r--r--tpm/tpm_tis.h4
2 files changed, 4 insertions, 9 deletions
diff --git a/tpm/tpm_int.h b/tpm/tpm_int.h
index b4787ad27f..340bfd52f1 100644
--- a/tpm/tpm_int.h
+++ b/tpm/tpm_int.h
@@ -15,11 +15,8 @@
#include "exec/memory.h"
#include "tpm/tpm_tis.h"
-struct TPMDriverOps;
-typedef struct TPMDriverOps TPMDriverOps;
-
/* overall state of the TPM interface */
-typedef struct TPMState {
+struct TPMState {
ISADevice busdev;
MemoryRegion mmio;
@@ -32,12 +29,10 @@ typedef struct TPMState {
char *backend;
TPMBackend *be_driver;
-} TPMState;
+};
#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
-typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty);
-
struct TPMDriverOps {
enum TpmType type;
/* get a descriptive text of the backend to display to the user */
diff --git a/tpm/tpm_tis.h b/tpm/tpm_tis.h
index 0c8df80cce..7f216e56b2 100644
--- a/tpm/tpm_tis.h
+++ b/tpm/tpm_tis.h
@@ -35,10 +35,10 @@
#define TYPE_TPM_TIS "tpm-tis"
-typedef struct TPMSizedBuffer {
+struct TPMSizedBuffer {
uint32_t size;
uint8_t *buffer;
-} TPMSizedBuffer;
+};
typedef enum {
TPM_TIS_STATE_IDLE = 0,