[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v1 13/21] tpm: remove locty argument from receive_cb
From: |
Stefan Berger |
Subject: |
[Qemu-devel] [PULL v1 13/21] tpm: remove locty argument from receive_cb |
Date: |
Thu, 19 Oct 2017 14:02:47 -0400 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Reviewed-by: Stefan Berger <address@hidden>
Signed-off-by: Stefan Berger <address@hidden>
---
hw/tpm/tpm_emulator.c | 3 +--
hw/tpm/tpm_passthrough.c | 4 +---
hw/tpm/tpm_tis.c | 5 ++---
include/sysemu/tpm_backend.h | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
index a6763e8..8fbe9ad 100644
--- a/hw/tpm/tpm_emulator.c
+++ b/hw/tpm/tpm_emulator.c
@@ -193,8 +193,7 @@ static void tpm_emulator_handle_request(TPMBackend *tb)
error_report_err(err);
}
- tb->recv_data_callback(tb->tpm_state, tb->tpm_state->locty_number,
- selftest_done);
+ tb->recv_data_callback(tb->tpm_state, selftest_done);
}
static int tpm_emulator_probe_caps(TPMEmulator *tpm_emu)
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index fed3d69..0ae4596 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -160,9 +160,7 @@ static void tpm_passthrough_handle_request(TPMBackend *tb)
tb->tpm_state->locty_data,
&selftest_done);
- tb->recv_data_callback(tb->tpm_state,
- tb->tpm_state->locty_number,
- selftest_done);
+ tb->recv_data_callback(tb->tpm_state, selftest_done);
}
static void tpm_passthrough_reset(TPMBackend *tb)
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index c54dac3..345a4fb 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -371,14 +371,13 @@ static void tpm_tis_receive_bh(void *opaque)
/*
* 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)
{
TPMTISEmuState *tis = &s->s.tis;
+ uint8_t locty = s->locty_number;
uint8_t l;
- assert(s->locty_number == locty);
-
if (is_selftest_done) {
for (l = 0; l < TPM_TIS_NUM_LOCALITIES; l++) {
tis->loc[locty].sts |= TPM_TIS_STS_SELFTEST_DONE;
diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index 7d7ebfc..9c83a51 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -30,7 +30,7 @@
typedef struct TPMBackendClass TPMBackendClass;
typedef struct TPMBackend TPMBackend;
-typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty, bool selftest_done);
+typedef void (TPMRecvDataCB)(TPMState *, bool selftest_done);
struct TPMBackend {
Object parent;
--
2.5.5
- [Qemu-devel] [PULL v1 00/21] Merge tpm 2017/10/19, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 16/21] tpm: remove locty_data from TPMState, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 01/21] tpm-tis: remove unused hw_access argument, Stefan Berger, 2017/10/19
- [Qemu-devel] [PULL v1 21/21] tpm: move recv_data_callback to TPM interface, Stefan Berger, 2017/10/19
- [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 <=
- [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, 2017/10/19
- [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