Internal branch sync. Included in this change:

. make quiescing error messages more generic.

. 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/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 7b484eb0d683bcf17f292dfc2651f47f3214dec6..b5d7ef6691a8bb82fd931e3d93cf9a72e3837950 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -192,7 +192,7 @@
 #endif
 
 #define PRODUCT_VMRC_PLUGIN_CURRENT_MIMETYPE \
-   "application/x-vmware-vmrc-2011"
+   "application/x-vmware-remote-console-2011"
 
 /*
  * legacy plugin mimetypes (currently unused but here for reference)

diff --git a/open-vm-tools/services/plugins/vmbackup/scriptOps.c b/open-vm-tools/services/plugins/vmbackup/scriptOps.c
index 1c483343d99597ec979c87ffb80e719dc16cddbe..185bcf5a3ba3d168196a7f1f07cc34450910aeab 100644 (file)
--- a/open-vm-tools/services/plugins/vmbackup/scriptOps.c
+++ b/open-vm-tools/services/plugins/vmbackup/scriptOps.c
@@ -315,7 +315,7 @@ exit:
       /* Report the script error to the host */
       VmBackup_SendEvent(VMBACKUP_EVENT_REQUESTOR_ERROR,
                          VMBACKUP_SCRIPT_ERROR,
-                         "Custom script failed.");
+                         "Custom quiesce script failed.");
    }
    return ret;
 }

diff --git a/open-vm-tools/services/plugins/vmbackup/stateMachine.c b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
index 8e8410b5a9e3e69ed397e283411660b2eb9ba885..d3ab6a28e56adb1c168288bb654400d943761351 100644 (file)
--- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
+++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
@@ -261,7 +261,7 @@ VmBackupStartScripts(VmBackupScriptType type)
                               opName)) {
       VmBackup_SendEvent(VMBACKUP_EVENT_REQUESTOR_ERROR,
                          VMBACKUP_SCRIPT_ERROR,
-                         "Error when starting backup scripts.");
+                         "Error when starting custom quiesce scripts.");
       return FALSE;
    }
 
@@ -335,7 +335,7 @@ VmBackupDoAbort(void)
 
       VmBackup_SendEvent(VMBACKUP_EVENT_REQUESTOR_ABORT,
                          VMBACKUP_REMOTE_ABORT,
-                         "Backup aborted.");
+                         "Quiesce aborted.");
 
       /* Transition to the error state. */
       if (VmBackupOnError()) {
@@ -704,7 +704,8 @@ error:
    g_free(gBackupState->volumes);
    g_free(gBackupState);
    gBackupState = NULL;
-   return RPCIN_SETRETVALS(data, "Error initializing backup.", FALSE);
+   return RPCIN_SETRETVALS(data, "Error initializing quiesce operation.",
+                           FALSE);
 }
 
 
@@ -726,7 +727,8 @@ VmBackupStart(RpcInData *data)
 {
    g_debug("*** %s\n", __FUNCTION__);
    if (gBackupState != NULL) {
-      return RPCIN_SETRETVALS(data, "Backup operation already in progress.", FALSE);
+      return RPCIN_SETRETVALS(data, "Quiesce operation already in progress.",
+                              FALSE);
    }
    gBackupState = g_new0(VmBackupState, 1);
    if (data->argsSize > 0) {
@@ -794,7 +796,7 @@ VmBackupStartWithOpts(RpcInData *data)
 
    g_debug("*** %s\n", __FUNCTION__);
    if (gBackupState != NULL) {
-      return RPCIN_SETRETVALS(data, "Backup operation already in progress.",
+      return RPCIN_SETRETVALS(data, "Quiesce operation already in progress.",
                               FALSE);
    }
    params = (GuestQuiesceParams *)data->args;
@@ -836,7 +838,8 @@ VmBackupAbort(RpcInData *data)
 {
    g_debug("*** %s\n", __FUNCTION__);
    if (gBackupState == NULL) {
-      return RPCIN_SETRETVALS(data, "Error: no backup in progress", FALSE);
+      return RPCIN_SETRETVALS(data, "Error: no quiesce operation in progress",
+                              FALSE);
    }
 
    VmBackupDoAbort();
@@ -858,12 +861,12 @@ VmBackupSnapshotDone(RpcInData *data)
 {
    g_debug("*** %s\n", __FUNCTION__);
    if (gBackupState == NULL) {
-      return RPCIN_SETRETVALS(data, "Error: no backup in progress", FALSE);
+      return RPCIN_SETRETVALS(data, "Error: no quiesce operation in progress", FALSE);
    } else if (gBackupState->machineState != VMBACKUP_MSTATE_SYNC_FREEZE) {
       g_warning("Error: unexpected state for snapshot done message: %s",
                 VmBackupGetStateName(gBackupState->machineState));
       return RPCIN_SETRETVALS(data,
-                              "Error: unexpected state for snapshot done message.",
+                              "Error: unexpected state for quiesce done message.",
                               FALSE);
    } else {
       if (data->argsSize > 1) {