Changeset 24618 in vbox

Timestamp:

Nov 12, 2009 5:52:33 PM (15 years ago)

Author:

vboxsync

Message:

Added Global::vboxStatusCodeFromCOM (and Global::vboxStatusCodeToCOM), made Console::doGuestPropNotification make use of it.

Location:

trunk

Files:

• include/VBox/err.h (modified) (2 diffs)
• src/VBox/Main/ConsoleImpl.cpp (modified) (1 diff)
• src/VBox/Main/Global.cpp (modified) (2 diffs)
• src/VBox/Main/include/Global.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -1450 +1450 @@
  */
 /** Switch back to host */
-#define VINF_PARAV_SWITCH_TO_HOST                     4400
+#define VINF_PARAV_SWITCH_TO_HOST                   4400
 
 /** @} */
@@ -1458 +1458 @@
  */
 /** command processing is pending, a completion handler will be called */
-#define VINF_VHWA_CMD_PENDING                        4500
-
+#define VINF_VHWA_CMD_PENDING                       4500
+
+/** @} */
+
+
+/** @name VBox Webservice Status Codes
+ * @{
+ */
+/** Object not found. */
+#define VERR_COM_OBJECT_NOT_FOUND                  (-4601)
+/** Invalid machine state. */
+#define VERR_COM_INVALID_VM_STATE                  (-4602)
+/** VM error. */
+#define VERR_COM_VM_ERROR                          (-4603)
+/** File error. */
+#define VERR_COM_FILE_ERROR                        (-4604)
+/** IPRT error. */
+#define VERR_COM_IPRT_ERROR                        (-4605)
+/** PDM error. */
+#define VERR_COM_PDM_ERROR                         (-4606)
+/** Invalid object state. */
+#define VERR_COM_INVALID_OBJECT_STATE              (-4607)
+/** Host error. */
+#define VERR_COM_HOST_ERROR                        (-4608)
+/** Not supported. */
+#define VERR_COM_NOT_SUPPORTED                     (-4609)
+/** XML error. */
+#define VERR_COM_XML_ERROR                         (-4610)
+/** Invalid session state. */
+#define VERR_COM_INVALID_SESSION_STATE             (-4611)
+/** Invalid session state. */
+#define VERR_COM_OBJECT_IN_USE                     (-4612)
 /** @} */
 

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1197 +1197 @@
 //             LogFunc(("pCBData->pcszValue=%s\n", pCBData->pcszValue));
 //             LogFunc(("pCBData->pcszFlags=%s\n", pCBData->pcszFlags));
-            rc = VERR_UNRESOLVED_ERROR;  /** @todo translate error code */
+            rc = Global::vboxStatusCodeFromCOM(hrc);
         }
     }

trunk/src/VBox/Main/Global.cpp

@@ -28 +28 @@
 #include <iprt/assert.h>
 #include <iprt/string.h>
+#include <VBox/err.h>
 
 /* static */
@@ -237 +238 @@
 }
 
