From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 9 Jun 2016 13:49:52 +0000 (+0200)
Subject: x86/PV: drop pointless conditional from pv_cpuid()'s state leaf logic
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~994
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6a611ac26e32df3e8139551c52cd2b7ad92839d1;p=xen.git

x86/PV: drop pointless conditional from pv_cpuid()'s state leaf logic

In the control/hardware domain case without it we simply re-read the
same value that was put into b near the top of the function.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 1b42841c7f..f604b89f12 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -1119,8 +1119,7 @@ void pv_cpuid(struct cpu_user_regs *regs)
              * domain policy.  It varies with enabled xstate, and the correct
              * xcr0 is in context.
              */
-            if ( !is_control_domain(currd) && !is_hardware_domain(currd) )
-                cpuid_count(leaf, subleaf, &tmp, &b, &tmp, &tmp);
+            cpuid_count(leaf, subleaf, &tmp, &b, &tmp, &tmp);
             break;
         }