re #13140 rb4270 hvm_sd module missing dependencies on scsi and cmlb
re #13166 rb4270 Check for Xen HVM even if CPUID signature returns Microsoft Hv
re #13187 rb4270 Fix Xen HVM related warnings

@@ -97,10 +97,11 @@
         char *xen_str;
         struct xen_add_to_physmap xatp;
         xen_capabilities_info_t caps;
         pfn_t pfn;
         uint64_t msrval, val;
+        extern int apix_enable;
 
         if (xen_hvm_inited != 0)
                 return;
 
         xen_hvm_inited = 1;

@@ -215,10 +216,13 @@
         /*
          * A working HVM tlb flush hypercall was introduced in Xen 3.3.
          */
         if (xen_major > 3 || (xen_major == 3 && xen_minor >= 3))
                 xen_hvm_features |= XEN_HVM_TLBFLUSH;
+
+        /* FIXME Disable apix for the time being */
+        apix_enable = 0;
 }
 
 /*
  * Returns:
  *          -1 if a feature is not available