Changeset 101379 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Oct 6, 2023 8:45:30 AM (19 months ago)

Author:

vboxsync

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

159382

Message:

Main: Prep for backing out the '_64' -> '_x64' change. bugref:10384

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -6881 +6881 @@
 
 /**
- * Static function to convert a guest OS type ID suffix.
- *
- * @param   strOsType               Guest OS type ID to convert.
- * @param   pszToReplace            Suffix to replace.
- * @param   pszReplacement          What to replace the suffix with.
+ * Worker function that converts the suffix of a guest OS type ID.
+ *
+ * @param   a_rstrOsType        Guest OS type ID to convert.
+ * @param   a_pszToReplace      Suffix to replace.
+ * @param   a_pszReplacement    What to replace the suffix with.
  */
 /* static */
-void MachineConfigFile::convertGuestOSTypeSuffix(com::Utf8Str &strOsType, const char *pszToReplace, const char *pszReplacement)
-{
-    size_t const cchToReplace = strlen(pszToReplace);
-    if (strOsType.endsWith(pszToReplace, cchToReplace))
-        strOsType.replace(strOsType.length() - cchToReplace, cchToReplace, pszReplacement);
-}
+void MachineConfigFile::convertGuestOSTypeSuffix(com::Utf8Str &a_rstrOsType,
+                                                 const char *a_pszToReplace, const char *a_pszReplacement)
+{
+    size_t const cchToReplace = strlen(a_pszToReplace);
+    if (a_rstrOsType.endsWith(a_pszToReplace, cchToReplace))
+        a_rstrOsType.replace(a_rstrOsType.length() - cchToReplace, cchToReplace, a_pszReplacement);
+}
+
+#ifdef GUEST_OS_ID_STYLE_PARTIAL_CLEANUP
 
 /**
@@ -6926 +6929 @@
     convertGuestOSTypeSuffix(str, "_x64", "_64");
 }
+
+#else  /* !GUEST_OS_ID_STYLE_PARTIAL_CLEANUP */
+
+/**
+ * Undoes effects of the 'OSTYPEID_64' to 'OSTYPEID_x64' renaming attempt from
+ * the VBox v7.1 development cycle on @a a_rstrOsType.
+ *
+ * @see     @bugref{10384#c18}
+ */
+/* static */
+void MachineConfigFile::convertGuestOSTypeFromDev1_20(Utf8Str &a_rstrOsType)
+{
+    convertGuestOSTypeSuffix(a_rstrOsType, "_x64", "_64");
+}
+
+#endif /* !GUEST_OS_ID_STYLE_PARTIAL_CLEANUP */
+
 
 /**
@@ -6948 +6968 @@
         if (m->sv < SettingsVersion_v1_5)
             convertGuestOSTypeFromPre1_5(machineUserData.strOsType);
+#ifdef GUEST_OS_ID_STYLE_PARTIAL_CLEANUP
         if (m->sv <= SettingsVersion_v1_19)
             convertGuestOSTypeFromPre1_20(machineUserData.strOsType);
-
+#else
+        if (m->sv == SettingsVersion_v1_20)
+            convertGuestOSTypeFromDev1_20(machineUserData.strOsType);
+#endif
         elmMachine.getAttributeValue("stateKeyId", strStateKeyId);
         elmMachine.getAttributeValue("stateKeyStore", strStateKeyStore);
@@ -9118 +9142 @@
         elmMachine.createChild("Description")->addContent(machineUserData.strDescription);
 
+#ifdef GUEST_OS_ID_STYLE_PARTIAL_CLEANUP
     com::Utf8Str strOsType = machineUserData.strOsType;
     if (m->sv < SettingsVersion_v1_20)
         convertGuestOSTypeToPre1_20(strOsType);
-    /* else use the unmodified guest OS type ID. */
     elmMachine.setAttribute("OSType", strOsType);
+#else
+    elmMachine.setAttribute("OSType", machineUserData.strOsType);
+#endif
 
     if (m->sv >= SettingsVersion_v1_19)