Changeset 98805 in vbox

Timestamp:

Mar 1, 2023 3:36:26 PM (21 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Storage stuff related to boot dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIBootFailureDialog.cpp (modified) (2 diffs)
• UIBootFailureDialog.h (modified) (3 diffs)
• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (1 diff)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (1 diff)

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

@@ -53 +53 @@
 #include "CStorageController.h"
 
-UIBootFailureDialog::UIBootFailureDialog(QWidget *pParent, const CMachine &comMachine)
-    :QIWithRetranslateUI<QIMainDialog>(pParent)
+UIBootFailureDialog::UIBootFailureDialog(QWidget *pParent)
+    : QIWithRetranslateUI<QIMainDialog>(pParent)
     , m_pParent(pParent)
     , m_pCentralWidget(0)
@@ -66 +66 @@
     , m_pIconLabel(0)
     , m_pSuppressDialogCheckBox(0)
-    , m_comMachine(comMachine)
 {
     configure();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIBootFailureDialog.h

@@ -47 +47 @@
 class UIFilePathSelector;
 
-/* COM includes: */
-#include "COMEnums.h"
-#include "CMachine.h"
-
 /** QIDialog extension providing GUI with a dialog to select an existing medium. */
 class UIBootFailureDialog : public QIWithRetranslateUI<QIMainDialog>
@@ -68 +64 @@
     };
 
-    UIBootFailureDialog(QWidget *pParent, const CMachine &comMachine);
+    UIBootFailureDialog(QWidget *pParent);
     ~UIBootFailureDialog();
     QString bootMediumPath() const;
@@ -115 +111 @@
     QLabel               *m_pIconLabel;
     QCheckBox            *m_pSuppressDialogCheckBox;
-    CMachine              m_comMachine;
 };
 

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

@@ -3032 +3032 @@
 void UIMachineLogic::showBootFailureDialog()
 {
-    UIBootFailureDialog *pBootFailureDialog = new UIBootFailureDialog(activeMachineWindow(), machine());
+    UIBootFailureDialog *pBootFailureDialog = new UIBootFailureDialog(activeMachineWindow());
     AssertPtrReturnVoid(pBootFailureDialog);
 
@@ -3042 +3042 @@
     QFileInfo bootMediumFileInfo(strISOPath);
     if (bootMediumFileInfo.exists() && bootMediumFileInfo.isReadable())
-        mountBootMedium(uiCommon().openMedium(UIMediumDeviceType_DVD, strISOPath));
+        uimachine()->mountBootMedium(uiCommon().openMedium(UIMediumDeviceType_DVD, strISOPath));
 
     if (iResult == static_cast<int>(UIBootFailureDialog::ReturnCode_Reset))
         reset(false);
-}
-
-bool UIMachineLogic::mountBootMedium(const QUuid &uMediumId)
-{
-    AssertReturn(!uMediumId.isNull(), false);
-
-    CVirtualBox comVBox = uiCommon().virtualBox();
-    CMachine &comMachine = machine();
-    const CGuestOSType &comOsType = comVBox.GetGuestOSType(comMachine.GetOSTypeId());
-    /* Get recommended controller bus & type: */
-    const KStorageBus enmRecommendedDvdBus = comOsType.GetRecommendedDVDStorageBus();
-    const KStorageControllerType enmRecommendedDvdType = comOsType.GetRecommendedDVDStorageController();
-
-    CMediumAttachment comAttachment;
-    /* Search for an attachment of required bus & type: */
-    foreach (const CMediumAttachment &comCurrentAttachment, comMachine.GetMediumAttachments())
-    {
-        /* Determine current attachment's controller: */
-        const CStorageController &comCurrentController = comMachine.GetStorageControllerByName(comCurrentAttachment.GetController());
-
-        if (   comCurrentController.GetBus() == enmRecommendedDvdBus
-            && comCurrentController.GetControllerType() == enmRecommendedDvdType
-            && comCurrentAttachment.GetType() == KDeviceType_DVD)
-        {
-            comAttachment = comCurrentAttachment;
-            break;
-        }
-    }
-    AssertMsgReturn(!comAttachment.isNull(), ("Storage Controller is NOT properly configured!\n"), false);
-
-    const UIMedium guiMedium = uiCommon().medium(uMediumId);
-    const CMedium comMedium = guiMedium.medium();
-
-    /* Mount medium to the predefined port/device: */
-    comMachine.MountMedium(comAttachment.GetController(), comAttachment.GetPort(), comAttachment.GetDevice(), comMedium, false /* force */);
-    bool fSuccess = comMachine.isOk();
-
-    QWidget *pParent = windowManager().realParentWindow(activeMachineWindow());
-
-    /* Show error message if necessary: */
-    if (!fSuccess)
-        msgCenter().cannotRemountMedium(comMachine, guiMedium, true /* mount? */, false /* retry? */, pParent);
-    else
-        fSuccess = uimachine()->saveSettings();
-    return fSuccess;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -376 +376 @@
     /* Shows the boot failure dialog through which user can mount a boot DVD and reset the vm. */
     void showBootFailureDialog();
-    /** Attempts to mount medium with @p uMediumId to the machine if it can find an appropriate controller and port. */
-    bool mountBootMedium(const QUuid &uMediumId);
     /** Resets the machine. If @p fShowConfirmation is true then a confirmation messag box is shown first. */
     void reset(bool fShowConfirmation);

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

@@ -50 +50 @@
 #include "UIMedium.h"
 #include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
 #include "UIMousePointerShapeData.h"
 #include "UINotificationCenter.h"
@@ -709 +710 @@
 }
 
