Changeset 45618 in vbox for trunk/include/VBox

Timestamp:

Apr 18, 2013 6:41:07 PM (12 years ago)

Author:

vboxsync

Message:

Do HMR3Init first in vmR3InitRing3 so the other components can skip raw-mode bits during init.

Location:

trunk/include/VBox

Files:

• err.h (modified) (1 diff)
• vmm/hm.h (modified) (3 diffs)
• vmm/vm.h (modified) (4 diffs)
• vmm/vm.mac (modified) (1 diff)
• vmm/vmapi.h (modified) (1 diff)
• vmm/vmm.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -1948 +1948 @@
 /** Unsupported CPU feature combination. */
 #define VERR_HM_UNSUPPORTED_CPU_FEATURE_COMBO       (-4112)
+/** Internal processing error \#3 in the HM code.  */
+#define VERR_HM_IPE_3                               (-4113)
+/** Internal processing error \#3 in the HM code.  */
+#define VERR_HM_IPE_4                               (-4114)
+/** Internal processing error \#3 in the HM code.  */
+#define VERR_HM_IPE_5                               (-4115)
 /** @} */
 

trunk/include/VBox/vmm/hm.h

@@ -44 +44 @@
  * @returns 0 - disabled, 1 - enabled
  * @param   a_pVM       Pointer to the shared VM structure.
+ * @sa      HMIsEnabledNotMacro, HMR3IsEnabled
  * @internal
  */
-#define HMIsEnabled(a_pVM)    ((a_pVM)->fHMEnabled)
+#if defined(VBOX_STRICT) && defined(IN_RING3)
+# define HMIsEnabled(a_pVM)   HMIsEnabledNotMacro(a_pVM)
+#else
+# define HMIsEnabled(a_pVM)   ((a_pVM)->fHMEnabled)
+#endif
 
  /**
@@ -66 +71 @@
 #define HMCanEmulateIoBlockEx(a_pCtx)   (!CPUMIsGuestInPagedProtectedModeEx(a_pCtx))
 
+VMMDECL(bool)                   HMIsEnabledNotMacro(PVM pVM);
 VMM_INT_DECL(int)               HMInvalidatePage(PVMCPU pVCpu, RTGCPTR GCVirt);
 VMM_INT_DECL(bool)              HMHasPendingIrq(PVM pVM);
@@ -126 +132 @@
 VMMR3_INT_DECL(void)            HMR3NotifyEmulated(PVMCPU pVCpu);
 VMMR3_INT_DECL(bool)            HMR3IsActive(PVMCPU pVCpu);
-VMMR3_INT_DECL(bool)            HMR3IsAllowed(PVM pVM);
 VMMR3_INT_DECL(void)            HMR3PagingModeChanged(PVM pVM, PVMCPU pVCpu, PGMMODE enmShadowMode, PGMMODE enmGuestMode);
 VMMR3_INT_DECL(int)             HMR3EmulateIoBlock(PVM pVM, PCPUMCTX pCtx);

trunk/include/VBox/vmm/vm.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -85 +85 @@
 
 /**
- * Per virtual CPU data.
+ * The cross context virtual CPU structure.
+ *
+ * Run 'kmk run-struct-tests' (from src/VBox/VMM if you like) after updating!
  */
 typedef struct VMCPU
@@ -784 +786 @@
 
 
-/** This is the VM structure.
- *
- * It contains (nearly?) all the VM data which have to be available in all
- * contexts. Even if it contains all the data the idea is to use APIs not
- * to modify all the members all around the place. Therefore we make use of
- * unions to hide everything which isn't local to the current source module.
- * This means we'll have to pay a little bit of attention when adding new
- * members to structures in the unions and make sure to keep the padding sizes
- * up to date.
- *
- * Run tstVMStructSize after update!
+/**
+ * The cross context VM structure.
+ *
+ * It contains all the VM data which have to be available in all contexts.
+ * Even if it contains all the data the idea is to use APIs not to modify all
+ * the members all around the place.  Therefore we make use of unions to hide
+ * everything which isn't local to the current source module.  This means we'll
+ * have to pay a little bit of attention when adding new members to structures
+ * in the unions and make sure to keep the padding sizes up to date.
+ *
+ * Run 'kmk run-struct-tests' (from src/VBox/VMM if you like) after updating!
  */
 typedef struct VM
@@ -875 +877 @@
     bool                        fCSAMEnabled;
     /** Hardware VM support is available and enabled.
+     * Determined very early during init.
      * This is placed here for performance reasons. */
     bool                        fHMEnabled;
-    /** Hardware VM support is required and non-optional.
-     * This is initialized together with the rest of the VM structure. */
-    bool                        fHwVirtExtForced;
-    /** Set when this VM is the master FT node. */
+    /** For asserting on fHMEnable usage. */
+    bool                        fHMEnabledFixed;
+    /** Set when this VM is the master FT node.
+     * @todo This doesn't need to be here, FTM should store it in it's own
+     *       structures instead. */
     bool                        fFaultTolerantMaster;
-    /** Large page enabled flag. */
+    /** Large page enabled flag.
+     * @todo This doesn't need to be here, PGM should store it in it's own
+     *       structures instead. */
     bool                        fUseLargePages;
     /** @} */

trunk/include/VBox/vmm/vm.mac

@@ -62 +62 @@
     .fPATMEnabled           resb 1
     .fCSAMEnabled           resb 1
-    .fHMEnabled         resb 1
-    .fHwVirtExtForced       resb 1
+    .fHMEnabled             resb 1
+    .fHMEnabledFixed        resb 1
     .fFaultTolerantMaster   resb 1
     .fUseLargePages         resb 1

trunk/include/VBox/vmm/vmapi.h

@@ -325 +325 @@
     VMINITCOMPLETED_RING0,
     /** The hardware accelerated virtualization init is completed.
-     * Used to make decisision depending on whether HMIsEnabled(). */
+     * Used to make decisision depending on HM* bits being completely
+     * initialized. */
     VMINITCOMPLETED_HM,
-    /** The GC init is completed. */
-    VMINITCOMPLETED_GC
+    /** The RC init is completed. */
+    VMINITCOMPLETED_RC
 } VMINITCOMPLETED;
 

trunk/include/VBox/vmm/vmm.h

@@ -235 +235 @@
 VMM_INT_DECL(VMMSWITCHER)   VMMGetSwitcher(PVM pVM);
 VMM_INT_DECL(void)          VMMTrashVolatileXMMRegs(void);
-
-/** @def VMMIsHwVirtExtForced
- * Checks if forced to use the hardware assisted virtualization extensions.
- *
- * This is intended for making setup decisions where we can save resources when
- * using hardware assisted virtualization.
- *
- * @returns true / false.
- * @param   pVM     Pointer to the shared VM structure.
- * @internal
- */
-#define VMMIsHwVirtExtForced(pVM)   ((pVM)->fHwVirtExtForced)