Changeset 31732 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

FT updates

Location:

trunk

Files:

• include/VBox/ftm.h (modified) (1 diff)
• include/VBox/vm.h (modified) (3 diffs)
• include/VBox/vm.mac (modified) (1 diff)
• src/VBox/VMM/FTM.cpp (modified) (3 diffs)
• src/VBox/VMM/FTMInternal.h (added)

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

trunk/src/VBox/VMM/FTM.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008 Oracle Corporation
+ * Copyright (C) 2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 #include <VBox/err.h>
 #include <VBox/param.h>
-#include <VBox/ftm.h>
+#include "FTMInternal.h"
 
 #include <iprt/assert.h>
@@ -31 +31 @@
 
 
+/**
+ * Powers on the fault tolerant virtual machine.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pVM         The VM to power on.
+ * @param   fMaster     FT master or clone
+ * @param   uInterval   FT sync interval
+ * @param   pszAddress  Master VM address
+ * @param   uPort       Master VM port
+ *
+ * @thread      Any thread.
+ * @vmstate     Created
+ * @vmstateto   PoweringOn+Running (master), PoweringOn+Running_FT (clone)
+ */
+VMMR3DECL(int) FTMR3PowerOn(PVM pVM, bool fMaster, unsigned uInterval, const char *pszAddress, unsigned uPort)
+{
+    VMSTATE enmVMState = VMR3GetState(pVM);
+    AssertMsgReturn(enmVMState == VMSTATE_POWERING_ON,
+                    ("%s\n", VMR3GetStateName(enmVMState)),
+                    VERR_INTERNAL_ERROR_4);
 
-VMMR3DECL(int) FTMR3PowerOn(PVM pVM, bool fSource, unsigned uInterval, const char *pszAddress, unsigned uPort)
-{
+    if (fMaster)
+    {
+        return VMR3PowerOn(pVM);
+    }
+    else
+    {
+        /* clone */
+    }
     return VERR_NOT_IMPLEMENTED;
 }