Mailing List Archive

[xen master] x86/cpuid: Fix APIC bit clearing
commit 64219fa179c3e48adad12bfce3f6b3f1596cccbf
Author: Fam Zheng <famzheng@amazon.com>
AuthorDate: Wed Jul 29 18:51:45 2020 +0100
Commit: Andrew Cooper <andrew.cooper3@citrix.com>
CommitDate: Wed Jul 29 19:03:41 2020 +0100

x86/cpuid: Fix APIC bit clearing

The bug is obvious here, other places in this function used
"cpufeat_mask" correctly.

Fixed: b648feff8ea2 ("xen/x86: Improvements to in-hypervisor cpuid sanity checks")
Signed-off-by: Fam Zheng <famzheng@amazon.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
xen/arch/x86/cpuid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c
index 6a4a787b68..63a03ef1e5 100644
--- a/xen/arch/x86/cpuid.c
+++ b/xen/arch/x86/cpuid.c
@@ -1057,7 +1057,7 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf,
{
/* Fast-forward MSR_APIC_BASE.EN. */
if ( vlapic_hw_disabled(vcpu_vlapic(v)) )
- res->d &= ~cpufeat_bit(X86_FEATURE_APIC);
+ res->d &= ~cpufeat_mask(X86_FEATURE_APIC);

/*
* PSE36 is not supported in shadow mode. This bit should be
--
generated by git-patchbot for /home/xen/git/xen.git#master