From nobody Fri May 3 02:54:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1574883767; cv=none; d=zohomail.com; s=zohoarc; b=HbMkvN2CdCtQV0TXjroBJ24751gHWkJepwIAbVNokaZ6zStbgNWo03b8+XPTv0uzp4b87pX+q7SCejNrzApSM1ENRETq564vmbyTn7C0SC7bxeTgRrE89Z+4WjPEsdWVU4GDTJgkC8a4n7piz5Pa1bjeoIQ8DxwNcIabrsP5jyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574883767; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=wVHFCEHjIBiQxbW8/LDgr1dXIXXBRIR9yMl7lZEakU0=; b=R5R/nkud4BWVbEo+O1wKq8bee06Q6GYC99pD3E53ghQuR3hUgBvmZO81qi7NKmdshTWVUzXZKogAw0vfQZhfEIK7+OvdQi77gQ7mxninjLsDPwapnS3OHbgpCshOQnqXYDSMzz2r1h78EMmrdAP3aRjaCNDdhWnL8Pckbik6Qpc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157488376770698.39492621723514; Wed, 27 Nov 2019 11:42:47 -0800 (PST) Received: from localhost ([::1]:42610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia3D3-0002mJ-Pt for importer@patchew.org; Wed, 27 Nov 2019 14:42:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44791) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia37O-0005d2-O4 for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:36:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia37N-0003SN-Hd for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:36:54 -0500 Received: from relay.sw.ru ([185.231.240.75]:55074) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ia37N-0003Oo-8M for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:36:53 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ia37J-0004Xw-3a; Wed, 27 Nov 2019 22:36:49 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v6] hw/tpm: rename Error ** parameter to more common errp Date: Wed, 27 Nov 2019 22:36:48 +0300 Message-Id: <20191127193648.23403-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vsementsov@virtuozzo.com, stefanb@linux.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefan Berger --- v6: add Stefan's r-b 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_e= mu, 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 =3D false; @@ -165,20 +165,20 @@ static int tpm_emulator_unix_tx_bufs(TPMEmulator *tpm= _emu, is_selftest =3D tpm_util_is_selftest(in, in_len); } =20 - ret =3D qio_channel_write_all(tpm_emu->data_ioc, (char *)in, in_len, e= rr); + ret =3D qio_channel_write_all(tpm_emu->data_ioc, (char *)in, in_len, e= rrp); if (ret !=3D 0) { return -1; } =20 ret =3D qio_channel_read_all(tpm_emu->data_ioc, (char *)out, - sizeof(struct tpm_resp_hdr), err); + sizeof(struct tpm_resp_hdr), errp); if (ret !=3D 0) { return -1; } =20 ret =3D 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 !=3D 0) { return -1; } --=20 2.21.0