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

Timestamp:

Apr 22, 2010 10:16:57 AM (15 years ago)

Author:

vboxsync

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

60417

Message:

Main/Console+Machine+Snapshot+Medium: Start with online snapshot merging. Not complete, as the actual merge operation is missing and thus triggers a controlled failure. Made snapshot deletion retryable, by updating the to-be-deleted snapshot, and only deleting it completely if everything was successful.

Location:

trunk/src/VBox/Main/include

Files:

• MachineImpl.h (modified) (2 diffs)
• MediumImpl.h (modified) (1 diff)
• SnapshotImpl.h (modified) (1 diff)

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

@@ -996 +996 @@
                                         const Guid &machineId,
                                         const Guid &snapshotId,
+                                        bool fOnlineMergePossible,
+                                        MediumLockList *aVMMALockList,
                                         ComObjPtr<Medium> &aSource,
                                         ComObjPtr<Medium> &aTarget,
@@ -1001 +1003 @@
                                         ComObjPtr<Medium> &pParentForTarget,
                                         MediaList &aChildrenToReparent,
+                                        bool &fNeedOnlineMerge,
                                         MediumLockList * &aMediumLockList);
     void cancelDeleteSnapshotMedium(const ComObjPtr<Medium> &aHD,
                                     const ComObjPtr<Medium> &aSource,
-                                    const ComObjPtr<Medium> &aTarget,
                                     const MediaList &aChildrenToReparent,
+                                    bool fNeedsOnlineMerge,
                                     MediumLockList *aMediumLockList,
-                                    const ComObjPtr<MediumAttachment> &aReplaceHda,
+                                    const Guid &aMediumId,
                                     const Guid &aSnapshotId);
 

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

@@ -199 +199 @@
     HRESULT markForDeletion();
     HRESULT unmarkForDeletion();
+    HRESULT markLockedForDeletion();
+    HRESULT unmarkLockedForDeletion();
 
     HRESULT prepareMergeTo(const ComObjPtr<Medium> &pTarget,
                            const Guid *aMachineId,
                            const Guid *aSnapshotId,
+                           bool fLockMedia,
                            bool &fMergeForward,
                            ComObjPtr<Medium> &pParentForTarget,

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

@@ -114 +114 @@
 
     const Utf8Str& stateFilePath() const;
+    HRESULT deleteStateFile();
 
     ULONG getChildrenCount();