Commit a05c4c2b authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: selftests: Use GUEST_FAIL() in ARM's arch timer helpers 

Use GUEST_FAIL() in ARM's arch timer helpers now that printf-based
guest asserts are the default (and only) style of guest asserts, and
say goodbye to the GUEST_ASSERT_1() alias.

Link: https://lore.kernel.org/r/20230729003643.1053367-35-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 6f321017

tools/testing/selftests/kvm/include/aarch64/arch_timer.h

+6 −6
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static inline uint64_t timer_get_cntct(enum arch_timer timer) 
	case PHYSICAL:

		return read_sysreg(cntpct_el0);

	default:

		GUEST_ASSERT_1(0, timer);

		GUEST_FAIL("Unexpected timer type = %u", timer);

	}



	/* We should not reach here */
@@ -58,7 +58,7 @@ static inline void timer_set_cval(enum arch_timer timer, uint64_t cval) 
		write_sysreg(cval, cntp_cval_el0);

		break;

	default:

		GUEST_ASSERT_1(0, timer);

		GUEST_FAIL("Unexpected timer type = %u", timer);

	}



	isb();
@@ -72,7 +72,7 @@ static inline uint64_t timer_get_cval(enum arch_timer timer) 
	case PHYSICAL:

		return read_sysreg(cntp_cval_el0);

	default:

		GUEST_ASSERT_1(0, timer);

		GUEST_FAIL("Unexpected timer type = %u", timer);

	}



	/* We should not reach here */
@@ -89,7 +89,7 @@ static inline void timer_set_tval(enum arch_timer timer, uint32_t tval) 
		write_sysreg(tval, cntp_tval_el0);

		break;

	default:

		GUEST_ASSERT_1(0, timer);

		GUEST_FAIL("Unexpected timer type = %u", timer);

	}



	isb();
@@ -105,7 +105,7 @@ static inline void timer_set_ctl(enum arch_timer timer, uint32_t ctl) 
		write_sysreg(ctl, cntp_ctl_el0);

		break;

	default:

		GUEST_ASSERT_1(0, timer);

		GUEST_FAIL("Unexpected timer type = %u", timer);

	}



	isb();
@@ -119,7 +119,7 @@ static inline uint32_t timer_get_ctl(enum arch_timer timer) 
	case PHYSICAL:

		return read_sysreg(cntp_ctl_el0);

	default:

		GUEST_ASSERT_1(0, timer);

		GUEST_FAIL("Unexpected timer type = %u", timer);

	}



	/* We should not reach here */

tools/testing/selftests/kvm/include/ucall_common.h

+0 −4
Original line number Diff line number Diff line
@@ -103,8 +103,4 @@ do { \ 
		    (const char *)(ucall).args[GUEST_FILE],			\

		    (ucall).args[GUEST_LINE], "%s", (ucall).buffer)



/* FIXME: Drop this alias once the param-based guest asserts are gone. */

#define GUEST_ASSERT_1(_condition, arg1) \

	__GUEST_ASSERT(_condition, "arg1 = 0x%lx", arg1)



#endif /* SELFTEST_KVM_UCALL_COMMON_H */