From patchwork Thu Mar 14 17:51:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13592632 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DDE0EC54E60 for ; Thu, 14 Mar 2024 17:51:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID :Mime-Version:Date:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=TDI0UNBx92HjqKQGGBx17wwwnHtK6yG/6eKo1edAkdw=; b=QwPjmAWdX6lorE kVVQgtrDSkFCvu3Flj+P/NHmnSb0ZVpv47nS8QygfVoiKemBnWn2r9ouj5DICrw+BjtUnEXKLnPFE oo7FTj+97WNjXQuHo1gfQRXwAjv3e5WAgRTQZeA7uAiW4DXSadmSJNWkFyR8leBLO6QpLj+Qdt53x WcfTCUbxtG0aeNDuZDXs6We0gNGtUcrlWrhBp7xFIlGvc7e2jh2umOJzv/UA8CJke3xAWChq0vnYS wA6AYuQuV1wAAUCzSGljX4jCUxiLRyd2vGVLjy/o1j+G176mduaMqbzyz8leZO5DwvVdhKIZS/UxA +OkS1hDEn3x2ik8LzQGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkpEl-0000000FB30-2DgP; Thu, 14 Mar 2024 17:51:27 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkpEi-0000000FB2V-2zit for linux-arm-kernel@lists.infradead.org; Thu, 14 Mar 2024 17:51:26 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-dce775fa8adso1964938276.1 for ; Thu, 14 Mar 2024 10:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1710438679; x=1711043479; darn=lists.infradead.org; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:reply-to:from:to:cc:subject:date:message-id :reply-to; bh=Yo6oS4AcC009MmPBD5DloFbZft+lin+hzANIRBSkUSA=; b=33FNwoBH63ntvOvCRDDDkQLRRQe1hihKlOWyqrdOfD9PLiX4fg030fs5btKJAlMCg6 Bei4fLwKbSbfg/EfuiZ/koDS+dS/L0JjH1Avr7D8s24c8Bbf2qXd7XdthmP0+W26Xpkc U+6kYZ4Lh/lw3XF/Tlo+7r7DJqzZqueX8Ax4j05IAPRx47gBT7vUp/Qcdg/6EDLz1lm2 pU00ohWiMAeItjX6XviTyzhzBa3TgtzXE6y/x14L9Z6zE1D5TRfo78vlS8V10SMJDgxP MVleMN+Asvr7A84xzROxPxMXKFEoPhTJH7A3xlAOPWsQuRv34ECvtBS51bdObLA3aMh9 EHuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710438679; x=1711043479; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:reply-to:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=Yo6oS4AcC009MmPBD5DloFbZft+lin+hzANIRBSkUSA=; b=V85YQOcaVjA002DD5yYX31VIqJCnpOIxKjo/edmdGx6QLhulShO81wb56Gnzdm2HXl W7x/WsQPsA86EaE7CA253NnbxuVbz1T/s3852Egq7JFpakR8jE+vM8n3jaDmnFO9wWh1 PMf1TVUCz0dxy+KEAq9a9sB33CBNs5MfVruijxliD6gPvKENMpwq98xoLMWz4VLJZ4jv /J9kYveHYA+AOU4834ew5fCBvqm72xnZlVOefDfX8LbSdbJ8S1Nn46IpD/T5XpC7M9f/ wtyM/21t3lOsgVHS0baQQr2ZdjrZey6SdwNkk4zGCquxeYB94BMQSRrzL7fTpvIn6ZHz DE4Q== X-Gm-Message-State: AOJu0YxS55yhieIUFju1K/olBjmtjRcPg2G/6bBO0o269Em8h5NcY0LD 04pwUt5j8G+cDgr0p5niFNrlGZpgaVqBXKSmClYoLmzJjZLSaHJwtH+vXX+yzfHwr2DMpt4qy6q nLQ== X-Google-Smtp-Source: AGHT+IHj12Fv5pkl+ktVSIACg0smeX5esnto6C7bfpPJvOND3/RpBJcke5Qg1JIRU0EQaPE2grYP8ghXkRc= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:1b85:b0:dc6:e1ed:bd1a with SMTP id ei5-20020a0569021b8500b00dc6e1edbd1amr582659ybb.2.1710438679190; Thu, 14 Mar 2024 10:51:19 -0700 (PDT) Date: Thu, 14 Mar 2024 10:51:15 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.291.gc1ea87d7ee-goog Message-ID: <20240314175116.2366301-1-seanjc@google.com> Subject: [PATCH] KVM: selftests: Fix __GUEST_ASSERT() format warnings in ARM's arch timer test From: Sean Christopherson To: Marc Zyngier , Oliver Upton Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Sean Christopherson X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240314_105124_877577_6D4AA175 X-CRM114-Status: GOOD ( 11.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Sean Christopherson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use %x instead of %lx when printing uint32_t variables to fix format warnings in ARM's arch timer test. aarch64/arch_timer.c: In function ‘guest_run_stage’: aarch64/arch_timer.c:138:33: warning: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 6 has type ‘uint32_t’ {aka ‘unsigned int’} [-Wformat=] 138 | "config_iter + 1 = 0x%lx, irq_iter = 0x%lx.\n" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ...... 141 | config_iter + 1, irq_iter); | ~~~~~~~~~~~~~~~ | | | uint32_t {aka unsigned int} Fixes: d1dafd065a23 ("KVM: arm64: selftests: Enable tuning of error margin in arch_timer test") Signed-off-by: Sean Christopherson --- 2024 Whack-a-Mole Champion. Note, this is based on kvm/queue and probably won't apply to your tree as the buggy commit went in via the RISC-V pull request. tools/testing/selftests/kvm/aarch64/arch_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: e9a2bba476c8332ed547fce485c158d03b0b9659 diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c index ddba2c2fb5de..93100b3f1312 100644 --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c @@ -135,7 +135,7 @@ static void guest_run_stage(struct test_vcpu_shared_data *shared_data, irq_iter = READ_ONCE(shared_data->nr_iter); __GUEST_ASSERT(config_iter + 1 == irq_iter, - "config_iter + 1 = 0x%lx, irq_iter = 0x%lx.\n" + "config_iter + 1 = 0x%x, irq_iter = 0x%x.\n" " Guest timer interrupt was not trigged within the specified\n" " interval, try to increase the error margin by [-e] option.\n", config_iter + 1, irq_iter);