Index: /trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c
===================================================================
--- /trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c	(revision 30373)
+++ /trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c	(revision 30374)
@@ -20,5 +20,5 @@
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -130,4 +130,7 @@
 #endif
 
+/* Introduced in v8 */
+static int vbi_is_initialized = 0;
+
 /* Introduced in v6 */
 static int vbi_is_nevada = 0;
@@ -278,4 +281,6 @@
 		return EINVAL;
 	}
+
+    vbi_is_initialized = 1;
 
 	return (0);
@@ -1205,6 +1210,11 @@
 vbi_is_preempt_enabled(void)
 {
-	char tpr = VBI_T_PREEMPT;
-	return (tpr == 0);
+	if (vbi_is_initialized) {
+		char tpr = VBI_T_PREEMPT;
+		return (tpr == 0);
+	} else {
+		cmn_err(CE_NOTE, "vbi_is_preempt_enabled: called without initializing vbi!\n");
+		return 1;
+	}
 }