Print this page
NEX-14556 xnf: panic on Xen 4.x
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/xen/io/xnf.c
          +++ new/usr/src/uts/common/xen/io/xnf.c
↓ open down ↓ 1049 lines elided ↑ open up ↑
1050 1050          xnfp->xnf_connected = B_FALSE;
1051 1051          xnfp->xnf_be_rx_copy = B_FALSE;
1052 1052          xnfp->xnf_be_mcast_control = B_FALSE;
1053 1053          xnfp->xnf_need_sched = B_FALSE;
1054 1054  
1055 1055          xnfp->xnf_rx_head = NULL;
1056 1056          xnfp->xnf_rx_tail = NULL;
1057 1057          xnfp->xnf_rx_new_buffers_posted = B_FALSE;
1058 1058  
1059 1059  #ifdef XPV_HVM_DRIVER
1060      -        /*
1061      -         * Report our version to dom0.
1062      -         */
1063      -        if (xenbus_printf(XBT_NULL, "guest/xnf", "version", "%d",
1064      -            HVMPV_XNF_VERS))
1065      -                cmn_err(CE_WARN, "xnf: couldn't write version\n");
     1060 +        /* Report our version to dom0 */
     1061 +        (void) xenbus_printf(XBT_NULL, "guest/xnf", "version", "%d",
     1062 +            HVMPV_XNF_VERS);
1066 1063  #endif
1067 1064  
1068 1065          /*
1069 1066           * Get the iblock cookie with which to initialize the mutexes.
1070 1067           */
1071 1068          if (ddi_get_iblock_cookie(devinfo, 0, &xnfp->xnf_icookie)
1072 1069              != DDI_SUCCESS)
1073 1070                  goto failure;
1074 1071  
1075 1072          mutex_init(&xnfp->xnf_txlock,
↓ open down ↓ 2211 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX