Changeset 28835 in vbox for trunk/src/VBox/Main/include/ConsoleImpl.h

Timestamp:

Apr 27, 2010 2:46:23 PM (15 years ago)

Author:

vboxsync

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

60753

Message:

Main: live snapshot merging. initially limited to forward merging (i.e. everything but the first snapshot can be deleted)

File:

• trunk/src/VBox/Main/include/ConsoleImpl.h (modified) (4 diffs)

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

@@ -182 +182 @@
     HRESULT setGuestProperty(IN_BSTR aKey, IN_BSTR aValue, IN_BSTR aFlags);
     HRESULT enumerateGuestProperties(IN_BSTR aPatterns, ComSafeArrayOut(BSTR, aNames), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags));
+    HRESULT onlineMergeMedium(IMediumAttachment *aMediumAttachment,
+                              ULONG aSourceIdx, ULONG aTargetIdx,
+                              IMedium *aSource, IMedium *aTarget,
+                              BOOL aMergeForward, IMedium *aParentForTarget,
+                              ComSafeArrayIn(IMedium *, aChildrenToReparent),
+                              IProgress *aProgress);
     VMMDev *getVMMDev() { return mVMMDev; }
     AudioSniffer *getAudioSniffer() { return mAudioSniffer; }
@@ -436 +442 @@
                                       StorageBus_T enmBus,
                                       IoBackendType_T enmIoBackend,
+                                      bool fSetupMerge, unsigned uMergeSource,
+                                      unsigned uMergeTarget,
                                       IMediumAttachment *pMediumAtt,
                                       MachineState_T aMachineState,
@@ -443 +451 @@
     static int configMedium(PCFGMNODE pLunL0, bool fPassthrough,
                             DeviceType_T enmType, IoBackendType_T enmIoBackend,
-                            IMedium *pMedium, MachineState_T aMachineState, HRESULT *phrc);
+                            bool fSetupMerge, unsigned uMergeSource,
+                            unsigned uMergeTarget, IMedium *pMedium,
+                            MachineState_T aMachineState, HRESULT *phrc);
     static DECLCALLBACK(int) reconfigureMediumAttachment(PVM pVM,
                                                          const char *pcszDevice,
@@ -449 +459 @@
                                                          StorageBus_T enmBus,
                                                          IoBackendType_T enmIoBackend,
+                                                         bool fSetupMerge,
+                                                         unsigned uMergeSource,
+                                                         unsigned uMergeTarget,
                                                          IMediumAttachment *aMediumAtt,
                                                          MachineState_T aMachineState,