Skip to content

Commit 90a6bcb

Browse files
xiaobo55xavpatel
authored andcommitted
KVM: arm64: selftests: Move reject_set check logic to a function
No functional changes. Just move the reject_set check logic to a function so we can check for a specific errno. This is a preparation for support reject_set in riscv. Suggested-by: Andrew Jones <[email protected]> Signed-off-by: Haibo Xu <[email protected]> Reviewed-by: Andrew Jones <[email protected]> Signed-off-by: Anup Patel <[email protected]>
1 parent be4c580 commit 90a6bcb

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

tools/testing/selftests/kvm/aarch64/get-reg-list.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ bool check_supported_reg(struct kvm_vcpu *vcpu, __u64 reg)
7979
return check_supported_feat_reg(vcpu, reg);
8080
}
8181

82+
bool check_reject_set(int err)
83+
{
84+
return err == EPERM;
85+
}
86+
8287
#define REG_MASK (KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK | KVM_REG_ARM_COPROC_MASK)
8388

8489
#define CORE_REGS_XX_NR_WORDS 2

tools/testing/selftests/kvm/get-reg-list.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ void __weak print_reg(const char *prefix, __u64 id)
104104
printf("\t0x%llx,\n", id);
105105
}
106106

107+
bool __weak check_reject_set(int err)
108+
{
109+
return true;
110+
}
111+
107112
#ifdef __aarch64__
108113
static void prepare_vcpu_init(struct vcpu_reg_list *c, struct kvm_vcpu_init *init)
109114
{
@@ -222,7 +227,7 @@ static void run_test(struct vcpu_reg_list *c)
222227
if (s->rejects_set && find_reg(s->rejects_set, s->rejects_set_n, reg.id)) {
223228
reject_reg = true;
224229
ret = __vcpu_ioctl(vcpu, KVM_SET_ONE_REG, &reg);
225-
if (ret != -1 || errno != EPERM) {
230+
if (ret != -1 || !check_reject_set(errno)) {
226231
printf("%s: Failed to reject (ret=%d, errno=%d) ", config_name(c), ret, errno);
227232
print_reg(config_name(c), reg.id);
228233
putchar('\n');

0 commit comments

Comments
 (0)