提交 d2809766 编写于 作者: M Marc-André Lureau 提交者: Stefan Berger

tpm: remove locty_data from TPMState

Keep it internal to tpm-tis instead.
Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: NStefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: NStefan Berger <stefanb@linux.vnet.ibm.com>
上级 c106ede9
...@@ -180,8 +180,7 @@ static void tpm_emulator_handle_request(TPMBackend *tb, TPMBackendCmd *cmd) ...@@ -180,8 +180,7 @@ static void tpm_emulator_handle_request(TPMBackend *tb, TPMBackendCmd *cmd)
DPRINTF("processing TPM command"); DPRINTF("processing TPM command");
if (tpm_emulator_set_locality(tpm_emu, if (tpm_emulator_set_locality(tpm_emu, cmd->locty, &err) < 0) {
tb->tpm_state->locty_number, &err) < 0) {
goto error; goto error;
} }
......
...@@ -24,8 +24,6 @@ struct TPMState { ...@@ -24,8 +24,6 @@ struct TPMState {
TPMTISEmuState tis; TPMTISEmuState tis;
} s; } s;
uint8_t locty_number;
TPMLocality *locty_data;
TPMBackendCmd cmd; TPMBackendCmd cmd;
char *backend; char *backend;
......
...@@ -203,12 +203,10 @@ static void tpm_tis_sts_set(TPMLocality *l, uint32_t flags) ...@@ -203,12 +203,10 @@ static void tpm_tis_sts_set(TPMLocality *l, uint32_t flags)
static void tpm_tis_tpm_send(TPMState *s, uint8_t locty) static void tpm_tis_tpm_send(TPMState *s, uint8_t locty)
{ {
TPMTISEmuState *tis = &s->s.tis; TPMTISEmuState *tis = &s->s.tis;
TPMLocality *locty_data = &tis->loc[locty];
tpm_tis_show_buffer(&tis->loc[locty].w_buffer, "tpm_tis: To TPM"); tpm_tis_show_buffer(&tis->loc[locty].w_buffer, "tpm_tis: To TPM");
s->locty_number = locty;
s->locty_data = &tis->loc[locty];
/* /*
* w_offset serves as length indicator for length of data; * w_offset serves as length indicator for length of data;
* it's reset when the response comes back * it's reset when the response comes back
...@@ -217,10 +215,10 @@ static void tpm_tis_tpm_send(TPMState *s, uint8_t locty) ...@@ -217,10 +215,10 @@ static void tpm_tis_tpm_send(TPMState *s, uint8_t locty)
s->cmd = (TPMBackendCmd) { s->cmd = (TPMBackendCmd) {
.locty = locty, .locty = locty,
.in = s->locty_data->w_buffer.buffer, .in = locty_data->w_buffer.buffer,
.in_len = s->locty_data->w_offset, .in_len = locty_data->w_offset,
.out = s->locty_data->r_buffer.buffer, .out = locty_data->r_buffer.buffer,
.out_len = s->locty_data->r_buffer.size .out_len = locty_data->r_buffer.size
}; };
tpm_backend_deliver_request(s->be_driver, &s->cmd); tpm_backend_deliver_request(s->be_driver, &s->cmd);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册