59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From f2dceb3cde537210896a2cadb8958cfd310113a3 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Date: Thu, 5 Dec 2019 20:46:30 +0300
|
|
Subject: [PATCH 01/19] hw/tpm: rename Error ** parameter to more common errp
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
|
|
Message-Id: <20191205174635.18758-17-vsementsov@virtuozzo.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
Signed-off-by: jiangfangjie <jiangfangjie@huawei.com>
|
|
---
|
|
hw/tpm/tpm_emulator.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
|
|
index fc0b512f..38bf5fd6 100644
|
|
--- a/hw/tpm/tpm_emulator.c
|
|
+++ b/hw/tpm/tpm_emulator.c
|
|
@@ -155,7 +155,7 @@ static int tpm_emulator_unix_tx_bufs(TPMEmulator *tpm_emu,
|
|
const uint8_t *in, uint32_t in_len,
|
|
uint8_t *out, uint32_t out_len,
|
|
bool *selftest_done,
|
|
- Error **err)
|
|
+ Error **errp)
|
|
{
|
|
ssize_t ret;
|
|
bool is_selftest = false;
|
|
@@ -165,20 +165,20 @@ static int tpm_emulator_unix_tx_bufs(TPMEmulator *tpm_emu,
|
|
is_selftest = tpm_util_is_selftest(in, in_len);
|
|
}
|
|
|
|
- ret = qio_channel_write_all(tpm_emu->data_ioc, (char *)in, in_len, err);
|
|
+ ret = qio_channel_write_all(tpm_emu->data_ioc, (char *)in, in_len, errp);
|
|
if (ret != 0) {
|
|
return -1;
|
|
}
|
|
|
|
ret = qio_channel_read_all(tpm_emu->data_ioc, (char *)out,
|
|
- sizeof(struct tpm_resp_hdr), err);
|
|
+ sizeof(struct tpm_resp_hdr), errp);
|
|
if (ret != 0) {
|
|
return -1;
|
|
}
|
|
|
|
ret = qio_channel_read_all(tpm_emu->data_ioc,
|
|
(char *)out + sizeof(struct tpm_resp_hdr),
|
|
- tpm_cmd_get_size(out) - sizeof(struct tpm_resp_hdr), err);
|
|
+ tpm_cmd_get_size(out) - sizeof(struct tpm_resp_hdr), errp);
|
|
if (ret != 0) {
|
|
return -1;
|
|
}
|
|
--
|
|
2.23.0
|
|
|