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

Timestamp:

Jul 13, 2011 6:34:49 PM (14 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: make --port and --device parameter for storageattach optional if there is only one port or device per port

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (2 diffs)
• VBoxManageStorageController.cpp (modified) (8 diffs)

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

@@ -458 +458 @@
                      "VBoxManage storageattach    <uuid|vmname>\n"
                      "                            --storagectl <name>\n"
-                     "                            --port <number>\n"
+                     "                            [--port <number>]\n"
                      "                            [--device <number>]\n"
                      "                            [--type dvddrive|hdd|fdd]\n"
@@ -475 +475 @@
                      "                            [--server <name>|<ip>]\n"
                      "                            [--target <target>]\n"
-                     "                            [--port <port>]\n"
+                     "                            [--tport <port>]\n"
                      "                            [--lun <lun>]\n"
                      "                            [--encodedlun <lun>]\n"

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

@@ -62 +62 @@
     { "--server",           'S', RTGETOPT_REQ_STRING },
     { "--target",           'T', RTGETOPT_REQ_STRING },
-    { "--port",             'P', RTGETOPT_REQ_STRING },
+    { "--tport",            'P', RTGETOPT_REQ_STRING },
     { "--lun",              'L', RTGETOPT_REQ_STRING },
     { "--encodedlun",       'E', RTGETOPT_REQ_STRING },
@@ -75 +75 @@
     HRESULT rc = S_OK;
     ULONG port   = ~0U;
-    ULONG device = 0;                   /* device is optional, default is 0 */
+    ULONG device = ~0U;
     bool fForceUnmount = false;
     bool fSetMediumType = false;
@@ -239 +239 @@
                 break;
 
-            case 'P':   // --port
+            case 'P':   // --tport
                 bstrPort = ValueUnion.psz;
                 break;
@@ -286 +286 @@
     if (!pszCtl)
         return errorSyntax(USAGE_STORAGEATTACH, "Storage controller name not specified");
-    if (port == ~0U)
-        return errorSyntax(USAGE_STORAGEATTACH, "Port not specified");
 
     /* get the virtualbox system properties */
@@ -317 +315 @@
         if (FAILED(rc))
             throw Utf8StrFmt("Could not find a controller named '%s'\n", pszCtl);
+
+        StorageBus_T storageBus = StorageBus_Null;
+        CHECK_ERROR_RET(storageCtl, COMGETTER(Bus)(&storageBus), 1);
+        ULONG maxPorts = 0;
+        CHECK_ERROR_RET(systemProperties, GetMaxPortCountForStorageBus(storageBus, &maxPorts), 1);
+        ULONG maxDevices = 0;
+        CHECK_ERROR_RET(systemProperties, GetMaxDevicesPerPortForStorageBus(storageBus, &maxDevices), 1);
+
+        if (port == ~0U)
+        {
+            if (maxPorts == 1)
+                port = 0;
+            else
+                return errorSyntax(USAGE_STORAGEATTACH, "Port not specified");
+        }
+        if (device == ~0U)
+        {
+            if (maxDevices == 1)
+                device = 0;
+            else
+                return errorSyntax(USAGE_STORAGEATTACH, "Device not specified");
+        }
 
         /* for sata controller check if the port count is big enough
@@ -376 +396 @@
             else
             {
-                StorageBus_T storageBus = StorageBus_Null;
                 DeviceType_T deviceType = DeviceType_Null;
                 com::SafeArray <DeviceType_T> saDeviceTypes;
@@ -382 +401 @@
 
                 /* 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)
@@ -461 +479 @@
             /* check if the device type is supported by the controller */
             {
-                StorageBus_T storageBus = StorageBus_Null;
                 com::SafeArray <DeviceType_T> saDeviceTypes;
 
-                CHECK_ERROR(storageCtl, COMGETTER(Bus)(&storageBus));
                 CHECK_ERROR(systemProperties, GetDeviceTypesForStorageBus(storageBus, ComSafeArrayAsOutParam(saDeviceTypes)));
                 if (SUCCEEDED(rc))