haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hw/tpm: rename Error ** parameter to more common errp

Browse source 
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>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-12-05 20:46:30 +03:00 committed by Markus Armbruster
parent 1019388c82
commit e04e332134
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hw/tpm/tpm_emulator.c
View file

@ -155,7 +155,7 @@ static int tpm_emulator_unix_tx_bufs(TPMEmulator *tpm_emu,
const uint8_t *in, uint32_t in_len, const uint8_t *in, uint32_t in_len,
uint8_t *out, uint32_t out_len, uint8_t *out, uint32_t out_len,
bool *selftest_done, bool *selftest_done,
Error **err) Error **errp)
{ {
ssize_t ret; ssize_t ret;
bool is_selftest = false; 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); 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) { if (ret != 0) {
return -1; return -1;
} }
ret = qio_channel_read_all(tpm_emu->data_ioc, (char *)out, 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) { if (ret != 0) {
return -1; return -1;
} }
ret = qio_channel_read_all(tpm_emu->data_ioc, ret = qio_channel_read_all(tpm_emu->data_ioc,
(char *)out + sizeof(struct tpm_resp_hdr), (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) { if (ret != 0) {
return -1; return -1;
} }