Changeset 54204 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Feb 13, 2015 5:23:15 PM (10 years ago)

Author:

vboxsync

Message:

HostDrivers/Support: bump IOC minor version and declaration of var. fix.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (1 diff)
• SUPDrvIOC.h (modified) (1 diff)
• SUPLib.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -3754 +3754 @@
 SUPR0DECL(int) SUPR0GetVmxUsability(bool *pfIsSmxModeAmbiguous)
 {
+    uint64_t   u64FeatMsr;
+    bool       fMaybeSmxMode;
+    bool       fMsrLocked;
+    bool       fSmxVmxAllowed;
+    bool       fVmxAllowed;
+    bool       fIsSmxModeAmbiguous;
+    int        rc;
+
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
-    uint64_t   u64FeatMsr          = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
-    bool const fMaybeSmxMode       = RT_BOOL(ASMGetCR4() & X86_CR4_SMXE);
-    bool       fMsrLocked          = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_LOCK);
-    bool       fSmxVmxAllowed      = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_SMX_VMXON);
-    bool       fVmxAllowed         = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_VMXON);
-    bool       fIsSmxModeAmbiguous = false;
-    int        rc                  = VERR_INTERNAL_ERROR_5;
+    u64FeatMsr          = ASMRdMsr(MSR_IA32_FEATURE_CONTROL);
+    fMaybeSmxMode       = RT_BOOL(ASMGetCR4() & X86_CR4_SMXE);
+    fMsrLocked          = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_LOCK);
+    fSmxVmxAllowed      = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_SMX_VMXON);
+    fVmxAllowed         = RT_BOOL(u64FeatMsr & MSR_IA32_FEATURE_CONTROL_VMXON);
+    fIsSmxModeAmbiguous = false;
+    rc                  = VERR_INTERNAL_ERROR_5;
 
     /* Check if the LOCK bit is set but excludes the required VMXON bit. */

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -215 +215 @@
  *          - (none).
  */
-#define SUPDRV_IOC_VERSION                              0x001d0001
+#define SUPDRV_IOC_VERSION                              0x001d0002
 
 /** SUP_IOCTL_COOKIE. */

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -280 +280 @@
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
         const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x001d0000
-                                   ? 0x001d0001
+                                   ? 0x001d0002
                                    : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;