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

Timestamp:

Nov 19, 2012 7:07:10 PM (12 years ago)

Author:

vboxsync

Message:

Main/Machine+Snapshot+Medium: fix cancelling snapshots, used to trigger both backref inconsistency and incorrect lock list/map updates which could cause runtime misbehavior, the config file was already made consistent with the previous changes

File:

• trunk/src/VBox/Main/include/MachineImpl.h (modified) (3 diffs)

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

@@ -1065 +1065 @@
     STDMETHOD(PushGuestProperty)(IN_BSTR aName, IN_BSTR aValue,
                                   LONG64 aTimestamp, IN_BSTR aFlags);
-    STDMETHOD(LockMedia)()   { return lockMedia(); }
-    STDMETHOD(UnlockMedia)() { unlockMedia(); return S_OK; }
+    STDMETHOD(LockMedia)();
+    STDMETHOD(UnlockMedia)();
     STDMETHOD(EjectMedium)(IMediumAttachment *aAttachment,
                            IMediumAttachment **aNewAttachment);
@@ -1110 +1110 @@
 
     bool hasMatchingUSBFilter(const ComObjPtr<HostUSBDevice> &aDevice, ULONG *aMaskedIfs);
+
+    HRESULT lockMedia();
+    void unlockMedia();
 
 private:
@@ -1178 +1181 @@
                               bool *pfNeedsMachineSaveSettings);
 
-    HRESULT lockMedia();
-    void unlockMedia();
-
     HRESULT setMachineState(MachineState_T aMachineState);
     HRESULT updateMachineStateOnClient();