Changeset 101177 in vbox

Timestamp:

Sep 19, 2023 4:59:11 PM (16 months ago)

Author:

vboxsync

Message:

Main: Added GuestOSType::i_platformArchitecture() for easier retrieving the guest OS' platform architecture internally. bugref:10384

Location:

trunk/src/VBox/Main

Files:

• include/GuestOSTypeImpl.h (modified) (1 diff)
• src-server/GuestOSTypeImpl.cpp (modified) (2 diffs)

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

@@ -56 +56 @@
     const Utf8Str &i_description() const { return mDescription; }
     bool i_is64Bit() const { return !!(mOSHint & VBOXOSHINT_64BIT); }
+    PlatformArchitecture_T i_platformArchitecture() const;
     bool i_recommendedIOAPIC() const { return !!(mOSHint & VBOXOSHINT_IOAPIC); }
     bool i_recommendedX2APIC() const { return !!(mOSHint & VBOXOSHINT_X2APIC); }

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

@@ -208 +208 @@
 }
 
-HRESULT GuestOSType::getPlatformArchitecture(PlatformArchitecture_T *aPlatformArchitecture)
+PlatformArchitecture_T GuestOSType::i_platformArchitecture() const
 {
     /* mOSType constant during life time, no need to lock */
@@ -214 +214 @@
     if (   osTypePlatformArchitectureMasked & VBOXOSTYPE_x86
         || osTypePlatformArchitectureMasked & VBOXOSTYPE_x64)
-        *aPlatformArchitecture = PlatformArchitecture_x86;
+        return PlatformArchitecture_x86;
     else if (   osTypePlatformArchitectureMasked & VBOXOSTYPE_arm32
              || osTypePlatformArchitectureMasked & VBOXOSTYPE_arm64)
-        *aPlatformArchitecture = PlatformArchitecture_ARM;
-    else
-    {
-        AssertFailed(); /* Something is fishy in the OSTYPE spec. */
-        *aPlatformArchitecture = PlatformArchitecture_None;
-    }
-
+        return PlatformArchitecture_ARM;
+
+    /* Will happen when called before being properly initialized(). */
+    return PlatformArchitecture_None;
+}
+
+HRESULT GuestOSType::getPlatformArchitecture(PlatformArchitecture_T *aPlatformArchitecture)
+{
+    *aPlatformArchitecture = i_platformArchitecture();
     return S_OK;
 }