Re: [PATCH v8 16/21] hw/tpm: rename Error ** parameter to more common errp

[Philippe Mathieu-Daudé]

On 12/5/19 6:46 PM, Vladimir Sementsov-Ogievskiy wrote:

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Reviewed-by: Stefan Berger <stef...@linux.ibm.com>

Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.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 22f9113432..10d587ed40 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;
      }