changeset 6020:71438f0283b2

6651488 PV NIC doesn't work on 3.1 dom0
author rab
date Thu, 14 Feb 2008 17:19:12 -0800
parents db75d4ce12e7
children 667d5d93f842
files usr/src/pkgdefs/SUNWxvmpv/postinstall.tmpl usr/src/uts/i86pc/io/xpv/xpv_support.c
diffstat 2 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/pkgdefs/SUNWxvmpv/postinstall.tmpl	Thu Feb 14 16:11:03 2008 -0800
+++ b/usr/src/pkgdefs/SUNWxvmpv/postinstall.tmpl	Thu Feb 14 17:19:12 2008 -0800
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -29,6 +29,6 @@
 
 include drv_utils
 
-pkg_drvadd -i "pci5853,1" -b "$BASEDIR" xpv || exit 1
+pkg_drvadd -i "pci5853,1.1" -b "$BASEDIR" xpv || exit 1
 pkg_drvadd xpvd || exit 1
 pkg_drvadd xnf || exit 1
--- a/usr/src/uts/i86pc/io/xpv/xpv_support.c	Thu Feb 14 16:11:03 2008 -0800
+++ b/usr/src/uts/i86pc/io/xpv/xpv_support.c	Thu Feb 14 17:19:12 2008 -0800
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -340,11 +340,6 @@
 	(void) __cpuid_insn(&cp);
 	xen_major = cp.cp_eax >> 16;
 	xen_minor = cp.cp_eax & 0xffff;
-	if (xen_major != 3 || xen_minor != 0) {
-		cmn_err(CE_WARN, "Xen version %d.%d is not supported",
-		    xen_major, xen_minor);
-		return (-1);
-	}
 
 	/*
 	 * cpuid function 0x40000002 returns information about the