Changeset 23809 in vbox

Timestamp:

Oct 15, 2009 4:07:58 PM (15 years ago)

Author:

vboxsync

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

53552

Message:

VBoxManage: storagectl => name, floppy => fdd, type => controller

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -352 +352 @@
     {
         RTPrintf("VBoxManage attachdisk       <uuid|vmname>\n"
-                 "                            --type <dvd|hdd|floppy>\n"
+                 "                            --type <dvd|hdd|fdd>\n"
                  "                            --file <null|none|uuid|filename|host:<drive>>\n"
                  "                            --controller <name>\n"
@@ -363 +363 @@
     {
         RTPrintf("VBoxManage storagectl       <uuid|vmname>\n"
-                 "                            --storagectl <name>\n"
+                 "                            --name <name>\n"
                  "                            [--add <ide/sata/scsi/floppy>]\n"
-                 "                            [--type <LsiLogic/BusLogic/IntelAhci/PIIX3/PIIX4/ICH6/I82078>]\n"
+                 "                            [--controller <LsiLogic/BusLogic/IntelAhci/PIIX3/PIIX4/ICH6/I82078>]\n"
                  "                            [--passthrough <on|off> --port <number> --device <number>]\n"
                  "                            [--sataideemulation<1-4> <1-30>]\n"

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

@@ -85 +85 @@
         switch (c)
         {
-            case 't':   // type <dvd|hdd|floppy>
+            case 't':   // type <dvd|hdd|fdd>
             {
                 if (ValueUnion.psz)
@@ -330 +330 @@
         }
     }
-    else if (!RTStrICmp(pszType, "floppy"))
+    else if (!RTStrICmp(pszType, "fdd"))
     {
         ComPtr<IMediumAttachment> floppyAttachment;
@@ -419 +419 @@
 static const RTGETOPTDEF g_aStorageControllerOptions[] =
 {
-    { "--storagectl",       's', RTGETOPT_REQ_STRING },
+    { "--name",             'n', RTGETOPT_REQ_STRING },
     { "--add",              'a', RTGETOPT_REQ_STRING },
-    { "--type",             't', RTGETOPT_REQ_STRING },
+    { "--controller",       't', RTGETOPT_REQ_STRING },
     { "--port",             'p', RTGETOPT_REQ_UINT32 },
     { "--device",           'd', RTGETOPT_REQ_UINT32 },
@@ -461 +461 @@
         switch (c)
         {
-            case 's':   // controller name
+            case 'n':   // controller name
             {
                 if (ValueUnion.psz)
@@ -479 +479 @@
             }
 
-            case 't':   // type <lsilogic/buslogic/intelahci/piix3/piix4/ich6/i82078>
+            case 't':   // controller <lsilogic/buslogic/intelahci/piix3/piix4/ich6/i82078>
             {
                 if (ValueUnion.psz)