Changeset 24346 in vbox for trunk/src/VBox

Timestamp:

Nov 4, 2009 5:04:00 PM (15 years ago)

Author:

vboxsync

Message:

SystemProperties: function GetDeviceTypesForStorageBus() to get the supported device type for given storagebus

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageStorageController.cpp (modified) (4 diffs)
• Main/SystemPropertiesImpl.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/SystemPropertiesImpl.h (modified) (1 diff)

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

@@ -73 +73 @@
     ComPtr<IMachine> machine;
     ComPtr<IStorageController> storageCtl;
+    ComPtr<ISystemProperties> systemProperties;
 
     if (a->argc < 9)
@@ -153 +154 @@
     }
 
+    /* get the virtualbox system properties */
+    CHECK_ERROR_RET(a->virtualBox, COMGETTER(SystemProperties)(systemProperties.asOutParam()), 1);
+
     /* try to find the given machine */
     if (!Guid(machineuuid).isEmpty())
@@ -238 +242 @@
             StorageBus_T storageBus = StorageBus_Null;
             DeviceType_T deviceType = DeviceType_Null;
-
+            com::SafeArray <DeviceType_T> saDeviceTypes;
+            ULONG driveCheck = 0;
+
+            /* check if the device type is supported by the controller */
             CHECK_ERROR(storageCtl, COMGETTER(Bus)(&storageBus));
+            CHECK_ERROR(systemProperties, GetDeviceTypesForStorageBus(storageBus, ComSafeArrayAsOutParam(saDeviceTypes)));
+            for (size_t i = 0; i < saDeviceTypes.size(); ++ i)
+            {
+                if (   (saDeviceTypes[i] == DeviceType_DVD)
+                    || (saDeviceTypes[i] == DeviceType_Floppy))
+                    driveCheck++;
+            }
+
+            if (!driveCheck)
+            {
+                errorArgument("The Attachment is not supported by the Storage Controller: '%s'", pszCtl);
+                goto leave;
+            }
 
             if (storageBus == StorageBus_Floppy)
@@ -337 +357 @@
         }
 
+        /* check if the device type is supported by the controller */
+        {
+            ULONG storageBus = StorageBus_Null;
+            com::SafeArray <DeviceType_T> saDeviceTypes;
+
+            CHECK_ERROR(storageCtl, COMGETTER(Bus)(&storageBus));
+            CHECK_ERROR(systemProperties, GetDeviceTypesForStorageBus(storageBus, ComSafeArrayAsOutParam(saDeviceTypes)));
+            if (SUCCEEDED(rc))
+            {
+                ULONG driveCheck = 0;
+                for (size_t i = 0; i < saDeviceTypes.size(); ++ i)
+                {
+                    if (   !RTStrICmp(pszType, "dvddrive")
+                        && (saDeviceTypes[i] == DeviceType_DVD))
+                        driveCheck++;
+
+                    if (   !RTStrICmp(pszType, "hdd")
+                        && (saDeviceTypes[i] == DeviceType_HardDisk))
+                        driveCheck++;
+
+                    if (   !RTStrICmp(pszType, "fdd")
+                        && (saDeviceTypes[i] == DeviceType_Floppy))
+                        driveCheck++;
+                }
+                if (!driveCheck)
+                {
+                    errorArgument("The Attachment is not supported by the Storage Controller: '%s'", pszCtl);
+                    goto leave;
+                }
+            }
+            else
+                goto leave;
+        }
+
         if (!RTStrICmp(pszType, "dvddrive"))
         {

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -495 +495 @@
 }
 
+STDMETHODIMP SystemProperties::GetDeviceTypesForStorageBus(StorageBus_T aBus,
+                                 ComSafeArrayOut(DeviceType_T, aDeviceTypes))
+{
+    CheckComArgOutSafeArrayPointerValid(aDeviceTypes);
+
+    AutoCaller autoCaller(this);
+    CheckComRCReturnRC(autoCaller.rc());
+
+    /* no need to lock, this is const */
+    switch (aBus)
+    {
+        case StorageBus_SATA:
+        case StorageBus_IDE:
+        {
+            com::SafeArray<DeviceType_T> saDeviceTypes(2);
+            saDeviceTypes[0] = DeviceType_DVD;
+            saDeviceTypes[1] = DeviceType_HardDisk;
+            saDeviceTypes.detachTo(ComSafeArrayOutArg(aDeviceTypes));
+            break;
+        }
+        case StorageBus_SCSI:
+        {
+            com::SafeArray<DeviceType_T> saDeviceTypes(1);
+            saDeviceTypes[0] = DeviceType_HardDisk;
+            saDeviceTypes.detachTo(ComSafeArrayOutArg(aDeviceTypes));
+            break;
+        }
+        case StorageBus_Floppy:
+        {
+            com::SafeArray<DeviceType_T> saDeviceTypes(1);
+            saDeviceTypes[0] = DeviceType_Floppy;
+            saDeviceTypes.detachTo(ComSafeArrayOutArg(aDeviceTypes));
+            break;
+        }
+        default:
+            AssertMsgFailed(("Invalid bus type %d\n", aBus));
+    }
+
+    return S_OK;
+}
+
 STDMETHODIMP SystemProperties::COMGETTER(DefaultMachineFolder) (BSTR *aDefaultMachineFolder)
 {

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

@@ -7587 +7587 @@
      name="ISystemProperties"
      extends="$unknown"
-     uuid="4b78105a-d066-4eab-ae48-ccb2c0ba5057"
+     uuid="8030645c-8fef-4320-bb7b-c829f00069dc"
      wsmap="managed"
      >
@@ -7902 +7902 @@
       <param name="maxInstances" type="unsigned long" dir="return">
         <desc>The maximum number of instances for the given storage bus.</desc>
+      </param>
+    </method>
+
+    <method name="getDeviceTypesForStorageBus">
+      <desc>Returns list of all the supported device types
+        (<link to="DeviceType"/>) for the given type of storage
+        bus.</desc>
+
+      <param name="bus" type="StorageBus" dir="in">
+        <desc>The storage bus type to get the value for.</desc>
+      </param>
+
+      <param name="deviceTypes" type="DeviceType" safearray="yes" dir="return">
+        <desc>The list of all supported device types for the given storage bus.</desc>
       </param>
     </method>

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

@@ -99 +99 @@
     STDMETHOD(GetMaxPortCountForStorageBus) (StorageBus_T aBus, ULONG *aMaxPortCount);
     STDMETHOD(GetMaxInstancesOfStorageBus)(StorageBus_T aBus, ULONG *aMaxInstances);
+    STDMETHOD(GetDeviceTypesForStorageBus)(StorageBus_T aBus, ComSafeArrayOut(DeviceType_T, aDeviceTypes));
 
     // public methods only for internal purposes