Changeset 101176 in vbox for trunk/src

Timestamp:

Sep 19, 2023 4:57:28 PM (15 months ago)

Author:

vboxsync

Message:

Main: Added a new static function Host::s_getPlatformArchitecture() for easier retrieving the host's platform architecture internally. bugref:10384

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -99 +99 @@
 
     static void i_generateMACAddress(Utf8Str &mac);
+    static PlatformArchitecture_T s_getPlatformArchitecture();
 
 #ifdef RT_OS_WINDOWS

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

@@ -601 +601 @@
 HRESULT Host::getArchitecture(PlatformArchitecture_T *platformArchitecture)
 {
-#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
-    *platformArchitecture = PlatformArchitecture_x86;
-#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
-    *platformArchitecture = PlatformArchitecture_ARM;
-#else
-# error "Port me!"
-#endif
+    *platformArchitecture = Host::s_getPlatformArchitecture();
 
     return S_OK;
@@ -3963 +3957 @@
 }
 
+/**
+ * Returns the host's platform architecture.
+ *
+ * @returns The host's platform architecture.
+ */
+/* static */
+PlatformArchitecture_T Host::s_getPlatformArchitecture()
+{
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+    return PlatformArchitecture_x86;
+#elif defined(RT_ARCH_ARM64) || defined(RT_ARCH_ARM32)
+    return PlatformArchitecture_ARM;
+#else
+# error "Port me!"
+    return PlatformArchitecture_None;
+#endif
+}
+
 #ifdef RT_OS_WINDOWS
 HRESULT Host::i_getFixedDrivesFromGlobalNamespace(std::list<std::pair<com::Utf8Str, com::Utf8Str> > &aDriveList) RT_NOEXCEPT