ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tpm: remove locty argument from receive_cb 

The tpm_state is passed as argument, the assert() is pointless since
we give it the value of tpm_state->locty_number already.

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:54 +02:00 committed by Stefan Berger
parent 54aa36d5c8
commit d1fd6b563d
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/tpm/tpm_emulator.c
View File

@ -193,8 +193,7 @@ static void tpm_emulator_handle_request(TPMBackend *tb)
error_report_err(err); error_report_err(err);
} }
tb->recv_data_callback(tb->tpm_state, tb->tpm_state->locty_number, tb->recv_data_callback(tb->tpm_state, selftest_done);
selftest_done);
} }
static int tpm_emulator_probe_caps(TPMEmulator *tpm_emu) static int tpm_emulator_probe_caps(TPMEmulator *tpm_emu)

4
hw/tpm/tpm_passthrough.c
View File

@ -160,9 +160,7 @@ static void tpm_passthrough_handle_request(TPMBackend *tb)
tb->tpm_state->locty_data, tb->tpm_state->locty_data,
&selftest_done); &selftest_done);
tb->recv_data_callback(tb->tpm_state, tb->recv_data_callback(tb->tpm_state, selftest_done);
tb->tpm_state->locty_number,
selftest_done);
} }
static void tpm_passthrough_reset(TPMBackend *tb) static void tpm_passthrough_reset(TPMBackend *tb)

5
hw/tpm/tpm_tis.c
View File

@ -371,14 +371,13 @@ static void tpm_tis_receive_bh(void *opaque)
/* /*
* Callback from the TPM to indicate that the response was received. * Callback from the TPM to indicate that the response was received.
*/ */
static void tpm_tis_receive_cb(TPMState *s, uint8_t locty, static void tpm_tis_receive_cb(TPMState *s,
bool is_selftest_done) bool is_selftest_done)
{ {
TPMTISEmuState *tis = &s->s.tis; TPMTISEmuState *tis = &s->s.tis;
uint8_t locty = s->locty_number;
uint8_t l; uint8_t l;
assert(s->locty_number == locty);
if (is_selftest_done) { if (is_selftest_done) {
for (l = 0; l < TPM_TIS_NUM_LOCALITIES; l++) { for (l = 0; l < TPM_TIS_NUM_LOCALITIES; l++) {
tis->loc[locty].sts |= TPM_TIS_STS_SELFTEST_DONE; tis->loc[locty].sts |= TPM_TIS_STS_SELFTEST_DONE;

2
include/sysemu/tpm_backend.h
View File

@ -30,7 +30,7 @@
typedef struct TPMBackendClass TPMBackendClass; typedef struct TPMBackendClass TPMBackendClass;
typedef struct TPMBackend TPMBackend; typedef struct TPMBackend TPMBackend;
typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty, bool selftest_done); typedef void (TPMRecvDataCB)(TPMState *, bool selftest_done);
struct TPMBackend { struct TPMBackend {
Object parent; Object parent;