Changeset 31732 in vbox for trunk/include/VBox

Timestamp:

Aug 17, 2010 1:51:51 PM (14 years ago)

Author:

vboxsync

Message:

FT updates

Location:

trunk/include/VBox

Files:

• ftm.h (modified) (1 diff)
• vm.h (modified) (3 diffs)
• vm.mac (modified) (1 diff)

trunk/include/VBox/ftm.h

@@ -41 +41 @@
  * @{
  */
-VMMR3DECL(int) FTMR3PowerOn(PVM pVM, bool fSource, unsigned uInterval, const char *pszAddress, unsigned uPort);
+VMMR3DECL(int) FTMR3PowerOn(PVM pVM, bool fMaster, unsigned uInterval, const char *pszAddress, unsigned uPort);
 
 #endif /* IN_RING3 */

trunk/include/VBox/vm.h

@@ -787 +787 @@
      * This is initialized together with the rest of the VM structure. */
     bool                        fHwVirtExtForced;
-    /** PARAV enabled flag. */
-    bool                        fPARAVEnabled;
+    /** Set when this VM is the master FT node. */
+    bool                        fFaultTolerantMaster;
     /** Large page enabled flag. */
     bool                        fUseLargePages;
@@ -962 +962 @@
     } ssm;
 
+    /** FTM part. */
+    union
+    {
+#ifdef ___FTMInternal_h
+        struct FTM  s;
+#endif
+        uint8_t     padding[128];        /* multiple of 64 */
+    } ftm;
+
     /** REM part. */
     union
@@ -991 +1000 @@
     } cfgm;
 
-    /** PARAV part. */
-    union
-    {
-#ifdef ___PARAVInternal_h
-        struct PARAV s;
-#endif
-        uint8_t     padding[24];        /* multiple of 8 */
-    } parav;
-
     /** Padding for aligning the cpu array on a page boundrary. */
-    uint8_t         abAlignment2[1992];
+    uint8_t         abAlignment2[1886];
 
     /* ---- end small stuff ---- */

trunk/include/VBox/vm.mac

@@ -71 +71 @@
     .fHWACCMEnabled         resb 1
     .fHwVirtExtForced       resb 1
-    .fPARAVEnabled          resb 1
+    .fFaultTolerantMaster   resb 1
+    .fUseLargePages         resb 1
 
     alignb 8