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

Timestamp:

Jun 27, 2018 3:27:32 PM (7 years ago)

Author:

vboxsync

Message:

Main/Medium: Fix a number of potential deadlocks due to lock order violation. Several are still present and need to be fixed later.

File:

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

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

@@ -230 +230 @@
     // wrapped IMedium properties
     HRESULT getId(com::Guid &aId);
-    HRESULT getDescription(com::Utf8Str &aDescription);
-    HRESULT setDescription(const com::Utf8Str &aDescription);
+    HRESULT getDescription(AutoCaller &autoCaller, com::Utf8Str &aDescription);
+    HRESULT setDescription(AutoCaller &autoCaller, const com::Utf8Str &aDescription);
     HRESULT getState(MediumState_T *aState);
     HRESULT getVariant(std::vector<MediumVariant_T> &aVariant);
@@ -293 +293 @@
                         const std::vector<MediumVariant_T> &aVariant,
                         ComPtr<IProgress> &aProgress);
-    HRESULT setLocation(const com::Utf8Str &aLocation,
+    HRESULT setLocation(AutoCaller &autoCaller,
+                        const com::Utf8Str &aLocation,
                         ComPtr<IProgress> &aProgress);
     HRESULT compact(ComPtr<IProgress> &aProgress);
@@ -302 +303 @@
                              const com::Utf8Str &aNewPassword, const com::Utf8Str &aNewPasswordId,
                              ComPtr<IProgress> &aProgress);
-    HRESULT getEncryptionSettings(com::Utf8Str &aCipher, com::Utf8Str &aPasswordId);
+    HRESULT getEncryptionSettings(AutoCaller &autoCaller, com::Utf8Str &aCipher, com::Utf8Str &aPasswordId);
     HRESULT checkEncryptionPassword(const com::Utf8Str &aPassword);