+/*static*/ int
+Global::vboxStatusCodeFromCOM(HRESULT aComStatus)
+{
+    switch (aComStatus)
+    {
+        case S_OK:                              return VINF_SUCCESS;
+        case E_FAIL:                            return VERR_GENERAL_FAILURE;
+        case E_INVALIDARG:                      return VERR_INVALID_PARAMETER;
+        case E_POINTER:                         return VERR_INVALID_POINTER;
+
+        case VBOX_E_OBJECT_NOT_FOUND:           return VERR_COM_OBJECT_NOT_FOUND;
+        case VBOX_E_INVALID_VM_STATE:           return VERR_COM_INVALID_VM_STATE;
+        case VBOX_E_VM_ERROR:                   return VERR_COM_VM_ERROR;
+        case VBOX_E_FILE_ERROR:                 return VERR_COM_FILE_ERROR;
+        case VBOX_E_IPRT_ERROR:                 return VERR_COM_IPRT_ERROR;
+        case VBOX_E_PDM_ERROR:                  return VERR_COM_PDM_ERROR;
+        case VBOX_E_INVALID_OBJECT_STATE:       return VERR_COM_INVALID_OBJECT_STATE;
+        case VBOX_E_HOST_ERROR:                 return VERR_COM_HOST_ERROR;
+        case VBOX_E_NOT_SUPPORTED:              return VERR_COM_NOT_SUPPORTED;
+        case VBOX_E_XML_ERROR:                  return VERR_COM_XML_ERROR;
+        case VBOX_E_INVALID_SESSION_STATE:      return VERR_COM_INVALID_SESSION_STATE;
+        case VBOX_E_OBJECT_IN_USE:              return VERR_COM_OBJECT_IN_USE;
+
+        default:
+            if (SUCCEEDED(aComStatus))
+                return VINF_SUCCESS;
+            return VERR_UNRESOLVED_ERROR;
+    }
+}
+
+
+/*static*/ HRESULT
+Global::vboxStatusCodeToCOM(int aVBoxStatus)
+{
+    switch (aVBoxStatus)
+    {
+        case VINF_SUCCESS:                      return S_OK;
+        case VERR_GENERAL_FAILURE:              return E_FAIL;
+        case VERR_UNRESOLVED_ERROR:             return E_FAIL;
+        case VERR_INVALID_PARAMETER:            return E_INVALIDARG;
+        case VERR_INVALID_POINTER:              return E_POINTER;
+
+        case VERR_COM_OBJECT_NOT_FOUND:         return VBOX_E_OBJECT_NOT_FOUND;
+        case VERR_COM_INVALID_VM_STATE:         return VBOX_E_INVALID_VM_STATE;
+        case VERR_COM_VM_ERROR:                 return VBOX_E_VM_ERROR;
+        case VERR_COM_FILE_ERROR:               return VBOX_E_FILE_ERROR;
+        case VERR_COM_IPRT_ERROR:               return VBOX_E_IPRT_ERROR;
+        case VERR_COM_PDM_ERROR:                return VBOX_E_PDM_ERROR;
+        case VERR_COM_INVALID_OBJECT_STATE:     return VBOX_E_INVALID_OBJECT_STATE;
+        case VERR_COM_HOST_ERROR:               return VBOX_E_HOST_ERROR;
+        case VERR_COM_NOT_SUPPORTED:            return VBOX_E_NOT_SUPPORTED;
+        case VERR_COM_XML_ERROR:                return VBOX_E_XML_ERROR;
+        case VERR_COM_INVALID_SESSION_STATE:    return VBOX_E_INVALID_SESSION_STATE;
+        case VERR_COM_OBJECT_IN_USE:            return VBOX_E_OBJECT_IN_USE;
+
+        default:
+            AssertMsgFailed(("%Rrc\n", aVBoxStatus));
+            if (RT_SUCCESS(aVBoxStatus))
+                return S_OK;
+
+            /* try categorize it */
+            if (aVBoxStatus < 0 && aVBoxStatus > -1000)
+                return VBOX_E_IPRT_ERROR;
+            if (    aVBoxStatus <  VERR_PDM_NO_SUCH_LUN / 100 * 10
+                &&  aVBoxStatus >  VERR_PDM_NO_SUCH_LUN / 100 * 10 - 100)
+                return VBOX_E_PDM_ERROR;
+            if (    aVBoxStatus <= -1000
+                &&  aVBoxStatus >  -5000 /* wrong, but so what... */)
+                return VBOX_E_VM_ERROR;
+
+            return E_FAIL;
+    }
+}
+
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/include/Global.h

@@ -161 +161 @@
      */
     static const char *stringifySessionState(SessionState_T aState);
+
+    /**
+     * Try convert a COM status code to a VirtualBox status code (VBox/err.h).
+     *
+     * @returns VBox status code.
+     * @param   aComStatus      COM status code.
+     */
+    static int vboxStatusCodeFromCOM(HRESULT aComStatus);
+
+    /**
+     * Try convert a VirtualBox status code (VBox/err.h) to a COM status code.
+     *
+     * This is mainly inteded for dealing with vboxStatusCodeFromCOM() return
+     * values.  If used on anything else, it won't be able to cope with most of the
+     * input!
+     *
+     * @returns COM status code.
+     * @param   aVBoxStatus      VBox status code.
+     */
+    static HRESULT vboxStatusCodeToCOM(int aVBoxStatus);
 };