Changeset 93405 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jan 24, 2022 9:56:23 AM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: Use the detected guest OS type instead of the configured VM guest OS type for picking the installer. bugref:10186 bugref:9515

Location:

trunk/src/VBox/Main/include

Files:

• Global.h (modified) (1 diff)
• UnattendedImpl.h (modified) (2 diffs)
• UnattendedInstaller.h (modified) (2 diffs)

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

@@ -163 +163 @@
 
     /**
+     * Stringify a storage bus type.
+     *
+     * @returns Pointer to a read only string.
+     * @param   aBusType    The storage bus type.
+     */
+    static const char *stringifyStorageBus(StorageBus_T aBus);
+
+    /**
      * Stringify a device type.
      *

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

@@ -81 +81 @@
     bool           i_isGuestOs64Bit() const;
     bool           i_isFirmwareEFI() const;
-    VBOXOSTYPE     i_getGuestOsType() const;
     Utf8Str const &i_getDetectedOSVersion();
 
@@ -94 +93 @@
     bool            mfGuestOs64Bit;         /**< 64-bit (true) or 32-bit guest OS (set by prepare). */
     FirmwareType_T  menmFirmwareType;       /**< Firmware type BIOS/EFI (set by prepare). */
-    VBOXOSTYPE      meGuestOsType;          /**< The guest OS type (set by prepare). */
     UnattendedInstaller *mpInstaller;       /**< The installer instance (set by prepare, deleted by done). */
 

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

@@ -102 +102 @@
      *
      * @returns Pointer to the new instance, NULL if no appropriate installer.
-     * @param   enmOsType               The guest OS type value.
-     * @param   strGuestOsType          The guest OS type string
+     * @param   enmDetectedOSType       The detected guest OS type value.
+     * @param   strDetectedOSType       The detected guest OS type string
      * @param   strDetectedOSVersion    The detected guest OS version.
      * @param   strDetectedOSFlavor     The detected guest OS flavor.
@@ -111 +111 @@
      * @throws  std::bad_alloc
      */
-    static UnattendedInstaller *createInstance(VBOXOSTYPE enmOsType, const Utf8Str &strGuestOsType,
+    static UnattendedInstaller *createInstance(VBOXOSTYPE enmDetectedOSType, const Utf8Str &strDetectedOSType,
                                                const Utf8Str &strDetectedOSVersion, const Utf8Str &strDetectedOSFlavor,
                                                const Utf8Str &strDetectedOSHints, Unattended *pParent);