Changeset 24574 in vbox

Timestamp:

Nov 11, 2009 9:44:52 AM (15 years ago)

Author:

vboxsync

Message:

SSMStandalone.a/lib for linking with VBoxSVC.

Location:

trunk/src/VBox

Files:

• Main/Makefile.kmk (modified) (1 diff)
• VMM/Makefile.kmk (modified) (1 diff)
• VMM/SSM.cpp (modified) (14 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -257 +257 @@
 
 VBoxSVC_LIBS += \
-        $(LIB_VMM) \
+        $(PATH_LIB)/SSMStandalone$(VBOX_SUFF_LIB) \
         $(LIB_DDU)
-VBoxSVC_LIBS.linux = \
-        $(LIB_REM)
-VBoxSVC_LIBS.darwin = \
-        $(LIB_REM)
 VBoxSVC_LIBS.solaris = \
         adm \

trunk/src/VBox/VMM/Makefile.kmk

@@ -230 +230 @@
 #endif
 
+
+
+#
+# SSMStandalone.lib/a for linking with VBoxSVC and other executables.
+#
+LIBRARIES += SSMStandalone
+SSMStandalone_TEMPLATE  = VBOXR3EXE
+SSMStandalone_DEFS      = IN_VMM_R3 SSM_STANDALONE
+SSMStandalone_SOURCES   = SSM.cpp
+
+
 if1of ($(VBOX_LDR_FMT32), pe lx)
 

trunk/src/VBox/VMM/SSM.cpp

@@ -864 +864 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
+#ifndef SSM_STANDALONE
 static int                  ssmR3LazyInit(PVM pVM);
 static DECLCALLBACK(int)    ssmR3SelfLiveExec(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass);
@@ -869 +870 @@
 static DECLCALLBACK(int)    ssmR3SelfLoadExec(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
 static int                  ssmR3Register(PVM pVM, const char *pszName, uint32_t uInstance, uint32_t uVersion, size_t cbGuess, const char *pszBefore, PSSMUNIT *ppUnit);
+#endif
 
 static int                  ssmR3StrmWriteBuffers(PSSMSTRM pStrm);
@@ -877 +879 @@
 
 
+#ifndef SSM_STANDALONE
 
 /**
@@ -1568 +1571 @@
     return ssmR3DeregisterByNameAndType(pVM, pszName, SSMUNITTYPE_EXTERNAL);
 }
+
+#endif /* !SSM_STANDALONE */
 
 
@@ -2899 +2904 @@
 }
 
+#ifndef SSM_STANDALONE
 
 /**
@@ -5158 +5164 @@
 }
 
+#endif /* !SSM_STANDALONE */
 
 
@@ -6841 +6848 @@
 }
 
+#ifndef SSM_STANDALONE
 
 /**
@@ -6941 +6949 @@
 }
 
+#endif /* !SSM_STANDALONE */
 
 /**
@@ -7481 +7490 @@
 }
 
+#ifndef SSM_STANDALONE
 
 /**
@@ -7707 +7717 @@
 }
 
+#endif /* !SSM_STANDALONE */
+
 
 /**
@@ -7742 +7754 @@
 }
 
+#ifndef SSM_STANDALONE
 
 /**
@@ -8178 +8191 @@
 }
 
+#endif /* !SSM_STANDALONE */
+
 
 /**
@@ -8634 +8649 @@
 
 
+#ifndef SSM_STANDALONE
 /**
  * Asynchronously cancels the current SSM operation ASAP.
@@ -8678 +8694 @@
     return rc;
 }
-
+#endif /* !SSM_STANDALONE */
+