Changeset 37695 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jun 29, 2011 6:53:37 PM (14 years ago)

Author:

vboxsync

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

72555

Message:

Main/MediumAttachment+Machine: maintain a flag whether the medium was ejected, and add a method to query this information

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (1 diff)
• MediumAttachmentImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -11691 +11691 @@
 
         pAttach->updateMedium(NULL);
+        pAttach->updateEjected();
 
         pAttach.queryInterfaceTo(aNewAttachment);

trunk/src/VBox/Main/src-server/MediumAttachmentImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -62 +62 @@
 {
     Data()
-        : pMachine(NULL)
+        : pMachine(NULL),
+          fIsEjected(false)
     { }
 
@@ -68 +69 @@
     Machine * const pMachine;
     /* later: const ComObjPtr<MediumAttachment> mPeer; */
+
+    bool                fIsEjected;
 
     Backupable<BackupableMediumAttachmentData> bd;
@@ -279 +282 @@
 }
 
+STDMETHODIMP MediumAttachment::COMGETTER(IsEjected)(BOOL *aEjected)
+{
+    LogFlowThisFuncEnter();
+
+    CheckComArgOutPointerValid(aEjected);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock lock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aEjected = m->fIsEjected;
+
+    LogFlowThisFuncLeave();
+    return S_OK;
+}
+
 STDMETHODIMP MediumAttachment::COMGETTER(BandwidthGroup) (IBandwidthGroup **aBwGroup)
 {
@@ -406 +426 @@
     m->bd->pMedium = aMedium;
     m->bd->fImplicit = false;
+    m->fIsEjected = false;
 }
 
@@ -417 +438 @@
 }
 
+/** Must be called from under this object's write lock. */
+void MediumAttachment::updateEjected()
+{
+    Assert(isWriteLockOnCurrentThread());
+
+    m->fIsEjected = true;
+}
+
 void MediumAttachment::updateBandwidthGroup(const Utf8Str &aBandwidthGroup)
 {