From ae638ec0c0dc079953b51c0ad4559a8fc19b54c9 Mon Sep 17 00:00:00 2001 From: hanliyang Date: Sun, 30 Jan 2022 11:07:39 +0800 Subject: [PATCH] anolis: UAPI: Fix macro definition of KVM_HC_VM_ATTESTATION in include/uapi/linux/kvm_para.h ANBZ: #1316 Linux mainline has introduced KVM_HC_MAP_GPA_RANGE in commit 0dbb11230437 (KVM: X86: Introduce KVM_HC_MAP_GPA_RANGE hypercall), this definition conflicts with KVM_HC_VM_ATTESTATION which is used to support remote attestation initiates from Hygon CSV guest. Define KVM_HC_VM_ATTESTATION as 100 to avoid conflicts with KVM_HC_MAP_GPA_RANGE. Fixes: 14854cd725a1 ("anolis: KVM: x86: Support VM_ATTESTATION hypercall") Signed-off-by: hanliyang Reviewed-by: Artie Ding --- include/uapi/linux/kvm_para.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/kvm_para.h b/include/uapi/linux/kvm_para.h index 2109088dabfa..f943f47025d1 100644 --- a/include/uapi/linux/kvm_para.h +++ b/include/uapi/linux/kvm_para.h @@ -28,7 +28,7 @@ #define KVM_HC_MIPS_CONSOLE_OUTPUT 8 #define KVM_HC_CLOCK_PAIRING 9 #define KVM_HC_SEND_IPI 10 -#define KVM_HC_VM_ATTESTATION 12 +#define KVM_HC_VM_ATTESTATION 100 /* Specific to Hygon CPU */ /* * hypercalls use architecture specific -- Gitee