Changeset 22803 in vbox

Timestamp:

Sep 7, 2009 11:01:57 AM (15 years ago)

Author:

vboxsync

Message:

ssm: Use VMMR3_INT_DECL.

Location:

trunk

Files:

• include/VBox/ssm.h (modified) (1 diff)
• src/VBox/VMM/SSM.cpp (modified) (7 diffs)

trunk/include/VBox/ssm.h

@@ -639 +639 @@
     PFNSSMEXTSAVEPREP pfnSavePrep, PFNSSMEXTSAVEEXEC pfnSaveExec, PFNSSMEXTSAVEDONE pfnSaveDone,
     PFNSSMEXTLOADPREP pfnLoadPrep, PFNSSMEXTLOADEXEC pfnLoadExec, PFNSSMEXTLOADDONE pfnLoadDone, void *pvUser);
-VMMR3DECL(int) SSMR3DeregisterDevice(PVM pVM, PPDMDEVINS pDevIns, const char *pszName, uint32_t uInstance);
-VMMR3DECL(int) SSMR3DeregisterDriver(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName, uint32_t uInstance);
-VMMR3DECL(int) SSMR3DeregisterInternal(PVM pVM, const char *pszName);
-VMMR3DECL(int) SSMR3DeregisterExternal(PVM pVM, const char *pszName);
-VMMR3DECL(int) SSMR3Save(PVM pVM, const char *pszFilename, SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvUser);
-VMMR3DECL(int) SSMR3LiveToFile(PVM pVM, const char *pszFilename, SSMAFTER enmAfter,
-                               PFNVMPROGRESS pfnProgress, void *pvUser, PSSMHANDLE *ppSSM);
-VMMR3DECL(int) SSMR3LiveDoStep1(PSSMHANDLE pSSM);
-VMMR3DECL(int) SSMR3LiveDoStep2(PSSMHANDLE pSSM);
-VMMR3DECL(int) SSMR3LiveDone(PSSMHANDLE pSSM);
-VMMR3DECL(int) SSMR3Load(PVM pVM, const char *pszFilename, SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvUser);
-VMMR3DECL(int) SSMR3ValidateFile(const char *pszFilename, bool fChecksumIt);
-VMMR3DECL(int) SSMR3Open(const char *pszFilename, unsigned fFlags, PSSMHANDLE *ppSSM);
-VMMR3DECL(int) SSMR3Close(PSSMHANDLE pSSM);
-VMMR3DECL(int) SSMR3Seek(PSSMHANDLE pSSM, const char *pszUnit, uint32_t iInstance, uint32_t *piVersion);
-VMMR3DECL(int) SSMR3HandleGetStatus(PSSMHANDLE pSSM);
-VMMR3DECL(int) SSMR3HandleSetStatus(PSSMHANDLE pSSM, int iStatus);
+VMMR3_INT_DECL(int) SSMR3DeregisterDevice(PVM pVM, PPDMDEVINS pDevIns, const char *pszName, uint32_t uInstance);
+VMMR3_INT_DECL(int) SSMR3DeregisterDriver(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName, uint32_t uInstance);
+VMMR3DECL(int)      SSMR3DeregisterInternal(PVM pVM, const char *pszName);
+VMMR3DECL(int)      SSMR3DeregisterExternal(PVM pVM, const char *pszName);
+VMMR3DECL(int)      SSMR3Save(PVM pVM, const char *pszFilename, SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvUser);
+VMMR3_INT_DECL(int) SSMR3LiveToFile(PVM pVM, const char *pszFilename, SSMAFTER enmAfter,
+                                    PFNVMPROGRESS pfnProgress, void *pvUser, PSSMHANDLE *ppSSM);
+VMMR3_INT_DECL(int) SSMR3LiveDoStep1(PSSMHANDLE pSSM);
+VMMR3_INT_DECL(int) SSMR3LiveDoStep2(PSSMHANDLE pSSM);
+VMMR3_INT_DECL(int) SSMR3LiveDone(PSSMHANDLE pSSM);
+VMMR3DECL(int)      SSMR3Load(PVM pVM, const char *pszFilename, SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvUser);
+VMMR3DECL(int)      SSMR3ValidateFile(const char *pszFilename, bool fChecksumIt);
+VMMR3DECL(int)      SSMR3Open(const char *pszFilename, unsigned fFlags, PSSMHANDLE *ppSSM);
+VMMR3DECL(int)      SSMR3Close(PSSMHANDLE pSSM);
+VMMR3DECL(int)      SSMR3Seek(PSSMHANDLE pSSM, const char *pszUnit, uint32_t iInstance, uint32_t *piVersion);
+VMMR3DECL(int)      SSMR3HandleGetStatus(PSSMHANDLE pSSM);
+VMMR3DECL(int)      SSMR3HandleSetStatus(PSSMHANDLE pSSM, int iStatus);
 VMMR3DECL(SSMAFTER) SSMR3HandleGetAfter(PSSMHANDLE pSSM);
 VMMR3DECL(uint64_t) SSMR3HandleGetUnitOffset(PSSMHANDLE pSSM);
