From nobody Tue Feb 10 05:39:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1769966920; cv=none; d=zohomail.com; s=zohoarc; b=I2p+Rhc+kzT+5qV84AztDytuMWWVF1Kp+bXBZCevQM+mnuuAS35uYx4JBztmlMGz3KY4/wtAw6AgWVPyENw/UKJ5wGEpyq+CcPOIFzMN0EpKHsbMdJ282fKdt26vQSqHNUr2+SITjs5TSlQAHPMVF/2ot6GUDKAOLqKw74Ron0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769966920; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=p/HiJz0NIZQ0XBoulvyvcheHVa0/FMBEXz3f3rwtPNk=; b=mYZZIz2jVqjBNj+Ks2BAUIj/OZacqussSDT7tsfyAlbIBjOeibZe3heo8lGJ8CukFzsSqg8jGCS4oDUw7pSZHsUitWZTfxn6Mz09avpG3YpEzW3Cb2Q2DHOPZ/FABf/nvHtI3bcEHUfbYbssH/L9AEj8Y7nB0T9yzSmSwQ7dIpc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1769966919625337.6459469248173; Sun, 1 Feb 2026 09:28:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vmbF9-0006Hs-0q; Sun, 01 Feb 2026 12:28:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vmbF1-0006FR-Ro for qemu-devel@nongnu.org; Sun, 01 Feb 2026 12:28:08 -0500 Received: from forwardcorp1a.mail.yandex.net ([2a02:6b8:c0e:500:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vmbEo-0001In-Jb for qemu-devel@nongnu.org; Sun, 01 Feb 2026 12:27:58 -0500 Received: from mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net [IPv6:2a02:6b8:c2d:3530:0:640:eca4:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id A824AC015A; Sun, 01 Feb 2026 20:27:50 +0300 (MSK) Received: from vsementsov-lin (unknown [2a02:6bf:8080:765::1:3b]) by mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id lRqPDK1ApmI0-7Uk5QDpl; Sun, 01 Feb 2026 20:27:49 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1769966870; bh=p/HiJz0NIZQ0XBoulvyvcheHVa0/FMBEXz3f3rwtPNk=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=SuQVn8Tswk0mUFMQVyxj9LmXyNybMsJ8zwNc31AN1VxwOZvpWhI75tsVhs/l04e7A AWo+gFgU5+lJCtdIr0uIug/hBpbeGkRIAnfNF6tw9imLwzM9EO7/ZJEawRirCpCx9h MPhxRLZMz/1ba8jf0+YFIEYeGiK7paxn9CVueIeI= Authentication-Results: mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: stefanb@linux.vnet.ibm.com Cc: qemu-devel@nongnu.org, armbru@redhat.com, peterx@redhat.com, vsementsov@yandex-team.ru, Stefan Berger Subject: [PATCH v2 2/3] tpm_emulator: drop direct use of errno variable Date: Sun, 1 Feb 2026 20:27:45 +0300 Message-ID: <20260201172746.404481-3-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260201172746.404481-1-vsementsov@yandex-team.ru> References: <20260201172746.404481-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a02:6b8:c0e:500:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.mail.yandex.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1769966923699158500 Content-Type: text/plain; charset="utf-8" The code tends to include errno into error messages after tpm_util_test_tpmdev() and tpm_emulator_ctrlcmd() calls. Both has error paths, where errno is not set, examples: tpm_emulator_ctrlcmd() qemu_chr_fe_write_all() qemu_chr_write() replay_char_write_event_load() ... *res =3D replay_get_dword(); ... tpm_util_test_tpmdev() tpm_util_test() tpm_util_request() ... if (n !=3D requestlen) { return -EFAULT; } ... Both doesn't document that they set errno. Let's drop these explicit usage of errno. If we need this information, it should be added to errp deeper in the stack. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefan Berger Reviewed-by: Markus Armbruster --- backends/tpm/tpm_emulator.c | 41 +++++++++++++++---------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index 6d8529da3b..79f3e6b1f2 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -225,7 +225,7 @@ static int tpm_emulator_set_locality(TPMEmulator *tpm_e= mu, uint8_t locty_number, if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_LOCALITY, &loc, sizeof(loc), sizeof(loc.u.resp.tpm_result), sizeof(loc)) < 0) { - error_setg_errno(errp, errno, "tpm-emulator: could not set localit= y"); + error_setg(errp, "tpm-emulator: could not set locality"); return -1; } =20 @@ -263,7 +263,7 @@ static int tpm_emulator_probe_caps(TPMEmulator *tpm_emu) if (tpm_emulator_ctrlcmd(tpm_emu, CMD_GET_CAPABILITY, &cap_n, 0, sizeof(cap_n.u.resp.tpm_result), sizeof(cap_n)) < 0) { - error_report("tpm-emulator: probing failed : %s", strerror(errno)); + error_report("tpm-emulator: probing failed"); return -1; } =20 @@ -314,7 +314,7 @@ static int tpm_emulator_stop_tpm(TPMBackend *tb, Error = **errp) =20 if (tpm_emulator_ctrlcmd(tpm_emu, CMD_STOP, &res, 0, sizeof(ptm_res), sizeof(res)) < 0) { - error_setg_errno(errp, errno, "tpm-emulator: Could not stop TPM"); + error_setg(errp, "tpm-emulator: Could not stop TPM"); return -1; } =20 @@ -342,8 +342,7 @@ static int tpm_emulator_lock_storage(TPMEmulator *tpm_e= mu) if (tpm_emulator_ctrlcmd(tpm_emu, CMD_LOCK_STORAGE, &pls, sizeof(pls.u= .req), sizeof(pls.u.resp.tpm_result), sizeof(pls.u.resp)) < 0) { - error_report("tpm-emulator: Could not lock storage within 3 second= s: " - "%s", strerror(errno)); + error_report("tpm-emulator: Could not lock storage within 3 second= s"); return -1; } =20 @@ -375,8 +374,7 @@ static int tpm_emulator_set_buffer_size(TPMBackend *tb, if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_BUFFERSIZE, &psbs, sizeof(psbs.u.req), sizeof(psbs.u.resp.tpm_re= sult), sizeof(psbs.u.resp)) < 0) { - error_setg_errno(errp, errno, - "tpm-emulator: Could not set buffer size"); + error_setg(errp, "tpm-emulator: Could not set buffer size"); return -1; } =20 @@ -424,7 +422,7 @@ static int tpm_emulator_startup_tpm_resume(TPMBackend *= tb, size_t buffersize, if (tpm_emulator_ctrlcmd(tpm_emu, CMD_INIT, &init, sizeof(init), sizeof(init.u.resp.tpm_result), sizeof(init)) < 0) { - error_setg_errno(errp, errno, "tpm-emulator: could not send INIT"); + error_setg(errp, "tpm-emulator: could not send INIT"); goto err_exit; } =20 @@ -479,8 +477,7 @@ static bool tpm_emulator_get_tpm_established_flag(TPMBa= ckend *tb) if (tpm_emulator_ctrlcmd(tpm_emu, CMD_GET_TPMESTABLISHED, &est, 0, sizeof(est) /* always returns resp.bit */, sizeof(est)) < 0) { - error_report("tpm-emulator: Could not get the TPM established flag= : %s", - strerror(errno)); + error_report("tpm-emulator: Could not get the TPM established flag= "); return false; } trace_tpm_emulator_get_tpm_established_flag(est.u.resp.bit); @@ -508,8 +505,7 @@ static int tpm_emulator_reset_tpm_established_flag(TPMB= ackend *tb, &reset_est, sizeof(reset_est), sizeof(reset_est.u.resp.tpm_result), sizeof(reset_est)) < 0) { - error_report("tpm-emulator: Could not reset the establishment bit:= %s", - strerror(errno)); + error_report("tpm-emulator: Could not reset the establishment bit"= ); return -1; } =20 @@ -539,8 +535,7 @@ static void tpm_emulator_cancel_cmd(TPMBackend *tb) /* FIXME: make the function non-blocking, or it may block a VCPU */ if (tpm_emulator_ctrlcmd(tpm_emu, CMD_CANCEL_TPM_CMD, &res, 0, sizeof(ptm_res), sizeof(res)) < 0) { - error_report("tpm-emulator: Could not cancel command: %s", - strerror(errno)); + error_report("tpm-emulator: Could not cancel command: %s"); } else if (res !=3D 0) { error_report("tpm-emulator: Failed to cancel TPM: 0x%x", be32_to_cpu(res)); @@ -601,8 +596,7 @@ static int tpm_emulator_prepare_data_fd(TPMEmulator *tp= m_emu) =20 if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_DATAFD, &res, 0, sizeof(ptm_res), sizeof(res)) < 0 || res !=3D= 0) { - error_report("tpm-emulator: Failed to send CMD_SET_DATAFD: %s", - strerror(errno)); + error_report("tpm-emulator: Failed to send CMD_SET_DATAFD"); goto err_exit; } =20 @@ -659,8 +653,8 @@ static int tpm_emulator_handle_device_opts(TPMEmulator = *tpm_emu, QemuOpts *opts) */ if (tpm_util_test_tpmdev(QIO_CHANNEL_SOCKET(tpm_emu->data_ioc)->fd, &tpm_emu->tpm_version)) { - error_report("'%s' is not emulating TPM device. Error: %s", - tpm_emu->options->chardev, strerror(errno)); + error_report("'%s' is not emulating TPM device.", + tpm_emu->options->chardev); goto err; } =20 @@ -750,8 +744,7 @@ static int tpm_emulator_get_state_blob(TPMEmulator *tpm= _emu, /* always returns up to resp.data */ offsetof(ptm_getstate, u.resp.data), offsetof(ptm_getstate, u.resp.data)) < 0) { - error_report("tpm-emulator: could not get state blob type %d : %s", - type, strerror(errno)); + error_report("tpm-emulator: could not get state blob type %d", typ= e); return -1; } =20 @@ -853,9 +846,8 @@ static int tpm_emulator_set_state_blob(TPMEmulator *tpm= _emu, /* write the header only */ if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_STATEBLOB, &pss, offsetof(ptm_setstate, u.req.data), 0, 0) < 0= ) { - error_setg_errno(errp, errno, - "tpm-emulator: could not set state blob type %d", - type); + error_setg(errp, "tpm-emulator: could not set state blob type %d", + type); return -1; } =20 @@ -1037,8 +1029,7 @@ static void tpm_emulator_shutdown(TPMEmulator *tpm_em= u) =20 if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SHUTDOWN, &res, 0, sizeof(ptm_res), sizeof(res)) < 0) { - error_report("tpm-emulator: Could not cleanly shutdown the TPM: %s= ", - strerror(errno)); + error_report("tpm-emulator: Could not cleanly shutdown the TPM"); } else if (res !=3D 0) { error_report("tpm-emulator: TPM result for shutdown: 0x%x %s", be32_to_cpu(res), tpm_emulator_strerror(be32_to_cpu(r= es))); --=20 2.52.0