Changeset 37695 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/MediumAttachmentImpl.h (modified) (3 diffs)
• Main/src-server/MachineImpl.cpp (modified) (1 diff)
• Main/src-server/MediumAttachmentImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -773 +773 @@
             for (ULONG k = 0; k < cDevices; ++ k)
             {
+                ComPtr<IMediumAttachment> mediumAttach;
+                machine->GetMediumAttachment(storageCtlName.raw(),
+                                             i, k,
+                                             mediumAttach.asOutParam());
+                BOOL fIsEjected = FALSE;
+                DeviceType_T devType = DeviceType_Null;
+                if (mediumAttach)
+                {
+                    mediumAttach->COMGETTER(IsEjected)(&fIsEjected);
+                    mediumAttach->COMGETTER(Type)(&devType);
+                }
                 rc = machine->GetMedium(storageCtlName.raw(), i, k,
                                         medium.asOutParam());
                 if (SUCCEEDED(rc) && medium)
                 {
-                    BOOL fPassthrough;
-                    ComPtr<IMediumAttachment> mediumAttach;
-
-                    rc = machine->GetMediumAttachment(storageCtlName.raw(),
-                                                      i, k,
-                                                      mediumAttach.asOutParam());
-                    if (SUCCEEDED(rc) && mediumAttach)
+                    BOOL fPassthrough = FALSE;
+
+                    if (mediumAttach)
                         mediumAttach->COMGETTER(Passthrough)(&fPassthrough);
 
@@ -798 +805 @@
                             RTPrintf("\"%lS-dvdpassthrough\"=\"%s\"\n", storageCtlName.raw(),
                                      fPassthrough ? "on" : "off");
+                        if (devType == DeviceType_DVD)
+                            RTPrintf("\"%lS-IsEjected\"=\"%s\"\n", storageCtlName.raw(),
+                                     fIsEjected ? "on" : "off");
                     }
                     else
@@ -806 +816 @@
                         if (fPassthrough)
                             RTPrintf(" (passthrough enabled)");
+                        if (fIsEjected)
+                            RTPrintf(" (ejected)");
                         RTPrintf("\n");
                     }
@@ -812 +824 @@
                 {
                     if (details == VMINFO_MACHINEREADABLE)
+                    {
                         RTPrintf("\"%lS-%d-%d\"=\"emptydrive\"\n", storageCtlName.raw(), i, k);
-                    else
-                        RTPrintf("%lS (%d, %d): Empty\n", storageCtlName.raw(), i, k);
+                        if (devType == DeviceType_DVD)
+                            RTPrintf("\"%lS-IsEjected\"=\"%s\"\n", storageCtlName.raw(),
+                                     fIsEjected ? "on" : "off");
+                    }
+                    else
+                    {
+                        RTPrintf("%lS (%d, %d): Empty", storageCtlName.raw(), i, k);
+                        if (fIsEjected)
+                            RTPrintf(" (ejected)");
+                        RTPrintf("\n");
+                    }
                 }
                 else

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -9572 +9572 @@
   <interface
     name="IMediumAttachment" extends="$unknown"
-    uuid="aa4b4840-934f-454d-9a28-23e8f4235edf"
+    uuid="8d48f68f-807a-4e4e-9449-827fe9ea8498"
     wsmap="struct"
     >
@@ -9783 +9783 @@
     <attribute name="passthrough" type="boolean" readonly="yes">
       <desc>Pass I/O requests through to a device on the host.</desc>
+    </attribute>
+
+    <attribute name="isEjected" type="boolean" readonly="yes">
+      <desc>Signals that the removable medium has been ejected. This is not
+        necessarily equivalent to having a @c null medium association.</desc>
     </attribute>
 

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

@@ -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
@@ -61 +61 @@
     STDMETHOD(COMGETTER(Type))(DeviceType_T *aType);
     STDMETHOD(COMGETTER(Passthrough))(BOOL *aPassthrough);
+    STDMETHOD(COMGETTER(IsEjected))(BOOL *aIsEjected);
     STDMETHOD(COMGETTER(BandwidthGroup))(IBandwidthGroup **aBwGroup);
 
@@ -89 +90 @@
 
     /** Must be called from under this object's write lock. */
+    void updateEjected();
+
+    /** Must be called from under this object's write lock. */
     void updateBandwidthGroup(const Utf8Str &aBandwidthGroup);
 

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)
 {