-VMMR3DECL(int) SSMR3SetGCPtrSize(PSSMHANDLE pSSM, unsigned cbGCPtr);
+VMMR3_INT_DECL(int) SSMR3SetGCPtrSize(PSSMHANDLE pSSM, unsigned cbGCPtr);
 
 

trunk/src/VBox/VMM/SSM.cpp

@@ -1211 +1211 @@
  * @remark  Only for dynmaic data units and dynamic unloaded modules.
  */
-VMMR3DECL(int) SSMR3DeregisterDevice(PVM pVM, PPDMDEVINS pDevIns, const char *pszName, uint32_t uInstance)
+VMMR3_INT_DECL(int) SSMR3DeregisterDevice(PVM pVM, PPDMDEVINS pDevIns, const char *pszName, uint32_t uInstance)
 {
     /*
@@ -1287 +1287 @@
  * @remark  Only for dynmaic data units and dynamic unloaded modules.
  */
-VMMR3DECL(int) SSMR3DeregisterDriver(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName, uint32_t uInstance)
+VMMR3_INT_DECL(int) SSMR3DeregisterDriver(PVM pVM, PPDMDRVINS pDrvIns, const char *pszName, uint32_t uInstance)
 {
     /*
@@ -3355 +3355 @@
  * @thread  EMT(0).
  */
-VMMR3DECL(int) SSMR3LiveDone(PSSMHANDLE pSSM)
+VMMR3_INT_DECL(int) SSMR3LiveDone(PSSMHANDLE pSSM)
 {
     LogFlow(("SSMR3LiveDone: pSSM=%p\n", pSSM));
@@ -3786 +3786 @@
  * @thread  Non-EMT thread. Will involve the EMT at the end of the operation.
  */
-VMMR3DECL(int) SSMR3LiveDoStep2(PSSMHANDLE pSSM)
+VMMR3_INT_DECL(int) SSMR3LiveDoStep2(PSSMHANDLE pSSM)
 {
     LogFlow(("SSMR3LiveDoStep2: pSSM=%p\n", pSSM));
@@ -4147 +4147 @@
  * @thread  Non-EMT thread. Will involve the EMT at the end of the operation.
  */
-VMMR3DECL(int) SSMR3LiveDoStep1(PSSMHANDLE pSSM)
+VMMR3_INT_DECL(int) SSMR3LiveDoStep1(PSSMHANDLE pSSM)
 {
     LogFlow(("SSMR3LiveDoStep1: pSSM=%p\n", pSSM));
@@ -4333 +4333 @@
  * @thread  EMT0
  */
-VMMR3DECL(int) SSMR3LiveToFile(PVM pVM, const char *pszFilename, SSMAFTER enmAfter,
-                               PFNVMPROGRESS pfnProgress, void *pvUser, PSSMHANDLE *ppSSM)
+VMMR3_INT_DECL(int) SSMR3LiveToFile(PVM pVM, const char *pszFilename, SSMAFTER enmAfter,
+                                    PFNVMPROGRESS pfnProgress, void *pvUser, PSSMHANDLE *ppSSM)
 {
     LogFlow(("SSMR3LiveToFile: pszFilename=%p:{%s} enmAfter=%d pfnProgress=%p pvUser=%p\n", pszFilename, pszFilename, enmAfter, pfnProgress, pvUser));
@@ -5467 +5467 @@
  *          format isn't 1.1 the call will be ignored.
  */
-VMMR3DECL(int) SSMR3SetGCPtrSize(PSSMHANDLE pSSM, unsigned cbGCPtr)
+VMMR3_INT_DECL(int) SSMR3SetGCPtrSize(PSSMHANDLE pSSM, unsigned cbGCPtr)
 {
     Assert(cbGCPtr == sizeof(RTGCPTR32) || cbGCPtr == sizeof(RTGCPTR64));