Changeset 23394 in vbox for trunk/src/VBox/Main/MediumAttachmentImpl.cpp

Timestamp:

Sep 28, 2009 5:24:04 PM (15 years ago)

Author:

vboxsync

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

52924

Message:

Main/MediumAttachment: cleanup, much more logging, some preparation for settings handling

File:

• trunk/src/VBox/Main/MediumAttachmentImpl.cpp (modified) (26 diffs)

trunk/src/VBox/Main/MediumAttachmentImpl.cpp

@@ -32 +32 @@
 HRESULT MediumAttachment::FinalConstruct()
 {
+    LogFlowThisFunc(("\n"));
     return S_OK;
 }
@@ -37 +38 @@
 void MediumAttachment::FinalRelease()
 {
+    LogFlowThisFuncEnter();
     uninit();
+    LogFlowThisFuncLeave();
 }
 
@@ -46 +49 @@
  * Initializes the medium attachment object.
  *
- * @param aMachine    Machine object.
+ * @param aParent     Machine object.
  * @param aMedium     Medium object.
  * @param aController Controller the hard disk is attached to.
@@ -53 +56 @@
  * @param aImplicit   Wether the attachment contains an implicitly created diff.
  */
-HRESULT MediumAttachment::init(Machine *aMachine,
+HRESULT MediumAttachment::init(Machine *aParent,
                                Medium *aMedium,
                                CBSTR aController,
@@ -61 +64 @@
                                bool aImplicit /*= false*/)
 {
+    LogFlowThisFuncEnter();
+    LogFlowThisFunc(("aParent=%p aMedium=%p aController=%ls aPort=%d aDevice=%d aType=%d aImplicit=%d\n", aParent, aMedium, aController, aPort, aDevice, aType, aImplicit));
+
     if (aType == DeviceType_HardDisk)
         AssertReturn(aMedium, E_INVALIDARG);
@@ -68 +74 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    unconst(mMachine) = aMachine;
+    unconst(mParent) = aParent;
+
     m.allocate();
     m->medium = aMedium;
@@ -82 +89 @@
     autoInitSpan.setSucceeded();
 
+    LogFlowThisFuncLeave();
     return S_OK;
 }
@@ -91 +99 @@
 void MediumAttachment::uninit()
 {
+    LogFlowThisFuncEnter();
+
     /* Enclose the state transition Ready->InUninit->NotReady */
     AutoUninitSpan autoUninitSpan(this);
     if (autoUninitSpan.uninitDone())
         return;
+
+    m.free();
+
+    unconst(mParent).setNull();
+
+    LogFlowThisFuncLeave();
 }
 
@@ -102 +118 @@
 bool MediumAttachment::rollback()
 {
+    LogFlowThisFuncEnter();
+
     /* sanity */
     AutoCaller autoCaller(this);
@@ -118 +136 @@
     }
 
+    LogFlowThisFuncLeave();
     return changed;
 }
@@ -126 +145 @@
 void MediumAttachment::commit()
 {
+    LogFlowThisFuncEnter();
+
     /* sanity */
     AutoCaller autoCaller(this);
@@ -134 +155 @@
     if (m.isBackedUp())
         m.commit();
+
+    LogFlowThisFuncLeave();
 }
 
@@ -142 +165 @@
 STDMETHODIMP MediumAttachment::COMGETTER(Medium)(IMedium **aHardDisk)
 {
+    LogFlowThisFuncEnter();
+
     CheckComArgOutPointerValid(aHardDisk);
 
@@ -151 +176 @@
     m->medium.queryInterfaceTo(aHardDisk);
 
+    LogFlowThisFuncLeave();
     return S_OK;
 }
@@ -156 +182 @@
 STDMETHODIMP MediumAttachment::COMGETTER(Controller)(BSTR *aController)
 {
+    LogFlowThisFuncEnter();
+
     CheckComArgOutPointerValid(aController);
 
@@ -164 +192 @@
     m->controller.cloneTo(aController);
 
+    LogFlowThisFuncLeave();
     return S_OK;
 }
@@ -169 +198 @@
 STDMETHODIMP MediumAttachment::COMGETTER(Port)(LONG *aPort)
 {
+    LogFlowThisFuncEnter();
+
     CheckComArgOutPointerValid(aPort);
 
@@ -177 +208 @@
     *aPort = m->port;
 
+    LogFlowThisFuncLeave();
     return S_OK;
 }
@@ -182 +214 @@
 STDMETHODIMP MediumAttachment::COMGETTER(Device)(LONG *aDevice)
 {
+    LogFlowThisFuncEnter();
+
     CheckComArgOutPointerValid(aDevice);
 
@@ -190 +224 @@
     *aDevice = m->device;
 
+    LogFlowThisFuncLeave();
     return S_OK;
 }
@@ -195 +230 @@
 STDMETHODIMP MediumAttachment::COMGETTER(Type)(DeviceType_T *aType)
 {
+    LogFlowThisFuncEnter();
+
     CheckComArgOutPointerValid(aType);
 
@@ -203 +240 @@
     *aType = m->type;
 
+    LogFlowThisFuncLeave();
     return S_OK;
 }
@@ -208 +246 @@
 STDMETHODIMP MediumAttachment::COMSETTER(Passthrough)(BOOL aPassthrough)
 {
+    LogFlowThisFuncEnter();
+
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
 
     /* the machine need to be mutable */
-    Machine::AutoMutableStateDependency adep(mMachine);
+    Machine::AutoMutableStateDependency adep(mParent);
     CheckComRCReturnRC(adep.rc());
 
@@ -223 +263 @@
     }
 
+    LogFlowThisFuncLeave();
     return S_OK;
 }
@@ -228 +269 @@
 STDMETHODIMP MediumAttachment::COMGETTER(Passthrough)(BOOL *aPassthrough)
 {
+    LogFlowThisFuncEnter();
+
     CheckComArgOutPointerValid(aPassthrough);
 
@@ -236 +279 @@
 
     *aPassthrough = m->passthrough;
-    return S_OK;
-}
-
+
+    LogFlowThisFuncLeave();
+    return S_OK;
+}
+