Changeset 23823 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 16, 2009 2:15:04 PM (16 years ago)

Author:

vboxsync

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

53579

Message:

API/Medium: new attribute to get the kind of medium (dvd/floppy/hard disk), plus error message fixes to use the right terminology.

Location:

trunk/src/VBox/Main

Files:

• MediumImpl.cpp (modified) (10 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)
• include/MediumImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1434 +1434 @@
 }
 
+STDMETHODIMP Medium::COMGETTER(DeviceType)(DeviceType_T *aDeviceType)
+{
+    CheckComArgOutPointerValid(aDeviceType);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    AutoReadLock alock(this);
+
+    *aDeviceType = m->devType;
+
+    return S_OK;
+}
+
 STDMETHODIMP Medium::COMGETTER(HostDrive)(BOOL *aHostDrive)
 {
@@ -3344 +3358 @@
  * and assign to this medium, and <ext> is the default extension for this
  * medium's storage format. Note that this procedure requires the media state to
- * be NotCreated and will return a faiulre otherwise.
+ * be NotCreated and will return a failure otherwise.
  *
  * @param aLocation Location of the storage unit. If the location is a FS-path,
@@ -3368 +3382 @@
                  E_FAIL);
 
-    /* are we dealing with a new hard disk constructed using the existing
+    /* are we dealing with a new medium constructed using the existing
      * location? */
     bool isImport = m->format.isNull();
@@ -3419 +3433 @@
         if (RT_FAILURE(vrc))
             return setError(VBOX_E_FILE_ERROR,
-                            tr("Invalid hard disk storage file location '%s' (%Rrc)"),
+                            tr("Invalid medium storage file location '%s' (%Rrc)"),
                             location.raw(), vrc);
 
@@ -3449 +3463 @@
                 if (vrc == VERR_FILE_NOT_FOUND || vrc == VERR_PATH_NOT_FOUND)
                     return setError(VBOX_E_FILE_ERROR,
-                                    tr("Could not find file for the hard disk '%s' (%Rrc)"),
+                                    tr("Could not find file for the medium '%s' (%Rrc)"),
                                     locationFull.raw(), vrc);
                 else if (aFormat.isEmpty())
                     return setError(VBOX_E_IPRT_ERROR,
-                                    tr("Could not get the storage format of the hard disk '%s' (%Rrc)"),
+                                    tr("Could not get the storage format of the medium '%s' (%Rrc)"),
                                     locationFull.raw(), vrc);
                 else
@@ -3592 +3606 @@
         }
 
-        /* are we dealing with a new hard disk constructed using the existing
+        /* are we dealing with a new medium constructed using the existing
          * location? */
         bool isImport = m->id.isEmpty();
@@ -3605 +3619 @@
 
             /* Note that we don't use VD_OPEN_FLAGS_READONLY when opening new
-             * hard disks because that would prevent necessary modifications
-             * when opening hard disks of some third-party formats for the first
+             * media because that would prevent necessary modifications
+             * when opening media of some third-party formats for the first
              * time in VirtualBox (such as VMDK for which VDOpen() needs to
              * generate an UUID if it is missing) */
@@ -3623 +3637 @@
             if (RT_FAILURE(vrc))
             {
-                lastAccessError = Utf8StrFmt(tr("Could not open the hard disk '%ls'%s"),
+                lastAccessError = Utf8StrFmt(tr("Could not open the medium '%ls'%s"),
                                              m->locationFull.raw(), vdError(vrc).raw());
                 throw S_OK;
@@ -3667 +3681 @@
                     {
                         lastAccessError = Utf8StrFmt(
-                            tr("UUID {%RTuuid} of the hard disk '%ls' does not match the value {%RTuuid} stored in the media registry ('%ls')"),
+                            tr("UUID {%RTuuid} of the medium '%ls' does not match the value {%RTuuid} stored in the media registry ('%ls')"),
                             &uuid, m->locationFull.raw(), m->id.raw(),
                             mVirtualBox->settingsFilePath().raw());
@@ -3679 +3693 @@
                  * underlying storage so use what we store in XML */
 
-                /* generate an UUID for an imported UUID-less hard disk */
+                /* generate an UUID for an imported UUID-less medium */
                 if (isImport)
                 {

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

@@ -8477 +8477 @@
   <interface
     name="IMedium" extends="$unknown"
-    uuid="62551115-83b8-4d20-925f-79e9d3c00f96"
+    uuid="ad3cdc5b-28ce-4390-8273-ca2068a217c5"
     wsmap="managed"
   >
@@ -8919 +8919 @@
         given type and format.
       </desc>
+    </attribute>
+
+    <attribute name="deviceType" type="DeviceType" readonly="yes">
+      <desc>Kind of device (DVD/Floppy/HardDisk) which is applicable to this
+        medium.</desc>
     </attribute>
 

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

@@ -105 +105 @@
     STDMETHOD(COMSETTER(Location))(IN_BSTR aLocation);
     STDMETHOD(COMGETTER(Name))(BSTR *aName);
+    STDMETHOD(COMGETTER(DeviceType))(DeviceType_T *aDeviceType);
     STDMETHOD(COMGETTER(HostDrive))(BOOL *aHostDrive);
     STDMETHOD(COMGETTER(Size))(ULONG64 *aSize);