提交 023d52c7 编写于 作者: S Sean Christopherson 提交者: Aichun Shi

KVM: Fix references to non-existent KVM_CAP_TRIPLE_FAULT_EVENT

mainline inclusion
from mainline-v6.0-rc1
commit 8deb03e7
category: feature
feature: Notify VM exit
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I5PAJ5
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/
commit/?id=8deb03e7

Intel-SIG: commit 8deb03e7 ("KVM: Fix references to non-existent KVM_CAP_TRIPLE_FAULT_EVENT")

-------------------------------------

KVM: Fix references to non-existent KVM_CAP_TRIPLE_FAULT_EVENT

The x86-only KVM_CAP_TRIPLE_FAULT_EVENT was (appropriately) renamed to
KVM_CAP_X86_TRIPLE_FAULT_EVENT when the patches were applied, but the
docs and selftests got left behind.  Fix them.
Signed-off-by: NSean Christopherson <seanjc@google.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: NAichun Shi <aichun.shi@intel.com>
上级 1a1d0784
......@@ -1086,7 +1086,7 @@ The following bits are defined in the flags field:
- KVM_VCPUEVENT_VALID_TRIPLE_FAULT may be set to signal that the
triple_fault_pending field contains a valid state. This bit will
be set whenever KVM_CAP_TRIPLE_FAULT_EVENT is enabled.
be set whenever KVM_CAP_X86_TRIPLE_FAULT_EVENT is enabled.
ARM/ARM64:
^^^^^^^^^^
......@@ -1183,7 +1183,7 @@ can be set in the flags field to signal that the
exception_has_payload, exception_payload, and exception.pending fields
contain a valid state and shall be written into the VCPU.
If KVM_CAP_TRIPLE_FAULT_EVENT is enabled, KVM_VCPUEVENT_VALID_TRIPLE_FAULT
If KVM_CAP_X86_TRIPLE_FAULT_EVENT is enabled, KVM_VCPUEVENT_VALID_TRIPLE_FAULT
can be set in flags field to signal that the triple_fault field contains
a valid state and shall be written into the VCPU.
......
......@@ -47,7 +47,7 @@ int main(void)
struct ucall uc;
struct kvm_enable_cap cap = {
.cap = KVM_CAP_TRIPLE_FAULT_EVENT,
.cap = KVM_CAP_X86_TRIPLE_FAULT_EVENT,
.args = {1}
};
......@@ -56,8 +56,8 @@ int main(void)
exit(KSFT_SKIP);
}
if (!kvm_check_cap(KVM_CAP_TRIPLE_FAULT_EVENT)) {
print_skip("KVM_CAP_TRIPLE_FAULT_EVENT not supported");
if (!kvm_check_cap(KVM_CAP_X86_TRIPLE_FAULT_EVENT)) {
print_skip("KVM_CAP_X86_TRIPLE_FAULT_EVENT not supported");
exit(KSFT_SKIP);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册