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

*** 737,752 ****
           * If the memscrubber attempts to scrub the pages we hand to Xen,
           * the domain will panic.
           */
          memscrub_disable();
  
!         /*
!          * Report our version to dom0.
!          */
!         if (xenbus_printf(XBT_NULL, "guest/xpv", "version", "%d",
!             HVMPV_XPV_VERS))
!                 cmn_err(CE_WARN, "xpv: couldn't write version\n");
  
          return (DDI_SUCCESS);
  }
  
  /*
--- 737,749 ----
           * If the memscrubber attempts to scrub the pages we hand to Xen,
           * the domain will panic.
           */
          memscrub_disable();
  
!         /* Report our version to dom0 */
!         (void) xenbus_printf(XBT_NULL, "guest/xpv", "version", "%d",
!             HVMPV_XPV_VERS);
  
          return (DDI_SUCCESS);
  }
  
  /*