Changeset 84196 in vbox

Timestamp:

May 8, 2020 4:02:37 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137804

Message:

OCI: switch ICloudMachine::state from MachineState (local VM state
enum) to CloudMachineState. Remove the temporary mapping in the GUI
that isolated the impact of this API change in preparation to it.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.h (modified) (1 diff)
• Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.h (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.cpp

@@ -434 +434 @@
 
 bool UICloudNetworkingStuff::cloudMachineState(const CCloudMachine &comCloudMachine,
-                                               KMachineState &enmResult,
+                                               KCloudMachineState &enmResult,
                                                QWidget *pParent /* = 0 */)
 {
-    const KMachineState enmState = comCloudMachine.GetState();
+    const KCloudMachineState enmState = comCloudMachine.GetState();
     if (!comCloudMachine.isOk())
         msgCenter().cannotAcquireCloudMachineParameter(comCloudMachine, pParent);

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.h

@@ -135 +135 @@
     /** Acquires @a comCloudMachine state as a @a enmResult, using @a pParent to show messages according to. */
     SHARED_LIBRARY_STUFF bool cloudMachineState(const CCloudMachine &comCloudMachine,
-                                                KMachineState &enmResult,
+                                                KCloudMachineState &enmResult,
                                                 QWidget *pParent = 0);
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.cpp

@@ -129 +129 @@
             /* Determine whether VM is accessible: */
             m_fAccessible = m_comCloudMachine.GetAccessible();
-            m_strAccessError = !m_fAccessible ? UIErrorString::formatErrorInfo(m_comCloudMachine.GetAccessError()) : QString();
+            CVirtualBoxErrorInfo comInfo = m_comCloudMachine.GetAccessError();
+            if (!m_fAccessible && comInfo.isNull())
+                LogRel(("UIVirtualMachineItemCloud::recache: Error info is NULL for inaccessible VM.\n"));
+            m_strAccessError = !m_fAccessible && !comInfo.isNull() ? UIErrorString::formatErrorInfo(comInfo) : QString();
 
             /* Determine VM OS type: */
@@ -135 +138 @@
 
             /* Determine VM states: */
-            m_enmMachineState = m_fAccessible ? toCloudMachineState(m_comCloudMachine.GetState()) : KCloudMachineState_Stopped;
+            m_enmMachineState = m_fAccessible ? m_comCloudMachine.GetState() : KCloudMachineState_Stopped;
             m_strMachineStateName = gpConverter->toString(m_enmMachineState);
             m_machineStateIcon = gpConverter->toIcon(m_enmMachineState);
@@ -303 +306 @@
     emit sigStateChange();
 }
-
-/* static */
-KCloudMachineState UIVirtualMachineItemCloud::toCloudMachineState(KMachineState enmState)
-{
-    switch (enmState)
-    {
-        case KMachineState_Starting:   return KCloudMachineState_Starting;
-        case KMachineState_Running:    return KCloudMachineState_Running;
-        case KMachineState_Stopping:   return KCloudMachineState_Stopping;
-        case KMachineState_PoweredOff: return KCloudMachineState_Stopped;
-        default:                       return KCloudMachineState_Stopped;
-    }
-}

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.h

@@ -125 +125 @@
 private:
 
-    /** Temporary! Converts state from KMachineState to KCloudMachineState. */
-    static KCloudMachineState toCloudMachineState(KMachineState enmState);
-
     /** @name Arguments.
       * @{ */

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -26743 +26743 @@
     </attribute>
 
-    <attribute name="state" type="MachineState" readonly="yes">
+    <attribute name="state" type="CloudMachineState" readonly="yes">
       <desc>
         Machine state.
@@ -26833 +26833 @@
           Virtual machine must be Running, to be powered down.
         </result>
+      </desc>
+      <param name="progress" type="IProgress" dir="return">
+        <desc>
+          Progress object to track the operation completion.
+        </desc>
+      </param>
+    </method>
+
+    <method name="terminate">
+      <desc>
+        Terminate cloud virtual machine.
       </desc>
       <param name="progress" type="IProgress" dir="return">