Changeset 49647 in vbox

Timestamp:

Nov 25, 2013 6:48:56 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Medium enumeration mechanism: Full update for every (cached and actual) medium related to particular VM on snapshot delete operation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumEnumerator.cpp (modified) (3 diffs)
• UIMediumEnumerator.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -71 +71 @@
     connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QString)), this, SLOT(sltHandleMachineUpdate(QString)));
     connect(gVBoxEvents, SIGNAL(sigSnapshotTake(QString, QString)), this, SLOT(sltHandleMachineUpdate(QString)));
-    connect(gVBoxEvents, SIGNAL(sigSnapshotDelete(QString, QString)), this, SLOT(sltHandleMachineUpdate(QString)));
+    connect(gVBoxEvents, SIGNAL(sigSnapshotDelete(QString, QString)), this, SLOT(sltHandleSnapshotDeleted(QString, QString)));
     connect(gVBoxEvents, SIGNAL(sigSnapshotChange(QString, QString)), this, SLOT(sltHandleMachineUpdate(QString)));
     connect(gVBoxEvents, SIGNAL(sigMachineRegistered(QString, bool)), this, SLOT(sltHandleMachineRegistration(QString, bool)));
@@ -177 +177 @@
     /* Gather previously used UIMedium IDs: */
     QStringList previousUIMediumIDs;
-    calculateCachedUsage(strMachineID, previousUIMediumIDs, true);
+    calculateCachedUsage(strMachineID, previousUIMediumIDs, true /* take into account current state only */);
     LogRel(("UIMediumEnumerator:  Old usage: %s\n",
             previousUIMediumIDs.isEmpty() ? "<empty>" : previousUIMediumIDs.join(", ").toAscii().constData()));
@@ -243 +243 @@
             fRegistered ? "registration" : "unregistration",
             strMachineID.toAscii().constData()));
+}
+
+void UIMediumEnumerator::sltHandleSnapshotDeleted(QString strMachineID, QString strSnapshotID)
+{
+    LogRel(("UIMediumEnumerator: Snapshot-deleted event received, Machine ID = {%s}, Snapshot ID = {%s}\n",
+            strMachineID.toAscii().constData(), strSnapshotID.toAscii().constData()));
+
+    /* Gather previously used UIMedium IDs: */
+    QStringList previousUIMediumIDs;
+    calculateCachedUsage(strMachineID, previousUIMediumIDs, false /* take into account current state only */);
+    LogRel(("UIMediumEnumerator:  Old usage: %s\n",
+            previousUIMediumIDs.isEmpty() ? "<empty>" : previousUIMediumIDs.join(", ").toAscii().constData()));
+
+    /* Gather currently used CMediums and their IDs: */
+    CMediumMap currentCMediums;
+    QStringList currentCMediumIDs;
+    calculateActualUsage(strMachineID, currentCMediums, currentCMediumIDs);
+    LogRel(("UIMediumEnumerator:  New usage: %s\n",
+            currentCMediumIDs.isEmpty() ? "<empty>" : currentCMediumIDs.join(", ").toAscii().constData()));
+
+    /* Update everything: */
+    recacheFromCachedUsage(previousUIMediumIDs);
+    recacheFromActualUsage(currentCMediums, currentCMediumIDs);
+
+    LogRel(("UIMediumEnumerator: Snapshot-deleted event processed, Machine ID = {%s}, Snapshot ID = {%s}\n",
+            strMachineID.toAscii().constData(), strSnapshotID.toAscii().constData()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

@@ -70 +70 @@
     /** Handles machine-[un]registration events. */
     void sltHandleMachineRegistration(QString strMachineID, bool fRegistered);
+    /** Handles snapshot-deleted events. */
+    void sltHandleSnapshotDeleted(QString strMachineID, QString strSnapshotID);
 
     /* Handler: Medium-enumeration stuff: */