Changeset 30374 in vbox

Timestamp:

Jun 22, 2010 1:22:45 PM (14 years ago)

Author:

vboxsync

Message:

Solaris/vbi: fake vbi_is_preempt_enabled when vbi_init has not been called yet. Happens on debug builds because LogFlowFunc on _info in the support driver would ultimately end up r0 asserting on preempt enabled. This works around
that.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c

@@ -20 +20 @@
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -130 +130 @@
 #endif
 
+/* Introduced in v8 */
+static int vbi_is_initialized = 0;
+
 /* Introduced in v6 */
 static int vbi_is_nevada = 0;
@@ -278 +281 @@
                 return EINVAL;
         }
+
+    vbi_is_initialized = 1;
 
         return (0);
@@ -1205 +1210 @@
 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;
+        }
 }