All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: Metin Kaya <metikaya@amazon.com>
Subject: [PATCH kvm-unit-tests 08/13] x86: hyper-v: Unify hyperv_clock with other Hyper-V tests
Date: Wed,  6 Mar 2024 18:18:18 +0100	[thread overview]
Message-ID: <20240306171823.761647-9-vkuznets@redhat.com> (raw)
In-Reply-To: <20240306171823.761647-1-vkuznets@redhat.com>

Always do 'return report_summary()' at the end, use report_abort() when an
abnormality is detected.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
 x86/hyperv_clock.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/x86/hyperv_clock.c b/x86/hyperv_clock.c
index 9c30fbebf249..d0993bb75ac7 100644
--- a/x86/hyperv_clock.c
+++ b/x86/hyperv_clock.c
@@ -153,7 +153,6 @@ static void perf_test(int ncpus)
 
 int main(int ac, char **av)
 {
-	int nerr = 0;
 	int ncpus;
 	struct hv_reference_tsc_page shadow;
 	uint64_t tsc1, t1, tsc2, t2;
@@ -161,7 +160,7 @@ int main(int ac, char **av)
 
 	if (!hv_time_ref_counter_supported()) {
 		report_skip("time reference counter is unsupported");
-		return report_summary();
+		goto done;
 	}
 
 	setup_vm();
@@ -176,10 +175,8 @@ int main(int ac, char **av)
 	       "MSR value after enabling");
 
 	hvclock_get_time_values(&shadow, hv_clock);
-	if (shadow.tsc_sequence == 0 || shadow.tsc_sequence == 0xFFFFFFFF) {
-		printf("Reference TSC page not available\n");
-		exit(1);
-	}
+	if (shadow.tsc_sequence == 0 || shadow.tsc_sequence == 0xFFFFFFFF)
+		report_abort("Reference TSC page not available\n");
 
 	printf("sequence: %u. scale: %" PRIx64" offset: %" PRId64"\n",
 	       shadow.tsc_sequence, shadow.tsc_scale, shadow.tsc_offset);
@@ -206,5 +203,6 @@ int main(int ac, char **av)
 	report(rdmsr(HV_X64_MSR_REFERENCE_TSC) == 0,
 	       "MSR value after disabling");
 
-	return nerr > 0 ? 1 : 0;
+done:
+	return report_summary();
 }
-- 
2.44.0


  parent reply	other threads:[~2024-03-06 17:19 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-06 17:18 [PATCH kvm-unit-tests 00/13] x86: hyperv-v: Various unmerged patches Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 01/13] x86: hyperv: Use correct macro in checking SynIC timer support Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 02/13] x86: hyperv: improve naming of stimer functions Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 03/13] x86: hyperv_clock: handle non-consecutive APIC IDs Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 04/13] x86: hyperv_clock: print sequence field of reference TSC page Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 05/13] x86: hyper-v: Use '-cpu host,hv_passhtrough' for Hyper-V tests Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 06/13] x86: hyper-v: Use report_skip() in hyperv_stimer when pre-requisites are not met Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 07/13] x86: hyper-v: Use 'goto' instead of putting the whole test in an 'if' branch in hyperv_synic Vitaly Kuznetsov
2024-03-06 17:18 ` Vitaly Kuznetsov [this message]
2024-03-06 17:18 ` [PATCH kvm-unit-tests 09/13] x86: hyperv_stimer: keep SINT number parameter in 'struct stimer' Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 10/13] x86: hyperv_stimer: define union hv_stimer_config Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 11/13] x86: hyperv_stimer: don't require hyperv-testdev Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 12/13] x86: hyperv_stimer: add direct mode tests Vitaly Kuznetsov
2024-03-06 17:18 ` [PATCH kvm-unit-tests 13/13] x86: hyperv-v: Rewrite flaky hv_clock_test() Vitaly Kuznetsov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240306171823.761647-9-vkuznets@redhat.com \
    --to=vkuznets@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=metikaya@amazon.com \
    --cc=pbonzini@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.