Changeset 105548 in vbox

Timestamp:

Jul 31, 2024 12:43:12 AM (8 weeks ago)

Author:

vboxsync

Message:

FE/Qt: The --fda and --dvd/--cdrom option values must be stored as QString, as QUuid would presumably convert the 'none' value to {00000000-0000-0000-0000-000000000000} and same for any paths. (untested, sorry)

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (3 diffs)
• globals/UICommon.h (modified) (2 diffs)
• runtime/UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -329 +329 @@
                 else \
                     (a_strDst).clear(); \
-            } while (0)
-#define ASSIGN_OPT_VALUE_TO_QUUID(a_uuidDst) do { \
-                if (*pszSep != '\0') \
-                    (a_uuidDst) = QUuid(&pszSep[1]); \
-                else if (++i < argc) \
-                    (a_uuidDst) = QUuid(arguments.at(i)); \
-                else \
-                    (a_uuidDst) = QUuid(); /* null UUID */ \
             } while (0)
 
@@ -472 +464 @@
         {
             enmOptType = OptType_VMRunner;
-/** @todo r=bird: this isn't correct. Must use QString instead of QUuid to store this! */
-            ASSIGN_OPT_VALUE_TO_QUUID(m_uFloppyImage);
+            ASSIGN_OPT_VALUE_TO_QSTRING(m_strFloppyImage);
         }
         else if (MATCH_OPT_WITH_VALUE("--dvd") || MATCH_OPT_WITH_VALUE("--cdrom"))
         {
             enmOptType = OptType_VMRunner;
-/** @todo r=bird: this isn't correct. Must use QString instead of QUuid to store this! */
-            ASSIGN_OPT_VALUE_TO_QUUID(m_uDvdImage);
+            ASSIGN_OPT_VALUE_TO_QSTRING(m_strDvdImage);
         }
         /* VMM Options: */
@@ -574 +564 @@
 #undef MATCH_OPT_WITH_VALUE
 #undef ASSIGN_OPT_VALUE_TO_QSTRING
-#undef ASSIGN_OPT_VALUE_TO_QUUID
 
     if (uiType() == UIType_RuntimeUI && startVM)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -178 +178 @@
 
         /** Returns the --fda option value (whether we have floppy image). */
-        bool hasFloppyImageToMount() const { return !m_uFloppyImage.isNull(); }
+        bool hasFloppyImageToMount() const { return !m_strFloppyImage.isEmpty(); }
         /** Returns the --dvd | --cdrom option value (whether we have DVD image). */
-        bool hasDvdImageToMount() const { return !m_uDvdImage.isNull(); }
+        bool hasDvdImageToMount() const { return !m_strDvdImage.isEmpty(); }
         /** Returns floppy image name. */
-        QUuid getFloppyImage() const { return m_uFloppyImage; }
+        QString getFloppyImage() const { return m_strFloppyImage; }
         /** Returns DVD image name. */
-        QUuid getDvdImage() const { return m_uDvdImage; }
+        QString getDvdImage() const { return m_strDvdImage; }
 
         /** Returns the --execute-all-in-iem option value. */
@@ -414 +414 @@
 
         /** Holds the --fda option value (floppy image). */
-        QUuid  m_uFloppyImage;
+        QString  m_strFloppyImage;
         /** Holds the --dvd | --cdrom option value (DVD image). */
-        QUuid  m_uDvdImage;
+        QString  m_strDvdImage;
 
         /** Holds the --execute-all-in-iem option value. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -176 +176 @@
     /* Apply ad-hoc reconfigurations from the command line: */
     if (uiCommon().hasFloppyImageToMount())
-        mountAdHocImage(KDeviceType_Floppy, UIMediumDeviceType_Floppy, uiCommon().getFloppyImage().toString());
+        mountAdHocImage(KDeviceType_Floppy, UIMediumDeviceType_Floppy, uiCommon().getFloppyImage());
     if (uiCommon().hasDvdImageToMount())
-        mountAdHocImage(KDeviceType_DVD, UIMediumDeviceType_DVD, uiCommon().getDvdImage().toString());
+        mountAdHocImage(KDeviceType_DVD, UIMediumDeviceType_DVD, uiCommon().getDvdImage());
 
     /* Power UP if this is NOT separate process: */