proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-12-25 10:36:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Sean Christopherson <seanjc@google.com>
This commit is contained in:
Sean Christopherson 2023-07-28 17:36:43 -07:00
parent 6f321017c8
commit a05c4c2bd8
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/testing/selftests/kvm/include/aarch64/arch_timer.h
View File

@ -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 */

4
tools/testing/selftests/kvm/include/ucall_common.h
View File

@ -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 */