From mboxrd@z Thu Jan 1 00:00:00 1970 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 22195EB64DD for ; Sat, 29 Jul 2023 00:38:54 +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 :References:Mime-Version:In-Reply-To:Date:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6zCvIWkBuHwemd6oBP2UOf/t1NvPdVpVGVimV9vAx4A=; b=3z902uEZ5zutQE vwq23zSKld96CWV44z6zoBDD4+HPMdTbmXZsWUQff/W33f58NiuRJvbvoQoC9Vs2qLbaHOG+9KqoA qFD/gN2FXtkbaUJxT0GnV4Og32AZPB+FNEpKfnHJMznKLM8KGWwzA1iCEeCjfGGNVpnSfzy8qnZcx dnKjIV0WDQ4qhexn3ya/k9+4JtpSg3XigQj/IgnYeaN7NBSLI5pS+LkjBVCbTAI6SYCRZaQ5/eVQr EdD/eqIMQnM25IjKfq7B9u2eJB5su8rFbNfCpbUmnNKE9OOfsxbLWW0OQr+ApoNuXcLtChzPv7hib wRqM/GGXcn20dejP/V1w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qPXyN-005dJP-1o; Sat, 29 Jul 2023 00:38:19 +0000 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qPXxG-005chz-1v for linux-arm-kernel@lists.infradead.org; Sat, 29 Jul 2023 00:37:11 +0000 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-58440eb872aso28996877b3.3 for ; Fri, 28 Jul 2023 17:37:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690591029; x=1691195829; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=wu4FIC3h9waVlshrR9u15d0CHMaQIDGVSbYx3EG04CA=; b=Q04Mf0el0lj42W5CyQit+deYtJ8QhAiSTuhlHtHpss5X9mHsFREv9pAjkA8Umzzpec z2MZTBlNwMlYWVVc7jlHkM0CgDBhYSqKk80RWVzksAIdRWMzevbW1mKyru4oBtXSj5H4 m6Y/c47W8GxbL3qevPjkSSP7Fvl4k1vbdy6jI1X6Mu6B/+sTNRMI9LsAHW+sZ3/Cjtna KYEmzp1hmEEjPQVxCmUas0BEGE4lj8arVq+7r3PN0H6HoRmfvsyDiXkfqpnkvZEIMNS8 xc0Ohhn24LAbCMmrkVsDurMlVKgVNxcSVlsTO0MATuz98mHcaBk17CNAUEHGB1MtfxGX D+BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690591029; x=1691195829; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wu4FIC3h9waVlshrR9u15d0CHMaQIDGVSbYx3EG04CA=; b=GR39NyO0rC220obOFDmanmUD28tjDVUz7CLllM7s4Aiz8xksCCr52W7m9/RgKskd8/ eNyy8z92NjLGHhNxS4QXM4/S/2GYetCU1T6w81don8FiqhlWLVXMxhscUh5sdk/cIyqx N/5R7d9x4fM25u7pxpZOL42rYVZSzgvoRco0BrUuSaeFSDlReCypv4PuJnWfDPyLDb1n BaDmJbkTOoIxPVIj9dmjIlwqlZ9IULTVZ0aT/b8dD+DQaxEsMVQxBC0LHHWC9YYp6Gnj MR3wcEh3SukvUXzqPq6TgkI68ZkYS1B6U8/cM0Dd5/aDsiFDYdlNnZcoV8vOQv9HuOqU iVQg== X-Gm-Message-State: ABy/qLY5LQ05/lZRmHWnQ6rGNxn3kYjs83uOMha8FfDRVihZ6NPz57Of 3/l0D6KAqDd6PoFm9OJqDEpbUHhvEqY= X-Google-Smtp-Source: APBJJlGzWzIiwoRLp4Z8GC3Y2NOo6GBZ+PY3Wo7QtnMh9LciT0gmn3cUuXWNKJuT0Aj+FA3/xsDneSWd6xU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:b645:0:b0:577:4540:905a with SMTP id h5-20020a81b645000000b005774540905amr24915ywk.7.1690591029333; Fri, 28 Jul 2023 17:37:09 -0700 (PDT) Date: Fri, 28 Jul 2023 17:36:21 -0700 In-Reply-To: <20230729003643.1053367-1-seanjc@google.com> Mime-Version: 1.0 References: <20230729003643.1053367-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230729003643.1053367-13-seanjc@google.com> Subject: [PATCH v4 12/34] KVM: selftests: Convert ARM's hypercalls test to printf style GUEST_ASSERT From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Christian Borntraeger , Janosch Frank , Claudio Imbrenda Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, Sean Christopherson , Thomas Huth , "=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?=" , Aaron Lewis X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230728_173710_647914_D95BF4D7 X-CRM114-Status: GOOD ( 10.07 ) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert ARM's hypercalls test to use printf-based GUEST_ASSERT(). Opportunistically use GUEST_FAIL() to complain about an unexpected stage. Signed-off-by: Sean Christopherson --- .../selftests/kvm/aarch64/hypercalls.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/hypercalls.c b/tools/testing/selftests/kvm/aarch64/hypercalls.c index bef1499fb465..94555a7d3c7e 100644 --- a/tools/testing/selftests/kvm/aarch64/hypercalls.c +++ b/tools/testing/selftests/kvm/aarch64/hypercalls.c @@ -8,6 +8,7 @@ * hypercalls are properly masked or unmasked to the guest when disabled or * enabled from the KVM userspace, respectively. */ +#define USE_GUEST_ASSERT_PRINTF 1 #include #include @@ -105,15 +106,17 @@ static void guest_test_hvc(const struct test_hvc_info *hc_info) switch (stage) { case TEST_STAGE_HVC_IFACE_FEAT_DISABLED: case TEST_STAGE_HVC_IFACE_FALSE_INFO: - GUEST_ASSERT_3(res.a0 == SMCCC_RET_NOT_SUPPORTED, - res.a0, hc_info->func_id, hc_info->arg1); + __GUEST_ASSERT(res.a0 == SMCCC_RET_NOT_SUPPORTED, + "a0 = 0x%lx, func_id = 0x%x, arg1 = 0x%llx, stage = %u", + res.a0, hc_info->func_id, hc_info->arg1, stage); break; case TEST_STAGE_HVC_IFACE_FEAT_ENABLED: - GUEST_ASSERT_3(res.a0 != SMCCC_RET_NOT_SUPPORTED, - res.a0, hc_info->func_id, hc_info->arg1); + __GUEST_ASSERT(res.a0 != SMCCC_RET_NOT_SUPPORTED, + "a0 = 0x%lx, func_id = 0x%x, arg1 = 0x%llx, stage = %u", + res.a0, hc_info->func_id, hc_info->arg1, stage); break; default: - GUEST_ASSERT_1(0, stage); + GUEST_FAIL("Unexpected stage = %u", stage); } } } @@ -132,7 +135,7 @@ static void guest_code(void) guest_test_hvc(false_hvc_info); break; default: - GUEST_ASSERT_1(0, stage); + GUEST_FAIL("Unexpected stage = %u", stage); } GUEST_SYNC(stage); @@ -290,10 +293,7 @@ static void test_run(void) guest_done = true; break; case UCALL_ABORT: - REPORT_GUEST_ASSERT_N(uc, "values: 0x%lx, 0x%lx; 0x%lx, stage: %u", - GUEST_ASSERT_ARG(uc, 0), - GUEST_ASSERT_ARG(uc, 1), - GUEST_ASSERT_ARG(uc, 2), stage); + REPORT_GUEST_ASSERT(uc); break; default: TEST_FAIL("Unexpected guest exit\n"); -- 2.41.0.487.g6d72f3e995-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel