From nobody Fri Apr 19 14:13:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1620061202; cv=none; d=zohomail.com; s=zohoarc; b=TcKebvBCbACB4+l2xrrjg3GmsxstoGgN74dzeaAQ9+km2RktPAchzd/5d/yEOiY0RloZLO72vqEZZwuN7CYQbEQuy9Im4hYrOrV5PbvRaNcTrBugoszHzFYaAi8Q5smyyBQjvobN/rdWDKFpnkwKcPWL4UVDf4TzaoefH5OGQpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620061202; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0X6grANLwk+ExZnCAqsNBYR2iXdC0Vt7l7CQDrbCCds=; b=Kjgdhjf42wTM0ylhpwWd/w4kW0AGJ9osA1vlr7WIPcnbANR3Ju7hBXaT4MIt0HgCzuDbny/FR9Bwb0XKE2EGqXgDXhfVFtL8kftOG1QQip8mbUcv3HX/DxjWzYg/cPGFDqHe7/7uhrf1UxvpI7goT5xYYj8eUwd0yZ/37yhDVEY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1620061202616726.5810426508691; Mon, 3 May 2021 10:00:02 -0700 (PDT) Received: from localhost ([::1]:48752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldbvN-0006wa-4G for importer@patchew.org; Mon, 03 May 2021 13:00:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldbr6-0002B2-Tw for qemu-devel@nongnu.org; Mon, 03 May 2021 12:55:37 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:42790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldbr0-0003wa-SL for qemu-devel@nongnu.org; Mon, 03 May 2021 12:55:36 -0400 Received: by mail-wr1-x434.google.com with SMTP id l2so6301543wrm.9 for ; Mon, 03 May 2021 09:55:30 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l12sm15282794wrq.36.2021.05.03.09.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 09:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0X6grANLwk+ExZnCAqsNBYR2iXdC0Vt7l7CQDrbCCds=; b=pgcTQqQi4c+8651MpF6VT7qy9wgG0PklaNSRcSzaRNqKI+bvBLftxuTJ9g5HJ4y5nx DR+25tHSjSjDmg3GI8/yfx41T7rBWOzFiY6nxKxDq14Unqv3MQbTj904cou5+FN6hqLJ T5uN2x6GS2oGMOJlEDOM5KFMZLB3FlwDmQ/A/7/QYQ1Lzl/o2RZPaZ5N5W9eFZkSarrh 7oY5YWsuHhGwhomvlTdQBHIa1n4tf70hrV1k3spS+NMWBCeIGnxsG/xqqzL4A4juAZ5f dPLhGjqJWVWwSYExg6lYcNvqEyP22q1A8mxLBN9aCNcThbhAZWLvejiplWjAFW0+LpJK kHHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0X6grANLwk+ExZnCAqsNBYR2iXdC0Vt7l7CQDrbCCds=; b=HcFlOyX1/Wn2Ew44mmoCkMgAOUCLh8gYWAMU1fy/iHguHz64ScCoNKgKqZRsbQmpgq HzfWkDLtMgSbDry3ij/KcUNyTNxUwv5L5lv+WwwyZnorHL2Qufnjo6RtzMS3DZDxCKwU 7hVz6O9mXLmucWSA/6wlJC2+5ZNtJt2NTjF40t+g9bLcoUUCJvXBz2ndG40HmeHGCcB+ pJ1KsnzOVjzUy+L1etNUSSj+uchmShtqghDw92XWsIenspSH5I/rohezuAnLVK4l10Sc uYje1WzoA2irxTAuB0F3OuY/gc6EN+MHF3PGDSQTe+A94yoWD2Le5oQKKajL12zJeBlI 72XQ== X-Gm-Message-State: AOAM531wbiXr/KjTvMNXU8LhJW5pWaIT7tVOS0C3XWMjXaqy0DeDa1WN HquBmDhTjwpiJf5RYC0Uvo6k9sEpb5v9ww== X-Google-Smtp-Source: ABdhPJzHyBLSngHI27/jgBU7BdwT/atkOgUw4wQP2BeqUZqTfLLBxCHOO9waw4693KE3EdqnMrASvA== X-Received: by 2002:adf:ef4d:: with SMTP id c13mr25740095wrp.277.1620060929081; Mon, 03 May 2021 09:55:29 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 1/3] tests/qtest/tpm-util.c: Free memory with correct free function Date: Mon, 3 May 2021 17:55:23 +0100 Message-Id: <20210503165525.26221-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210503165525.26221-1-peter.maydell@linaro.org> References: <20210503165525.26221-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth , Corey Minyard , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" tpm_util_migration_start_qemu() allocates memory with g_strdup_printf() but frees it with free() rather than g_free(), which provokes Coverity complaints (CID 1432379, 1432350). Use the correct free function. Fixes: Coverity CID 1432379, CID 1432350 Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Stefan Berger --- With newer glib (2.46 and up) g_free() is guaranteed to be the same as free(), but matching things up is neater anyway. --- tests/qtest/tpm-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c index b70cc32d600..3a40ff3f96c 100644 --- a/tests/qtest/tpm-util.c +++ b/tests/qtest/tpm-util.c @@ -289,6 +289,6 @@ void tpm_util_migration_start_qemu(QTestState **src_qem= u, =20 *dst_qemu =3D qtest_init(dst_qemu_args); =20 - free(src_qemu_args); - free(dst_qemu_args); + g_free(src_qemu_args); + g_free(dst_qemu_args); } --=20 2.20.1 From nobody Fri Apr 19 14:13:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1620061645; cv=none; d=zohomail.com; s=zohoarc; b=JfXenZgVJ9Uvv87Hir/UsPuov1KPKj9w3G0I/Q2aqhkYWOcqbTQV7rJ7Y4uffAOzhgihfUTBJt3kkAtfSX0z4LBcjw+JAuyAHbKh7gG6VOtAGliicjSVo27l75Uy82f/N57e60aYhohXp5Nau75q6UbnpWWw6DXApjjJwUOvMQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620061645; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mkpirsNiMlVmZd+09xTtwkgWmN3PKfelYRM6Pw/fjeM=; b=NtYIZiTMVUs6LHw01U5TNXKClunFMP1Y69nJXpjEUZbGwR21buiUKjgfmfH0VnUU++4FFwhDa2LKS2+BoxBR3m9Hv/ODAD3ffQHoN/skYf43kxMaKHpqQ3C+nZ69UzLA13maKZe1MFovVSkI9eqv7MhRVQY8SmJgGfTGvEcFNjE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1620061645262102.69832576436636; Mon, 3 May 2021 10:07:25 -0700 (PDT) Received: from localhost ([::1]:36198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldc2V-0005ZV-RF for importer@patchew.org; Mon, 03 May 2021 13:07:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldbr9-0002Eu-9k for qemu-devel@nongnu.org; Mon, 03 May 2021 12:55:40 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:45820) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldbr5-0003wg-NC for qemu-devel@nongnu.org; Mon, 03 May 2021 12:55:39 -0400 Received: by mail-wr1-x436.google.com with SMTP id h4so6286668wrt.12 for ; Mon, 03 May 2021 09:55:30 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l12sm15282794wrq.36.2021.05.03.09.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 09:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mkpirsNiMlVmZd+09xTtwkgWmN3PKfelYRM6Pw/fjeM=; b=OOtOYgDirwGM2GuYc2u7QqN4aQCeuRvfZrNw2AARPtVhDAab07yTdQBihHIDqdJE1F dqwGRWuV65JNOfgLx+uqRJ6L+t++Aii1ogUoKm9+6C1Ott8b+rLpb48hB8sMi8jgli80 1X0+t64FdbCKO3NEaiA5BudHeu6d7iohGiP6Tcn/OTNXAunkhGZlYV0mvqBQSI4fV+De 2ODg4oL8SyOOOgaE2Q6mZwBr5+ZsLGieIyvAquUbe0Czl5IYaE+nGDik1STcy0CkELEp LpuFNqPWItWsQNPE5v8DjfGwJH5nzBLkwd3S9iLignXxQiM9XVelCgtzeP60f4+4ubpc ZeLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mkpirsNiMlVmZd+09xTtwkgWmN3PKfelYRM6Pw/fjeM=; b=ui3rABKzOwfAxWtpPnRdwooSkD1/fPFTGYt4dC9RLB8/Ausfv7lSLnP+EL8MprCp4F 8JfKPtxGkmlzzdF7YgVkdUxd5FLBILMPBw00n67WgIHbL53sj9QMh9bsEIry0w++N6BB qXWA7gEv8irVAL+Ib6zxS8dGeF0ErzJfXuCEwo4hRZJqRGJrdif3Omk2EldPRLY0nmtS 7fi8W/b3rjrC8qdZWzoiRQnrTZd0/LLBXyLTQAhfEQznYmH0TjmSbQUnuA5EhOnHklAV xJMevRoJI6Qr0WX/LdQpH9MRuy3lYU+pfxZT9JN4h5yL5Wqz7HQuredZOEaYzIDmfkrd AE3Q== X-Gm-Message-State: AOAM531eRtk2/tRcix1wze835xsOAj8YTKeSbTzAcOq1mH8BauFFidMW GLZb/6OUUyr+IFG3/P9nz0Ftrxdwd9VEJg== X-Google-Smtp-Source: ABdhPJzc8tfuTITPtWwgfUWPJ48A7BPdhOiESJV6ECTqYajr6qdVy/SxK7E5+RKFFym13bp3CStrdA== X-Received: by 2002:adf:e70b:: with SMTP id c11mr1595433wrm.196.1620060929842; Mon, 03 May 2021 09:55:29 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 2/3] tests/qtest/rtc-test: Remove pointless NULL check Date: Mon, 3 May 2021 17:55:24 +0100 Message-Id: <20210503165525.26221-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210503165525.26221-1-peter.maydell@linaro.org> References: <20210503165525.26221-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth , Corey Minyard , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In rtc-test.c we know that s is non-NULL because qtest_start() will return a non-NULL value, and we assume this when we pass s to qtest_irq_intercept_in(). So we can drop the initial assignment of NULL and the "if (s)" condition at the end of the function. Fixes: Coverity CID 1432353 Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth --- tests/qtest/rtc-test.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/qtest/rtc-test.c b/tests/qtest/rtc-test.c index 402ce2c6090..8126ab1bdb8 100644 --- a/tests/qtest/rtc-test.c +++ b/tests/qtest/rtc-test.c @@ -686,7 +686,7 @@ static void periodic_timer(void) =20 int main(int argc, char **argv) { - QTestState *s =3D NULL; + QTestState *s; int ret; =20 g_test_init(&argc, &argv, NULL); @@ -712,9 +712,7 @@ int main(int argc, char **argv) =20 ret =3D g_test_run(); =20 - if (s) { - qtest_quit(s); - } + qtest_quit(s); =20 return ret; } --=20 2.20.1 From nobody Fri Apr 19 14:13:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1620061225; cv=none; d=zohomail.com; s=zohoarc; b=WjnfLauZH69q/m1YrVUXAq2IbIk+579ur5O4WVC/KX6qqqpvwUUeA3+e/HZrayL5fUeby6a8+OiKWkYM+kfNUbp2ty2O29seqkiteMwz7VXzuHR4HHAAw0yYmpua5NTKTQggDbK2XL0SUMPvIX4am0Uz4wnX2Yy+qK0qJrti720= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620061225; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sufPYBXl/XlfFN5YQ0XgohAInzRqzYbi1Ozy2tIcTHA=; b=ElkjVy/qrBVIEq/lb+HFm2J83GP6/9SdOMiMMxIATZC3a0BIBI1DyQsVTxkGC7+9Hi69ot1fKk4v8E68Di+IL7L9UpMao9rAJoLJYZCiQewy0cqsDS1mndB7pV906g+cpYBq5GRrFsKyzGzj/ZIixlr037DU3qfN8SVGih5JKWw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1620061225074494.1581944144468; Mon, 3 May 2021 10:00:25 -0700 (PDT) Received: from localhost ([::1]:50130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldbvi-0007Uz-TB for importer@patchew.org; Mon, 03 May 2021 13:00:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldbr7-0002Ba-Pt for qemu-devel@nongnu.org; Mon, 03 May 2021 12:55:37 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:36661) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldbr4-0003xX-Vy for qemu-devel@nongnu.org; Mon, 03 May 2021 12:55:37 -0400 Received: by mail-wr1-x430.google.com with SMTP id m9so6324401wrx.3 for ; Mon, 03 May 2021 09:55:31 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id l12sm15282794wrq.36.2021.05.03.09.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 09:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sufPYBXl/XlfFN5YQ0XgohAInzRqzYbi1Ozy2tIcTHA=; b=vB9TX8BlLHz8qjrDXZykdpc55QpidlZtp0jABrhS1ZoU7OGFGNLjs95qQpMNxN+p5/ pJ2eNQlksDC86CNQ8VUdqAxRvk9A8twMvi9y4jrcml81o9+F9N6gcgNQrsLVDLgvg2Gb KiMuU0SpKiSxda+tpY+6UkiSbY9nCyxeR7yeZTFzVH+AJrzknNIZ5ur6yB8CCAfVINKo wzZtU9QbNxgigRMcheaVGuTV7x2ye5rJZzR4CX/n8bGz5yT0+nHRiyjNHp4uydLiUfjB mOFAOp6ZIfIhuW3LznOF4FAZ3Khi6Ly7Z29cxbsSutWflRyLPPEsapGAX4f33QFmfIov hwJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sufPYBXl/XlfFN5YQ0XgohAInzRqzYbi1Ozy2tIcTHA=; b=qF3aBfuqWuwXk7x8a4KoDRJR0QYfKAqDDEsbUR4qwfSBGn5D2abX9oIRIRn/Y9Fkeu X0v53TEy/85ddb2IuNr+HXzOHsOgQgZjAVCHiJnXJOSNFZvQfU0E4RG80F6ORX4QIOUk +sh0P3UTjK+BrihpN7i9uWGt8kOnSCtEpumD3y6Ygm+UBzvU27QTl8BY9aNkliP23RMO nnmeGevqysEFBKE99JR5yHFkeH5ftYpSP8A3O4txr0kYQhEmuRtaWZZcr8MEdmSaqBzz G6y0xz/ORH+Hh9sXHtMmkaEROgNhmw+sXOivsVaf5shgQX7+xgb2ckvolS1GZGOxu0Yo rijw== X-Gm-Message-State: AOAM5314HdljPmKldbiW4GIupkaLU5iPoxxy+mQf9fFLhLomZRXHt8uu XD4ndAPtKWnLomX4A5ueVw7BWraZ/ZwgXA== X-Google-Smtp-Source: ABdhPJwuAlc8AcDr819y+k/gsDCcgPhUfpypNB0k8h62pmpaKDETb6G2T21+7TnA0NA8wgeYANFkWg== X-Received: by 2002:adf:d22c:: with SMTP id k12mr26598195wrh.25.1620060931081; Mon, 03 May 2021 09:55:31 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 3/3] tests: Avoid side effects inside g_assert() arguments Date: Mon, 3 May 2021 17:55:25 +0100 Message-Id: <20210503165525.26221-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210503165525.26221-1-peter.maydell@linaro.org> References: <20210503165525.26221-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth , Corey Minyard , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" For us, assertions are always enabled, but side-effect expressions inside the argument to g_assert() are bad style anyway. Fix three occurrences in IPMI related tests, which will silence some Coverity nits. Fixes: CID 1432322, CID 1432287, CID 1432291 Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/ipmi-bt-test.c | 6 ++++-- tests/qtest/ipmi-kcs-test.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/qtest/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c index a42207d416f..8492f02a9c3 100644 --- a/tests/qtest/ipmi-bt-test.c +++ b/tests/qtest/ipmi-bt-test.c @@ -98,7 +98,8 @@ static void bt_wait_b_busy(void) { unsigned int count =3D 1000; while (IPMI_BT_CTLREG_GET_B_BUSY() !=3D 0) { - g_assert(--count !=3D 0); + --count; + g_assert(count !=3D 0); usleep(100); } } @@ -107,7 +108,8 @@ static void bt_wait_b2h_atn(void) { unsigned int count =3D 1000; while (IPMI_BT_CTLREG_GET_B2H_ATN() =3D=3D 0) { - g_assert(--count !=3D 0); + --count; + g_assert(count !=3D 0); usleep(100); } } diff --git a/tests/qtest/ipmi-kcs-test.c b/tests/qtest/ipmi-kcs-test.c index fc0a918c8d1..afc24dd3e46 100644 --- a/tests/qtest/ipmi-kcs-test.c +++ b/tests/qtest/ipmi-kcs-test.c @@ -73,7 +73,8 @@ static void kcs_wait_ibf(void) { unsigned int count =3D 1000; while (IPMI_KCS_CMDREG_GET_IBF() !=3D 0) { - g_assert(--count !=3D 0); + --count; + g_assert(count !=3D 0); } } =20 --=20 2.20.1