OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tpm-tis: move TPMState to TIS header

Browse Source 
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>
This commit is contained in:
Marc-André Lureau 2017-10-10 00:55:58 +02:00 committed by Stefan Berger
parent d280976625
commit 5086bf9784
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/tpm/tpm_int.h
View File

@ -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, \

19
hw/tpm/tpm_tis.h
View File

@ -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 */

1
hw/tpm/tpm_util.c
View File

@ -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.