Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/lib/foundryMsg/foundryMsg.c b/open-vm-tools/lib/foundryMsg/foundryMsg.c
index 3ca2f5334a83b4be9639bb7c629ba0ba31778a5f..03b04120fcb64af02f340150ce20cd1151d5c232 100644 (file)
--- a/open-vm-tools/lib/foundryMsg/foundryMsg.c
+++ b/open-vm-tools/lib/foundryMsg/foundryMsg.c
@@ -315,8 +315,7 @@ static const VixCommandInfo vixCommandInfoTable[] = {
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_VM_UNPAUSE,
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
    VIX_DEFINE_UNUSED_COMMAND,
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_SET_REPLAY_SPEED,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
+   VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_GET_PERFORMANCE_DATA,
@@ -324,8 +323,7 @@ static const VixCommandInfo vixCommandInfoTable[] = {
    VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_GET_SNAPSHOT_SCREENSHOT,
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_ADD_TIMEMARKER,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
+   VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_WAIT_FOR_USER_ACTION_IN_GUEST,
                            VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED),
    VIX_DEFINE_UNUSED_COMMAND,
@@ -346,30 +344,20 @@ static const VixCommandInfo vixCommandInfoTable[] = {
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_DEBUGGER_SEND_COMMAND,
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
-
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_GET_RECORD_STATE,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_SET_RECORD_STATE,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_REMOVE_RECORD_STATE,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_GET_REPLAY_STATE,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_SET_REPLAY_STATE,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_REMOVE_REPLAY_STATE,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
+   VIX_DEFINE_UNUSED_COMMAND,
+   VIX_DEFINE_UNUSED_COMMAND,
+   VIX_DEFINE_UNUSED_COMMAND,
+   VIX_DEFINE_UNUSED_COMMAND,
+   VIX_DEFINE_UNUSED_COMMAND,
+   VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_UNUSED_COMMAND,
    /* GET_VMX_DEVICE_STATE is needed for the initial handshake. */   
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_GET_VMX_DEVICE_STATE,
                            VIX_COMMAND_CATEGORY_ALWAYS_ALLOWED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_GET_NUM_TIMEMARKERS,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_GET_TIMEMARKER,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_REMOVE_TIMEMARKER,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
+   VIX_DEFINE_UNUSED_COMMAND,
+   VIX_DEFINE_UNUSED_COMMAND,
+   VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_SET_SNAPSHOT_INFO,
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_SNAPSHOT_SET_MRU,

diff --git a/open-vm-tools/lib/include/vixCommands.h b/open-vm-tools/lib/include/vixCommands.h
index 45df21ff9e626d4b73b1cf0410a2e15eff718522..2938016a13aaaf912d25c6b81db39f040c41e46e 100644 (file)
--- a/open-vm-tools/lib/include/vixCommands.h
+++ b/open-vm-tools/lib/include/vixCommands.h
@@ -483,30 +483,6 @@ enum VixMsgConfigObjectType {
    VIX_LAN_SEGMENT_SETTING_CONFIG   = 1,
 };
 
-/*
- * Commands related to Record|Replay State.
- */
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgRecordReplayStateCommandRequest {
-   VixCommandRequestHeader   header;
-   
-   int32                     options;
-   uint32                    propertyListBufferSize;
-}
-#include "vmware_pack_end.h"
-VixMsgRecordReplayStateCommandRequest;
-
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgRecordReplayStateCommandResponse {
-   VixCommandResponseHeader header;
-   uint32   propertyListBufferSize;
-}
-#include "vmware_pack_end.h"
-VixMsgRecordReplayStateCommandResponse;
-
-
 /*
  * **********************************************************
  * Wait for tools request. The response is just a generic
@@ -1248,15 +1224,6 @@ struct VixMsgRecordReplayEvent {
 #include "vmware_pack_end.h"
 VixMsgRecordReplayEvent;
 
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgTimeMarkerEncounteredEvent {
-   VixMsgEventHeader        eventHeader;      
-   uint32                   propertyListSize;
-}
-#include "vmware_pack_end.h"
-VixMsgTimeMarkerEncounteredEvent;
-
 typedef
 #include "vmware_pack_begin.h"
 struct VixMsgDebuggerEvent {
@@ -1270,51 +1237,6 @@ struct VixMsgDebuggerEvent {
 #include "vmware_pack_end.h"
 VixMsgDebuggerEvent;
 
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgGetRecordReplayInfoResponse {
-   VixCommandResponseHeader header;
-   uint32                   propertyListSize;
-}
-#include "vmware_pack_end.h"
-VixMsgGetRecordReplayInfoResponse;
-
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgVMSnapshotSetReplaySpeedRequest {
-   VixCommandRequestHeader    header;
-
-   int32                      options;
-   int32                      timeType;
-   int64                      timeValue;
-}
-#include "vmware_pack_end.h"
-VixMsgVMSnapshotSetReplaySpeedRequest;
-
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgVMAddTimeMarkerRequest {
-   VixCommandRequestHeader    header;
-   uint32                     options;
-   uint32                     action;
-   uint32                     propertyListSize;
-}
-#include "vmware_pack_end.h"
-VixMsgVMAddTimeMarkerRequest;
-
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgVMGetTimeMarkerRequest {
-   VixCommandRequestHeader    header;
-   uint32                     options;
-   uint32                     whence;
-   uint32                     index;
-   uint32                     propertyListSize;
-}
-#include "vmware_pack_end.h"
-VixMsgVMGetTimeMarkerRequest;
-
-
 /*
  * Fault Tolerance Automation
  */
@@ -2292,7 +2214,7 @@ enum {
    VIX_COMMAND_VM_PAUSE                         = 122,
    VIX_COMMAND_VM_UNPAUSE                       = 123,
    /* DEPRECATED VIX_COMMAND_GET_SNAPSHOT_LOG_INFO            = 124, */
-   VIX_COMMAND_SET_REPLAY_SPEED                 = 125,
+   /* DEPRECATED VIX_COMMAND_SET_REPLAY_SPEED                 = 125, */
 
    /* DEPRECATED VIX_COMMAND_ANSWER_USER_MESSAGE              = 126, */
    /* DEPRECATED VIX_COMMAND_SET_CLIENT_LOCALE                = 127, */
@@ -2302,7 +2224,7 @@ enum {
    /* DEPRECATED VIX_COMMAND_REFRESH_RUNTIME_PROPERTIES       = 129, */
 
    VIX_COMMAND_GET_SNAPSHOT_SCREENSHOT          = 130,
-   VIX_COMMAND_ADD_TIMEMARKER                   = 131,
+   /* DEPRECATED VIX_COMMAND_ADD_TIMEMARKER                   = 131, */
 
    VIX_COMMAND_WAIT_FOR_USER_ACTION_IN_GUEST    = 132,
    /* DEPRECATED VIX_COMMAND_VMDB_END_TRANSACTION             = 133, */
@@ -2319,20 +2241,20 @@ enum {
    VIX_COMMAND_DEBUGGER_DETACH                  = 141,
    VIX_COMMAND_DEBUGGER_SEND_COMMAND            = 142,
 
-   VIX_COMMAND_GET_RECORD_STATE                 = 143,
-   VIX_COMMAND_SET_RECORD_STATE                 = 144,
-   VIX_COMMAND_REMOVE_RECORD_STATE              = 145,
-   VIX_COMMAND_GET_REPLAY_STATE                 = 146,
-   VIX_COMMAND_SET_REPLAY_STATE                 = 147,
-   VIX_COMMAND_REMOVE_REPLAY_STATE              = 148,
+   /* DEPRECATED VIX_COMMAND_GET_RECORD_STATE                 = 143, */
+   /* DEPRECATED VIX_COMMAND_SET_RECORD_STATE                 = 144, */
+   /* DEPRECATEDVIX_COMMAND_REMOVE_RECORD_STATE              = 145, */
+   /* VIX_COMMAND_GET_REPLAY_STATE                 = 146, */
+   /* VIX_COMMAND_SET_REPLAY_STATE                 = 147, */
+   /* VIX_COMMAND_REMOVE_REPLAY_STATE              = 148, */
 
    /* DEPRECATED VIX_COMMAND_CANCEL_USER_PROGRESS_MESSAGE     = 150, */
    
    VIX_COMMAND_GET_VMX_DEVICE_STATE             = 151,
 
-   VIX_COMMAND_GET_NUM_TIMEMARKERS              = 152,
-   VIX_COMMAND_GET_TIMEMARKER                   = 153,
-   VIX_COMMAND_REMOVE_TIMEMARKER                = 154,
+   /* DEPRECATED VIX_COMMAND_GET_NUM_TIMEMARKERS              = 152, */
+   /* DEPRECATED VIX_COMMAND_GET_TIMEMARKER                   = 153, */
+   /* DEPRECATED VIX_COMMAND_REMOVE_TIMEMARKER                = 154, */
 
    VIX_COMMAND_SET_SNAPSHOT_INFO                = 155,
    VIX_COMMAND_SNAPSHOT_SET_MRU                 = 156,