Changeset 98787 in vbox

Timestamp:

Feb 28, 2023 3:58:27 PM (2 years ago)

Author:

vboxsync

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

156098

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CMachine wrapper usage step-by-step; Remaining stuff for disk encryption logic.

Location:

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

Files:

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

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

@@ -744 +744 @@
 {
     return uisession()->storageDevices(enmDeviceType, guiStorageDevices);
+}
+
+bool UIMachine::acquireEncryptedMedia(EncryptedMediumMap &media)
+{
+    return uisession()->acquireEncryptedMedia(media);
 }
 

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

@@ -37 +37 @@
 
 /* GUI includes: */
+#include "UIAddDiskEncryptionPasswordDialog.h"
 #include "UIExtraDataDefs.h"
 #include "UIMachineDefs.h"
@@ -513 +514 @@
         bool storageDevices(KDeviceType enmDeviceType, QList<StorageDeviceInfo> &guiStorageDevices);
 
+        /** Acquires encrypted media map. */
+        bool acquireEncryptedMedia(EncryptedMediumMap &media);
         /** Adds encryption password. */
         bool addEncryptionPassword(const QString &strId, const QString &strPassword, bool fClearOnSuspend);

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

@@ -2914 +2914 @@
     /* Prepare the map of the encrypted media: */
     EncryptedMediumMap encryptedMedia;
-    foreach (const CMediumAttachment &attachment, machine().GetMediumAttachments())
-    {
-        /* Acquire hard-drive attachments only: */
-        if (attachment.GetType() == KDeviceType_HardDisk)
-        {
-            /* Get the attachment medium base: */
-            const CMedium medium = attachment.GetMedium();
-            /* Update the map with this medium if it's encrypted: */
-            QString strCipher;
-            const QString strPasswordId = medium.GetEncryptionSettings(strCipher);
-            if (medium.isOk())
-                encryptedMedia.insert(strPasswordId, medium.GetId());
-        }
-    }
+    if (!uimachine()->acquireEncryptedMedia(encryptedMedia))
+        return;
 
     /* Ask for the disk encryption passwords if necessary: */

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

@@ -638 +638 @@
 }
 
+bool UISession::acquireEncryptedMedia(EncryptedMediumMap &media)
+{
+    EncryptedMediumMap encryptedMedia;
+    CMachine comMachine = machine();
+    const CMediumAttachmentVector comAttachments = comMachine.GetMediumAttachments();
+    bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+    {
+        foreach (const CMediumAttachment &comAttachment, comAttachments)
+        {
+            const KDeviceType enmType = comAttachment.GetType();
+            fSuccess = comAttachment.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireMediumAttachmentParameter(comAttachment);
+                break;
+            }
+
+            /* Look for hard-drive attachments only: */
+            if (enmType != KDeviceType_HardDisk)
+                continue;
+
+            /* Get the attachment medium: */
+            const CMedium comMedium = comAttachment.GetMedium();
+            fSuccess = comAttachment.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireMediumAttachmentParameter(comAttachment);
+                break;
+            }
+
+            /* Get the medium ID: */
+            const QUuid uId = comMedium.GetId();
+            fSuccess = comMedium.isOk();
+            if (!fSuccess)
+            {
+                UINotificationMessage::cannotAcquireMediumParameter(comMedium);
+                break;
+            }
+
+            /* Update the map with this medium if it's encrypted: */
+            QString strCipher;
+            const QString strPasswordId = comMedium.GetEncryptionSettings(strCipher);
+            if (comMedium.isOk()) // GetEncryptionSettings failure is a valid case
+                encryptedMedia.insert(strPasswordId, uId);
+        }
+    }
+
+    if (fSuccess)
+        media = encryptedMedia;
+    return fSuccess;
+}
+
 bool UISession::addEncryptionPassword(const QString &strId, const QString &strPassword, bool fClearOnSuspend)
 {

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

@@ -39 +39 @@
 
 /* GUI includes: */
+#include "UIAddDiskEncryptionPasswordDialog.h"
 #include "UIExtraDataDefs.h"
 #include "UIMachineDefs.h"
@@ -326 +327 @@
         bool storageDevices(KDeviceType enmDeviceType, QList<StorageDeviceInfo> &guiStorageDevices);
 
+        /** Acquires encrypted media map. */
+        bool acquireEncryptedMedia(EncryptedMediumMap &media);
         /** Adds encryption password. */
         bool addEncryptionPassword(const QString &strId, const QString &strPassword, bool fClearOnSuspend);