Changeset 101371 in vbox

Timestamp:

Oct 6, 2023 1:23:31 AM (18 months ago)

Author:

vboxsync

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

159374

Message:

Main/Global.cpp: Move the macros for compose the x64/x86/arm64/arm32 guest OS IDs to the VirtualBox API header so the GUI and others can make use of them as well. bugref:10384

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• src-all/Global.cpp (modified) (1 diff)

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

@@ -284 +284 @@
   </cpp>
 </if>
+
+<!--
+  Macros for helping with constructing guest OS type ID strings for the
+  different architectures.
+-->
+<cpp line="#define GUEST_OS_ID_STR_X86(a_szOSid)     a_szOSid"/>
+<cpp line="#if 0 /** @todo r=bird: revert to legacy naming: */"/>
+<cpp line="#define GUEST_OS_ID_STR_X64(a_szOSid)     a_szOSid  &quot;_64&quot;"/>
+<cpp line="#else"/>
+<cpp line="#define GUEST_OS_ID_STR_X64(a_szOSid)     a_szOSid  &quot;_x64&quot;"/>
+<cpp line="#endif"/>
+<cpp line="#define GUEST_OS_ID_STR_A32(a_szOSid)     a_szOSid  &quot;_arm32&quot;"/>
+<cpp line="#define GUEST_OS_ID_STR_A64(a_szOSid)     a_szOSid  &quot;_arm64&quot;"/>
+<cpp line="#define GUEST_OS_ID_STR_AMD64(a_szOSid)   GUEST_OS_ID_STR_X64(a_szOSid)"/>
+<cpp line="#define GUEST_OS_ID_STR_ARM32(a_szOSid)   GUEST_OS_ID_STR_A32(a_szOSid)"/>
+<cpp line="#define GUEST_OS_ID_STR_ARM64(a_szOSid)   GUEST_OS_ID_STR_A64(a_szOSid)"/>
 
 <!--

trunk/src/VBox/Main/src-all/Global.cpp

@@ -44 +44 @@
 #define VBOX_OSTYPE_ARM32(a_OStype)     VBOXOSTYPE_ ## a_OStype ## _arm32
 #define VBOX_OSTYPE_ARM64(a_OStype)     VBOXOSTYPE_ ## a_OStype ## _arm64
-
-/** @todo r=bird: These macros should move to VBox/cdefs.h or a similarly easily
- *        accessible file, so that the GUI can make use of them too. */
-/* Note: Keep this naming for legacy reasons. Always meant x86 (32-bit). */
-#define GUEST_OS_ID_STR_X86(a_szOSid)     a_szOSid
-#if 0 /** @todo r=bird: revert to legacy naming: */
-#define GUEST_OS_ID_STR_X64(a_szOSid)     a_szOSid  "_64"
-#else
-#define GUEST_OS_ID_STR_X64(a_szOSid)     a_szOSid  "_x64"
-#endif
-/* New since VBox 7.1. */
-#define GUEST_OS_ID_STR_A32(a_szOSid)     a_szOSid  "_arm32"
-/* New since VBox 7.1. */
-#define GUEST_OS_ID_STR_A64(a_szOSid)     a_szOSid  "_arm64"
 
 /* static */