+bool UISession::mountBootMedium(const QUuid &uMediumId)
+{
+    AssertReturn(!uMediumId.isNull(), false);
+
+    /* Get recommended controller bus & type: */
+    CVirtualBox comVBox = uiCommon().virtualBox();
+    const CGuestOSType comOsType = comVBox.GetGuestOSType(osTypeId());
+    if (!comVBox.isOk())
+    {
+        UINotificationMessage::cannotAcquireVirtualBoxParameter(comVBox);
+        return false;
+    }
+    const KStorageBus enmRecommendedDvdBus = comOsType.GetRecommendedDVDStorageBus();
+    if (!comOsType.isOk())
+    {
+        UINotificationMessage::cannotAcquireGuestOSTypeParameter(comOsType);
+        return false;
+    }
+    const KStorageControllerType enmRecommendedDvdType = comOsType.GetRecommendedDVDStorageController();
+    if (!comOsType.isOk())
+    {
+        UINotificationMessage::cannotAcquireGuestOSTypeParameter(comOsType);
+        return false;
+    }
+
+    /* Search for an attachment of required bus & type: */
+    CMachine comMachine = machine();
+    CMediumAttachmentVector comMediumAttachments = comMachine.GetMediumAttachments();
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        CMediumAttachment comChosenAttachment;
+        QString strChosenControllerName;
+        LONG iChosenAttachmentPort = 0;
+        LONG iChosenAttachmentDevice = 0;
+        foreach (const CMediumAttachment &comAttachment, comMediumAttachments)
+        {
+            /* Get attachment type: */
+            const KDeviceType enmCurrentDeviceType = comAttachment.GetType();
+            fSuccess = comAttachment.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireMediumAttachmentParameter(comAttachment);
+                break;
+            }
+            /* And make sure it's DVD: */
+            if (enmCurrentDeviceType != KDeviceType_DVD)
+                continue;
+
+            /* Get controller name: */
+            const QString strControllerName = comAttachment.GetController();
+            fSuccess = comAttachment.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireMediumAttachmentParameter(comAttachment);
+                break;
+            }
+            /* And look for corresponding controller: */
+            const CStorageController comCurrentController = comMachine.GetStorageControllerByName(strControllerName);
+            fSuccess = comMachine.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+                break;
+            }
+
+            /* Get current controller bus: */
+            const KStorageBus enmCurrentBus = comCurrentController.GetBus();
+            fSuccess = comCurrentController.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireStorageControllerParameter(comCurrentController);
+                break;
+            }
+            /* Get current controller type: */
+            const KStorageControllerType enmCurrentType = comCurrentController.GetControllerType();
+            fSuccess = comCurrentController.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireStorageControllerParameter(comCurrentController);
+                break;
+            }
+            /* And check if they are suitable: */
+            if (   enmCurrentBus != enmRecommendedDvdBus
+                || enmCurrentType != enmRecommendedDvdType)
+                continue;
+
+            /* Get current attachment port: */
+            iChosenAttachmentPort = comAttachment.GetPort();
+            fSuccess = comAttachment.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireMediumAttachmentParameter(comAttachment);
+                break;
+            }
+            /* Get current attachment device: */
+            iChosenAttachmentDevice = comAttachment.GetDevice();
+            fSuccess = comAttachment.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireMediumAttachmentParameter(comAttachment);
+                break;
+            }
+
+            /* Everything is nice it seems: */
+            comChosenAttachment = comAttachment;
+            strChosenControllerName = strControllerName;
+            break;
+        }
+        AssertMsgReturn(!comChosenAttachment.isNull(), ("Storage Controller is NOT properly configured!\n"), false);
+
+        /* Get medium to mount: */
+        const UIMedium guiMedium = uiCommon().medium(uMediumId);
+        const CMedium comMedium = guiMedium.medium();
+
+        /* Mount medium to the predefined port/device: */
+        comMachine.MountMedium(strChosenControllerName,
+                               iChosenAttachmentPort, iChosenAttachmentDevice,
+                               comMedium, false /* force */);
+        fSuccess = comMachine.isOk();
+        if (!fSuccess)
+        {
+            QWidget *pParent = windowManager().realParentWindow(activeMachineWindow());
+            msgCenter().cannotRemountMedium(machine(), guiMedium, true /* mount? */, false /* retry? */, pParent);
+        }
+        else
+            fSuccess = saveSettings();
+    }
+
+    return fSuccess;
+}
+
 bool UISession::usbDevices(QList<USBDeviceInfo> &guiUSBDevices)
 {

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

@@ -334 +334 @@
         /** Calculates @a cAmount of immutable images. */
         bool acquireAmountOfImmutableImages(ulong &cAmount);
+
+        /** Attempts to mount medium with @p uMediumId to the machine
+          * if it can find an appropriate controller and port. */
+        bool mountBootMedium(const QUuid &uMediumId);
     /** @} */