Changeset 24346 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

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

Author:

vboxsync

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

54368

Message:

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

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (modified) (4 diffs)

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