x86/vpmu: put HVM only code under CONFIG_HVM

Change u32 to uint32_t while at it.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c
index b978e05613d99bd3ef7a06546778265d011ac938..fa6762fa8638289971c521ba5c710918cf15f549 100644 (file)
--- a/xen/arch/x86/cpu/vpmu.c
+++ b/xen/arch/x86/cpu/vpmu.c
@@ -196,8 +196,10 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs)
 {
     struct vcpu *sampled = current, *sampling;
     struct vpmu_struct *vpmu;
+#ifdef CONFIG_HVM
     struct vlapic *vlapic;
-    u32 vlapic_lvtpc;
+    uint32_t vlapic_lvtpc;
+#endif
 
     /*
      * dom0 will handle interrupt for special domains (e.g. idle domain) or,
@@ -324,6 +326,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs)
         return;
     }
 
+#ifdef CONFIG_HVM
     /* HVM guests */
     vlapic = vcpu_vlapic(sampling);
 
@@ -345,6 +348,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs)
         sampling->nmi_pending = 1;
         break;
     }
+#endif
 }
 
 static void vpmu_save_force(void *arg)