Incorporate new backdoor macro definition

 Add macros for StateLogger backdoors in a new header. Magic numbers in related
 functions are also modified.

diff --git a/open-vm-tools/lib/guestApp/guestApp.c b/open-vm-tools/lib/guestApp/guestApp.c
index 71ab3fea1a0727e401e521ee9794095b50dba291..ece65505dc2613540a2e559ae5f67209355de739 100644 (file)
--- a/open-vm-tools/lib/guestApp/guestApp.c
+++ b/open-vm-tools/lib/guestApp/guestApp.c
@@ -1853,8 +1853,9 @@ GuestApp_RpcSendOneCPName(char const *cmd,  // IN: RPCI command
  *
  * GuestApp_ControlRecord --
  *
- *    Start or stop recording proccess, flagged by mode. 
- *    mode 1 for start and mode 2 for stop.
+ *    Start or stop recording process, flagged by mode. 
+ *    Mode definition is in 
+ *    "lib/include/statelogger_backdoor_def.h".
  *
  * Results:
  *    TRUE on success and FALSE on failure.

diff --git a/open-vm-tools/lib/include/statelogger_backdoor_def.h b/open-vm-tools/lib/include/statelogger_backdoor_def.h
new file mode 100644 (file)
index 0000000..04a023c
--- /dev/null
+++ b/open-vm-tools/lib/include/statelogger_backdoor_def.h
@@ -0,0 +1,42 @@
+/*********************************************************
+ * Copyright (C) 2007 VMware, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation version 2.1 and no later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the Lesser GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
+ *
+ *********************************************************/
+
+/*
+ * statelogger_backdoor_def.h --
+ *
+ *      Backdoor command definitions for record/replay.
+ */
+
+#ifndef _STATELOGGER_BACKDOOR_DEF_H_
+#define _STATELOGGER_BACKDOOR_DEF_H_
+
+#define INCLUDE_ALLOW_MODULE
+#define INCLUDE_ALLOW_USERLEVEL
+#define INCLUDE_ALLOW_VMMEXT
+#define INCLUDE_ALLOW_VMCORE
+#define INCLUDE_ALLOW_VMKERNEL
+#include "includeCheck.h"
+
+#define STATELOGGER_BKDR_VM_REPLAYABLE             0
+#define STATELOGGER_BKDR_START_LOGGING             1
+#define STATELOGGER_BKDR_STOP_LOGGING              2
+#define STATELOGGER_BKDR_LAST_SNAPSHOT_UID         3
+#define STATELOGGER_BKDR_GET_BRANCH_COUNT          4
+#define STATELOGGER_BKDR_START_REPLAYING         100
+
+#endif /* _STATELOGGER_BACKDOOR_DEF_H_ */

diff --git a/open-vm-tools/toolbox/toolboxInt.h b/open-vm-tools/toolbox/toolboxInt.h
index 1208bdd78c34da89a7560d367b9773a5ef85daf9..e080950028129351bfc1c0468aaca28e54e5ddc3 100644 (file)
--- a/open-vm-tools/toolbox/toolboxInt.h
+++ b/open-vm-tools/toolbox/toolboxInt.h
@@ -55,7 +55,7 @@
                            "enabled while the host believes it is disabled. " \
                            "Please close and reopen the Toolbox to synchronize " \
                            "it with the host.\n"
-#define RECORD_VMX_DISABLED "Error, this operation is prevented by current vmx setting.\n" \
+#define RECORD_VMX_ERR      "Error, this operation is prevented by current vmx setting.\n" \
                             "There may be reasons as follows:\n" \
                             "1. Controlling is disabled by vmx." \
                             "To enable it, add the following option to your vmx file:\n" \

diff --git a/open-vm-tools/toolbox/toolboxRecord.c b/open-vm-tools/toolbox/toolboxRecord.c
index 807eb95a749e4010e703a7be3545368f97c5da28..c983c898233c5acad0e1955f588e2ce29f769a60 100644 (file)
--- a/open-vm-tools/toolbox/toolboxRecord.c
+++ b/open-vm-tools/toolbox/toolboxRecord.c
@@ -26,6 +26,7 @@
 
 #include "toolboxGtkInt.h"
 #include "debug.h"
+#include "statelogger_backdoor_def.h"
 
 static void RecordOnStart(gpointer, gpointer);
 static void RecordOnStop(gpointer, gpointer);
@@ -117,8 +118,8 @@ static void
 RecordOnStart(gpointer btn,    // IN: unused
               gpointer data)   // IN: unused
 {
-   if (GuestApp_ControlRecord(1) == FALSE) {
-      ToolsMain_MsgBox(NULL, RECORD_VMX_DISABLED);
+   if (GuestApp_ControlRecord(STATELOGGER_BKDR_START_LOGGING) == FALSE) {
+      ToolsMain_MsgBox(NULL, RECORD_VMX_ERR);
    }
 }
 
@@ -144,8 +145,8 @@ static void
 RecordOnStop(gpointer btn,    // IN: unused
              gpointer data)   // IN: unused
 {
-   if (GuestApp_ControlRecord(2) == FALSE) {
-      ToolsMain_MsgBox(NULL, RECORD_VMX_DISABLED);
+   if (GuestApp_ControlRecord(STATELOGGER_BKDR_STOP_LOGGING) == FALSE) {
+      ToolsMain_MsgBox(NULL, RECORD_VMX_ERR);
    }
 }
 

diff --git a/open-vm-tools/toolbox/toolboxcmd-record.c b/open-vm-tools/toolbox/toolboxcmd-record.c
index fd9555b08bc2ace96ddcd4c08efe73fc9a3e5bcf..f759769d0170f83a88d6d40d3e85ada68cad79fd 100644 (file)
--- a/open-vm-tools/toolbox/toolboxcmd-record.c
+++ b/open-vm-tools/toolbox/toolboxcmd-record.c
@@ -23,6 +23,7 @@
  */
 
 #include "toolboxCmdInt.h"
+#include "statelogger_backdoor_def.h"
 
 
 /*
@@ -44,10 +45,10 @@
 Bool
 Record_StartRecording(void) 
 {
-   if (GuestApp_ControlRecord(1) == TRUE) {
+   if (GuestApp_ControlRecord(STATELOGGER_BKDR_START_LOGGING) == TRUE) {
       return TRUE;
    } else {
-      fprintf(stderr, RECORD_VMX_DISABLED);
+      fprintf(stderr, RECORD_VMX_ERR);
       return FALSE;
    }
 }
@@ -72,10 +73,10 @@ Record_StartRecording(void)
 Bool
 Record_StopRecording(void)
 {
-   if (GuestApp_ControlRecord(2) == TRUE) {
+   if (GuestApp_ControlRecord(STATELOGGER_BKDR_STOP_LOGGING) == TRUE) {
       return TRUE;
    } else {
-      fprintf(stderr, RECORD_VMX_DISABLED);
+      fprintf(stderr, RECORD_VMX_ERR);
       return FALSE;
    }
 }