[Xen-changelog] [xen stable-4.6] x86/traps: Don't call hvm_hypervisor_cpuid_leaf() for PV guests

[patchbot@xxxxxxx]

commit e87481f62998d2d18919dca0fe5b50fd3962f5e2
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Wed Jan 18 10:17:43 2017 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Jan 18 10:17:43 2017 +0100

    x86/traps: Don't call hvm_hypervisor_cpuid_leaf() for PV guests
    
    Luckily, hvm_hypervisor_cpuid_leaf() and vmx_hypervisor_cpuid_leaf() are 
safe
    to execute in the context of a PV guest, but HVM-specific feature flags
    shouldn't be visible to PV guests.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 0f43883193da76fc928e836e319c3172f394e0f3
    master date: 2016-11-16 10:33:18 +0000
---
 xen/arch/x86/traps.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 27af87f..85b1481 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -808,6 +808,11 @@ int cpuid_hypervisor_leaves( uint32_t idx, uint32_t 
sub_idx,
         break;
 
     case 4:
+        if ( !has_hvm_container_domain(currd) )
+        {
+            *eax = *ebx = *ecx = *edx = 0;
+            break;
+        }
         hvm_hypervisor_cpuid_leaf(sub_idx, eax, ebx, ecx, edx);
         break;
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog