Changeset 101063 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 8, 2023 12:41:13 PM (17 months ago)

Author:

vboxsync

Message:

Main: More stub code for ARM. bugref:10384

Location:

trunk/src/VBox/Main/src-server

Files:

• PlatformARMImpl.cpp (modified) (3 diffs)
• PlatformImpl.cpp (modified) (3 diffs)
• PlatformX86Impl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/PlatformARMImpl.cpp

@@ -86 +86 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    RT_NOREF(aParent, aMachine);
+    /* share the parent + machine weakly */
+    unconst(mParent)  = aParent;
+    unconst(mMachine) = aMachine;
+
+    m = new Data;
+    m->bd.allocate();
 
     autoInitSpan.setSucceeded();
@@ -237 +242 @@
 
     /** @todo BUGBUG Implement this form ARM! */
-    return E_NOTIMPL;
+    return S_OK;
 }
 
@@ -252 +257 @@
     RT_NOREF(data);
 
-    /** @todo BUGBUG Implement this form ARM! */
-    return E_NOTIMPL;
-}
-
+    /** @todo BUGBUG Implement this for ARM! */
+    return S_OK;
+}
+
+HRESULT PlatformARM::i_applyDefaults(GuestOSType *aOsType)
+{
+    RT_NOREF(aOsType);
+
+    /** @todo BUGBUG Implement this for ARM! */
+    return S_OK;
+}

trunk/src/VBox/Main/src-server/PlatformImpl.cpp

@@ -525 +525 @@
     }
 
-    AssertFailedReturn(VBOX_E_PLATFORM_ARCH_NOT_SUPPORTED);
+    return setErrorVrc(VBOX_E_PLATFORM_ARCH_NOT_SUPPORTED, "Platform '%s' not supported", Platform::s_platformArchitectureToStr(m->bd->architectureType));
 }
 
@@ -560 +560 @@
     }
 
-    AssertFailedReturn(VBOX_E_PLATFORM_ARCH_NOT_SUPPORTED);
+    return setErrorVrc(VBOX_E_PLATFORM_ARCH_NOT_SUPPORTED, "Platform '%s' not supported", Platform::s_platformArchitectureToStr(m->bd->architectureType));
 }
 
@@ -827 +827 @@
 }
 
+/**
+ * Converts a platform architecture to a string.
+ *
+ * @returns Platform architecture as a string.
+ * @param   enmArchitecture         Platform architecture to convert.
+ */
+const char *Platform::s_platformArchitectureToStr(PlatformArchitecture_T enmArchitecture)
+{
+    switch (enmArchitecture)
+    {
+        case PlatformArchitecture_x86: return "x86";
+        case PlatformArchitecture_ARM: return "ARM";
+        default:
+            break;
+    }
+
+    AssertFailedReturn("<None>");
+}
+

trunk/src/VBox/Main/src-server/PlatformX86Impl.cpp

@@ -88 +88 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    m = new Data;
-
     /* share the parent + machine weakly */
     unconst(mParent)  = aParent;
     unconst(mMachine) = aMachine;
 
+    m = new Data;
     m->bd.allocate();