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

Timestamp:

Dec 2, 2010 5:21:40 PM (14 years ago)

Author:

vboxsync

Message:

VBoxManage: merge the broken addiscsidisk into storageattach

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (1 diff)
• VBoxManage.h (modified) (2 diffs)
• VBoxManageDisk.cpp (modified) (7 diffs)
• VBoxManageHelp.cpp (modified) (22 diffs)
• VBoxManageStorageController.cpp (modified) (7 diffs)

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

@@ -399 +399 @@
             { "clonehd",          USAGE_CLONEHD,           handleCloneHardDisk },
             { "clonevdi",         USAGE_CLONEHD,           handleCloneHardDisk }, /* backward compatibility */
-            { "addiscsidisk",     USAGE_ADDISCSIDISK,      handleAddiSCSIDisk },
             { "createvm",         USAGE_CREATEVM,          handleCreateVM },
             { "modifyvm",         USAGE_MODIFYVM,          handleModifyVM },

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -54 +54 @@
 #define USAGE_MODIFYHD              RT_BIT_64(14)
 #define USAGE_CLONEHD               RT_BIT_64(15)
-#define USAGE_ADDISCSIDISK          RT_BIT_64(16)
 #define USAGE_CREATEHOSTIF          RT_BIT_64(17)
 #define USAGE_REMOVEHOSTIF          RT_BIT_64(18)
@@ -218 +217 @@
 int handleCloneHardDisk(HandlerArg *a);
 RTEXITCODE handleConvertFromRaw(int argc, char *argv[]);
-int handleAddiSCSIDisk(HandlerArg *a);
 int handleShowHardDiskInfo(HandlerArg *a);
 int handleCloseMedium(HandlerArg *a);
+int parseDiskType(const char *psz, MediumType_T *pDiskType);
 
 /* VBoxManageStorageController.cpp */

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

@@ -97 +97 @@
 }
 
-static int parseDiskType(const char *psz, MediumType_T *pDiskType)
+int parseDiskType(const char *psz, MediumType_T *pDiskType)
 {
     int rc = VINF_SUCCESS;
@@ -158 +158 @@
     { "--variant",      'm', RTGETOPT_REQ_STRING },
     { "-variant",       'm', RTGETOPT_REQ_STRING },     // deprecated
-    { "--type",         't', RTGETOPT_REQ_STRING },
-    { "-type",          't', RTGETOPT_REQ_STRING },     // deprecated
-    { "--comment",      'c', RTGETOPT_REQ_STRING },
-    { "-comment",       'c', RTGETOPT_REQ_STRING },     // deprecated
-    { "--remember",     'r', RTGETOPT_REQ_NOTHING },
-    { "-remember",      'r', RTGETOPT_REQ_NOTHING },    // deprecated
-    { "--register",     'r', RTGETOPT_REQ_NOTHING },    // deprecated (unofficial)
-    { "-register",      'r', RTGETOPT_REQ_NOTHING },    // deprecated
 };
 
@@ -176 +168 @@
     Bstr format = "VDI";
     MediumVariant_T DiskVariant = MediumVariant_Standard;
-    Bstr comment;
-    bool fRemember = false;
-    MediumType_T DiskType = MediumType_Normal;
 
     int c;
@@ -218 +207 @@
                 if (RT_FAILURE(vrc))
                     return errorArgument("Invalid hard disk variant '%s'", ValueUnion.psz);
-                break;
-
-            case 'c':   // --comment
-                comment = ValueUnion.psz;
-                break;
-
-            case 'r':   // --remember
-                fRemember = true;
-                break;
-
-            case 't':   // --type
-                vrc = parseDiskType(ValueUnion.psz, &DiskType);
-                if (    RT_FAILURE(vrc)
-                    ||  (   DiskType != MediumType_Normal
-                         && DiskType != MediumType_Writethrough
-                         && DiskType != MediumType_Shareable))
-                    return errorArgument("Invalid hard disk type '%s'", ValueUnion.psz);
                 break;
 
@@ -281 +253 @@
     if (SUCCEEDED(rc) && hardDisk)
     {
-        /* we will close the hard disk after the storage has been successfully
-         * created unless fRemember is set */
-        bool doClose = false;
-
-        if (!comment.isEmpty())
-        {
-            CHECK_ERROR(hardDisk,COMSETTER(Description)(comment.raw()));
-        }
-
         ComPtr<IProgress> progress;
         CHECK_ERROR(hardDisk, CreateBaseStorage(size, DiskVariant, progress.asOutParam()));
@@ -305 +268 @@
             else
             {
-                doClose = !fRemember;
-
                 Bstr uuid;
                 CHECK_ERROR(hardDisk, COMGETTER(Id)(uuid.asOutParam()));
-
-                if (   DiskType == MediumType_Writethrough
-                    || DiskType == MediumType_Shareable)
-                {
-                    CHECK_ERROR(hardDisk, COMSETTER(Type)(DiskType));
-                }
-
                 RTPrintf("Disk image created. UUID: %s\n", Utf8Str(uuid).c_str());
             }
         }
-        if (doClose)
-        {
-            CHECK_ERROR(hardDisk, Close());
-        }
+        CHECK_ERROR(hardDisk, Close());
     }
     return SUCCEEDED(rc) ? 0 : 1;
@@ -955 +906 @@
 }
 
-static const RTGETOPTDEF g_aAddiSCSIDiskOptions[] =
-{
-    { "--server",       's', RTGETOPT_REQ_STRING },
-    { "-server",        's', RTGETOPT_REQ_STRING },     // deprecated
-    { "--target",       'T', RTGETOPT_REQ_STRING },
-    { "-target",        'T', RTGETOPT_REQ_STRING },     // deprecated
-    { "--port",         'p', RTGETOPT_REQ_STRING },
-    { "-port",          'p', RTGETOPT_REQ_STRING },     // deprecated
-    { "--lun",          'l', RTGETOPT_REQ_STRING },
-    { "-lun",           'l', RTGETOPT_REQ_STRING },     // deprecated
-    { "--encodedlun",   'L', RTGETOPT_REQ_STRING },
-    { "-encodedlun",    'L', RTGETOPT_REQ_STRING },     // deprecated
-    { "--username",     'u', RTGETOPT_REQ_STRING },
-    { "-username",      'u', RTGETOPT_REQ_STRING },     // deprecated
-    { "--password",     'P', RTGETOPT_REQ_STRING },
-    { "-password",      'P', RTGETOPT_REQ_STRING },     // deprecated
-    { "--type",         't', RTGETOPT_REQ_STRING },
-    { "-type",          't', RTGETOPT_REQ_STRING },     // deprecated
-    { "--intnet",       'I', RTGETOPT_REQ_NOTHING },
-    { "-intnet",        'I', RTGETOPT_REQ_NOTHING },    // deprecated
-};
-
-int handleAddiSCSIDisk(HandlerArg *a)
-{
-    HRESULT rc;
-    int vrc;
-    Bstr server;
-    Bstr target;
-    Bstr port;
-    Bstr lun;
-    Bstr username;
-    Bstr password;
-    Bstr comment;
-    bool fIntNet = false;
-    MediumType_T DiskType = MediumType_Normal;
-
-    int c;
-    RTGETOPTUNION ValueUnion;
-    RTGETOPTSTATE GetState;
-    // start at 0 because main() has hacked both the argc and argv given to us
-    RTGetOptInit(&GetState, a->argc, a->argv, g_aAddiSCSIDiskOptions, RT_ELEMENTS(g_aAddiSCSIDiskOptions),
-                 0, RTGETOPTINIT_FLAGS_NO_STD_OPTS);
-    while ((c = RTGetOpt(&GetState, &ValueUnion)))
-    {
-        switch (c)
-        {
-            case 's':   // --server
-                server = ValueUnion.psz;
-                break;
-
-            case 'T':   // --target
-                target = ValueUnion.psz;
-                break;
-
-            case 'p':   // --port
-                port = ValueUnion.psz;
-                break;
-
-            case 'l':   // --lun
-                lun = ValueUnion.psz;
-                break;
-
-            case 'L':   // --encodedlun
-                lun = BstrFmt("enc%s", ValueUnion.psz);
-                break;
-
-            case 'u':   // --username
-                username = ValueUnion.psz;
-                break;
-
-            case 'P':   // --password
-                password = ValueUnion.psz;
-                break;
-
-            case 't':   // --type
-                vrc = parseDiskType(ValueUnion.psz, &DiskType);
-                if (RT_FAILURE(vrc))
-                    return errorArgument("Invalid hard disk type '%s'", ValueUnion.psz);
-                break;
-
-            case 'I':   // --intnet
-                fIntNet = true;
-                break;
-
-            case VINF_GETOPT_NOT_OPTION:
-                return errorSyntax(USAGE_ADDISCSIDISK, "Invalid parameter '%s'", ValueUnion.psz);
-
-            default:
-                if (c > 0)
-                {
-                    if (RT_C_IS_PRINT(c))
-                        return errorSyntax(USAGE_ADDISCSIDISK, "Invalid option -%c", c);
-                    else
-                        return errorSyntax(USAGE_ADDISCSIDISK, "Invalid option case %i", c);
-                }
-                else if (c == VERR_GETOPT_UNKNOWN_OPTION)
-                    return errorSyntax(USAGE_ADDISCSIDISK, "unknown option: %s\n", ValueUnion.psz);
-                else if (ValueUnion.pDef)
-                    return errorSyntax(USAGE_ADDISCSIDISK, "%s: %Rrs", ValueUnion.pDef->pszLong, c);
-                else
-                    return errorSyntax(USAGE_ADDISCSIDISK, "error: %Rrs", c);
-        }
-    }
-
-    /* check for required options */
-    if (server.isEmpty() || target.isEmpty())
-        return errorSyntax(USAGE_ADDISCSIDISK, "Parameters --server and --target are required");
-
-    do
-    {
-        ComPtr<IMedium> hardDisk;
-        /** @todo move the location stuff to Main, which can use pfnComposeName
-         * from the disk backends to construct the location properly. Also do
-         * not use slashes to separate the parts, as otherwise only the last
-         * element containing information will be shown. */
-        if (lun.isEmpty() || lun == "0" || lun == "enc0")
-        {
-            CHECK_ERROR_BREAK(a->virtualBox, CreateHardDisk(Bstr("iSCSI").raw(),
-                                                            BstrFmt("%ls|%ls",
-                                                                    server.raw(),
-                                                                    target.raw()).raw(),
-                                                            hardDisk.asOutParam()));
-        }
-        else
-        {
-            CHECK_ERROR_BREAK(a->virtualBox, CreateHardDisk(Bstr("iSCSI").raw(),
-                                                            BstrFmt("%ls|%ls|%ls",
-                                                                    server.raw(),
-                                                                    target.raw(),
-                                                                    lun.raw()).raw(),
-                                                            hardDisk.asOutParam()));
-        }
-        if (FAILED(rc)) break;
-
-        if (!port.isEmpty())
-            server = BstrFmt("%ls:%ls", server.raw(), port.raw());
-
-        com::SafeArray <BSTR> names;
-        com::SafeArray <BSTR> values;
-
-        Bstr("TargetAddress").detachTo(names.appendedRaw());
-        server.detachTo(values.appendedRaw());
-        Bstr("TargetName").detachTo(names.appendedRaw());
-        target.detachTo(values.appendedRaw());
-
-        if (!lun.isEmpty())
-        {
-            Bstr("LUN").detachTo(names.appendedRaw());
-            lun.detachTo(values.appendedRaw());
-        }
-        if (!username.isEmpty())
-        {
-            Bstr("InitiatorUsername").detachTo(names.appendedRaw());
-            username.detachTo(values.appendedRaw());
-        }
-        if (!password.isEmpty())
-        {
-            Bstr("InitiatorSecret").detachTo(names.appendedRaw());
-            password.detachTo(values.appendedRaw());
-        }
-
-        /// @todo add --initiator option - until that happens rely on the
-        // defaults of the iSCSI initiator code. Setting it to a constant
-        // value does more harm than good, as the initiator name is supposed
-        // to identify a particular initiator uniquely.
-//        Bstr("InitiatorName").detachTo(names.appendedRaw());
-//        Bstr("iqn.2008-04.com.sun.virtualbox.initiator").detachTo(values.appendedRaw());
-
-        /// @todo add --targetName and --targetPassword options
-
-        if (fIntNet)
-        {
-            Bstr("HostIPStack").detachTo(names.appendedRaw());
-            Bstr("0").detachTo(values.appendedRaw());
-        }
-
-        CHECK_ERROR_BREAK(hardDisk, SetProperties(ComSafeArrayAsInParam(names),
-                                                  ComSafeArrayAsInParam(values)));
-
-        if (DiskType != MediumType_Normal)
-        {
-            CHECK_ERROR(hardDisk, COMSETTER(Type)(DiskType));
-        }
-
-        Bstr guid;
-        CHECK_ERROR(hardDisk, COMGETTER(Id)(guid.asOutParam()));
-        RTPrintf("iSCSI disk created. UUID: %s\n", Utf8Str(guid).c_str());
-    }
-    while (0);
-
-    return SUCCEEDED(rc) ? 0 : 1;
-}
-
 static const RTGETOPTDEF g_aShowHardDiskInfoOptions[] =
 {

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

@@ -97 +97 @@
 
     if (u64Cmd == USAGE_ALL)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage [-v|--version]    print version number and exit\n"
                      "VBoxManage [-q|--nologo] ... suppress the logo\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_LIST)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage list [--long|-l] vms|runningvms|ostypes|hostdvds|hostfloppies|\n"
@@ -117 +114 @@
                      "                            extpacks\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_SHOWVMINFO)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage showvminfo       <uuid>|<name> [--details] [--statistics]\n"
@@ -126 +121 @@
                      "VBoxManage showvminfo       <uuid>|<name> --log <idx>\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_REGISTERVM)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage registervm       <filename>\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_UNREGISTERVM)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage unregistervm     <uuid>|<name> [--delete]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_CREATEVM)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage createvm         --name <name>\n"
@@ -151 +140 @@
                      "                            [--uuid <uuid>]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_MODIFYVM)
@@ -337 +325 @@
 
     if (u64Cmd & USAGE_IMPORTAPPLIANCE)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage import           <ovf/ova> [--dry-run|-n] [more options]\n"
                      "                            (run with -n to have options displayed\n"
                      "                             for a particular OVF)\n\n");
-    }
 
     if (u64Cmd & USAGE_EXPORTAPPLIANCE)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage export           <machines> --output|-o <ovf/ova>\n"
@@ -359 +344 @@
                      "                                    [--eulafile <filename>]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_STARTVM)
@@ -417 +401 @@
 
     if (u64Cmd & USAGE_DISCARDSTATE)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage discardstate     <uuid>|<name>\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_ADOPTSTATE)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage adoptstate       <uuid>|<name> <state_file>\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_SNAPSHOT)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage snapshot         <uuid>|<name>\n"
@@ -443 +422 @@
                      "                            showvminfo <uuid>|<name>\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_CLOSEMEDIUM)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage closemedium      disk|dvd|floppy <uuid>|<filename>\n"
                      "                            [--delete]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_STORAGEATTACH)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage storageattach    <uuid|vmname>\n"
@@ -462 +437 @@
                      "                            [--type dvddrive|hdd|fdd]\n"
                      "                            [--medium none|emptydrive|\n"
-                     "                                      <uuid>|<filename>|host:<drive>]\n"
+                     "                                      <uuid>|<filename>|host:<drive>|iscsi]\n"
+                     "                            [--mtype normal|writethrough|immutable|shareable]\n"
                      "                            [--passthrough on|off]\n"
                      "                            [--bandwidthgroup <name>]\n"
                      "                            [--forceunmount]\n"
-                     "\n");
-    }
+                     "                            [--server <name>|<ip>]\n"
+                     "                            [--target <target>]\n"
+                     "                            [--port <port>]\n"
+                     "                            [--lun <lun>]\n"
+                     "                            [--encodedlun <lun>]\n"
+                     "                            [--username <username>]\n"
+                     "                            [--password <password>]\n"
+                     "                            [--intnet]\n"
+                     "\n");
 
     if (u64Cmd & USAGE_STORAGECONTROLLER)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage storagectl       <uuid|vmname>\n"
@@ -483 +465 @@
                      "                            [--remove]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_BANDWIDTHCONTROL)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage bandwidthctl     <uuid|vmname>\n"
@@ -494 +474 @@
                      "                            [--delete]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_SHOWHDINFO)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage showhdinfo       <uuid>|<filename>\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_CREATEHD)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage createhd         --filename <filename>\n"
@@ -510 +486 @@
                      "                            [--format VDI|VMDK|VHD] (default: VDI)\n"
                      "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
-                     "                            [--type normal|writethrough|\n"
-                     "                                    shareable] (default: normal)\n"
-                     "                            [--comment <comment>]\n"
-                     "                            [--remember]\n"
-                     "\n");
-    }
+                     "\n");
 
     if (u64Cmd & USAGE_MODIFYHD)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage modifyhd         <uuid>|<filename>\n"
@@ -526 +496 @@
                      "                            [--resize <megabytes>]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_CLONEHD)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage clonehd          <uuid>|<filename> <outputfile>\n"
@@ -537 +505 @@
                      "                            [--remember] [--existing]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_CONVERTFROMRAW)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage convertfromraw   <filename> <outputfile>\n"
@@ -551 +517 @@
 #endif
                      "\n");
-    }
-
-    if (u64Cmd & USAGE_ADDISCSIDISK)
-    {
-        RTStrmPrintf(pStrm,
-                     "VBoxManage addiscsidisk     --server <name>|<ip>\n"
-                     "                            --target <target>\n"
-                     "                            [--port <port>]\n"
-                     "                            [--lun <lun>]\n"
-                     "                            [--encodedlun <lun>]\n"
-                     "                            [--username <username>]\n"
-                     "                            [--password <password>]\n"
-                     "                            [--type normal|writethrough|immutable|shareable]\n"
-                     "                            [--intnet]\n"
-                     "\n");
-    }
 
     if (u64Cmd & USAGE_GETEXTRADATA)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage getextradata     global|<uuid>|<name>\n"
                      "                            <key>|enumerate\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_SETEXTRADATA)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage setextradata     global|<uuid>|<name>\n"
@@ -583 +530 @@
                      "                            [<value>] (no value deletes key)\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_SETPROPERTY)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage setproperty      machinefolder default|<folder> |\n"
@@ -594 +539 @@
                      "                            loghistorycount <value>\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_USBFILTER_ADD)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage usbfilter        add <index,0-N>\n"
@@ -613 +556 @@
                      "                            [--maskedinterfaces <XXXXXXXX>]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_USBFILTER_MODIFY)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage usbfilter        modify <index,0-N>\n"
@@ -632 +573 @@
                      "                            [--maskedinterfaces <XXXXXXXX>]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_USBFILTER_REMOVE)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage usbfilter        remove <index,0-N>\n"
                      "                            --target <uuid>|<name>|global\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_SHAREDFOLDER_ADD)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage sharedfolder     add <vmname>|<uuid>\n"
@@ -649 +586 @@
                      "                            [--transient] [--readonly] [--automount]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_SHAREDFOLDER_REMOVE)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage sharedfolder     remove <vmname>|<uuid>\n"
                      "                            --name <name> [--transient]\n"
                      "\n");
-    }
 
     if (u64Cmd & USAGE_VM_STATISTICS)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage vmstatistics     <vmname>|<uuid> [--reset]\n"
                      "                            [--pattern <pattern>] [--descriptions]\n"
                      "\n");
-    }
 
 #ifdef VBOX_WITH_GUEST_PROPS
@@ -678 +610 @@
 
     if (u64Cmd & USAGE_METRICS)
-    {
         RTStrmPrintf(pStrm,
                      "VBoxManage metrics          list [*|host|<vmname> [<metric_list>]]\n"
@@ -701 +632 @@
                      "                            [*|host|<vmname> [<metric_list>]]\n"
                      "\n");
-    }
+
 #if defined(VBOX_WITH_NETFLT)
     if (u64Cmd & USAGE_HOSTONLYIFS)

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

@@ -45 +45 @@
 static const RTGETOPTDEF g_aStorageAttachOptions[] =
 {
-    { "--storagectl",     's', RTGETOPT_REQ_STRING },
-    { "--port",           'p', RTGETOPT_REQ_UINT32 },
-    { "--device",         'd', RTGETOPT_REQ_UINT32 },
-    { "--medium",         'm', RTGETOPT_REQ_STRING },
-    { "--type",           't', RTGETOPT_REQ_STRING },
-    { "--passthrough",    'h', RTGETOPT_REQ_STRING },
-    { "--bandwidthgroup", 'b', RTGETOPT_REQ_STRING },
-    { "--forceunmount",   'f', RTGETOPT_REQ_NOTHING },
+    { "--storagectl",       's', RTGETOPT_REQ_STRING },
+    { "--port",             'p', RTGETOPT_REQ_UINT32 },
+    { "--device",           'd', RTGETOPT_REQ_UINT32 },
+    { "--type",             't', RTGETOPT_REQ_STRING },
+    { "--medium",           'm', RTGETOPT_REQ_STRING },
+    { "--mtype",            'M', RTGETOPT_REQ_STRING },
+    { "--passthrough",      'h', RTGETOPT_REQ_STRING },
+    { "--bandwidthgroup",   'b', RTGETOPT_REQ_STRING },
+    { "--forceunmount",     'f', RTGETOPT_REQ_NOTHING },
+    { "--comment",          'C', RTGETOPT_REQ_STRING },
+    // iSCSI options
+    { "--server",           'S', RTGETOPT_REQ_STRING },
+    { "--target",           'T', RTGETOPT_REQ_STRING },
+    { "--port",             'P', RTGETOPT_REQ_STRING },
+    { "--lun",              'L', RTGETOPT_REQ_STRING },
+    { "--encodedlun",       'E', RTGETOPT_REQ_STRING },
+    { "--username",         'U', RTGETOPT_REQ_STRING },
+    { "--password",         'W', RTGETOPT_REQ_STRING },
+    { "--intnet",           'I', RTGETOPT_REQ_NOTHING },
 };
 
@@ -62 +73 @@
     ULONG device = ~0U;
     bool fForceUnmount = false;
+    MediumType_T mediumType = MediumType_Normal;
+    Bstr bstrComment;
     const char *pszCtl  = NULL;
-    const char *pszType = NULL;
+    DeviceType_T devTypeRequested = DeviceType_Null;
     const char *pszMedium = NULL;
     const char *pszPassThrough = NULL;
     const char *pszBandwidthGroup = NULL;
+    // iSCSI options
+    Bstr bstrServer;
+    Bstr bstrTarget;
+    Bstr bstrPort;
+    Bstr bstrLun;
+    Bstr bstrUsername;
+    Bstr bstrPassword;
+    bool fIntNet = false;
+
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
@@ -73 +95 @@
     ComPtr<ISystemProperties> systemProperties;
 
-    if (a->argc < 9)
-        return errorSyntax(USAGE_STORAGEATTACH, "Too few parameters");
-    else if (a->argc > 13)
-        return errorSyntax(USAGE_STORAGEATTACH, "Too many parameters");
-
     RTGetOptInit(&GetState, a->argc, a->argv, g_aStorageAttachOptions,
                  RT_ELEMENTS(g_aStorageAttachOptions), 1, RTGETOPTINIT_FLAGS_NO_STD_OPTS);
@@ -107 +124 @@
             }
 
-            case 'm':   // medium <none|emptydrive|uuid|filename|host:<drive>>
+            case 'm':   // medium <none|emptydrive|uuid|filename|host:<drive>|iSCSI>
             {
                 if (ValueUnion.psz)
@@ -119 +136 @@
             {
                 if (ValueUnion.psz)
-                    pszType = ValueUnion.psz;
+                {
+                    if (!RTStrICmp(ValueUnion.psz, "hdd"))
+                        devTypeRequested = DeviceType_HardDisk;
+                    else if (!RTStrICmp(ValueUnion.psz, "fdd"))
+                        devTypeRequested = DeviceType_Floppy;
+                    else if (!RTStrICmp(ValueUnion.psz, "dvddrive"))
+                        devTypeRequested = DeviceType_DVD;
+                    else
+                        return errorArgument("Invalid --type argument '%s'", ValueUnion.psz);
+                }
                 else
                     rc = E_FAIL;
@@ -148 +174 @@
                 break;
             }
+
+            case 'C':
+                if (ValueUnion.psz)
+                    bstrComment = ValueUnion.psz;
+                else
+                    rc = E_FAIL;
+            break;
+
+            case 'S':   // --server
+                bstrServer = ValueUnion.psz;
+                break;
+
+            case 'T':   // --target
+                bstrTarget = ValueUnion.psz;
+                break;
+
+            case 'P':   // --port
+                bstrPort = ValueUnion.psz;
+                break;
+
+            case 'L':   // --lun
+                bstrLun = ValueUnion.psz;
+                break;
+
+            case 'E':   // --encodedlun
+                bstrLun = BstrFmt("enc%s", ValueUnion.psz);
+                break;
+
+            case 'U':   // --username
+                bstrUsername = ValueUnion.psz;
+                break;
+
+            case 'W':   // --password
+                bstrPassword = ValueUnion.psz;
+                break;
+
+            case 'M':   // --type
+            {
+                int vrc = parseDiskType(ValueUnion.psz, &mediumType);
+                if (RT_FAILURE(vrc))
+                    return errorArgument("Invalid hard disk type '%s'", ValueUnion.psz);
+                break;
+            }
+
+            case 'I':   // --intnet
+                fIntNet = true;
+                break;
 
             default:
@@ -171 +244 @@
     CHECK_ERROR_RET(a->virtualBox, COMGETTER(SystemProperties)(systemProperties.asOutParam()), 1);
 
-    /* try to find the given machine */
+    // find the machine, lock it, get the mutable session machine
     CHECK_ERROR_RET(a->virtualBox, FindMachine(Bstr(a->argv[0]).raw(),
                                                machine.asOutParam()), 1);
-
-    /* open a session for the VM (new or shared) */
     CHECK_ERROR_RET(machine, LockMachine(a->session, LockType_Shared), 1);
     SessionType_T st;
     CHECK_ERROR_RET(a->session, COMGETTER(Type)(&st), 1);
-    bool fRunTime = (st == SessionType_Shared);
-
-    if (fRunTime && !RTStrICmp(pszType, "hdd"))
+    a->session->COMGETTER(Machine)(machine.asOutParam());
+
+    try
     {
-        errorArgument("Hard disk drives cannot be changed while the VM is running\n");
-        goto leave;
-    }
-
-    if (fRunTime && !RTStrICmp(pszMedium, "none"))
-    {
-        errorArgument("Drives cannot be removed while the VM is running\n");
-        goto leave;
-    }
-
-    if (fRunTime && pszPassThrough)
-    {
-        errorArgument("Drive passthrough state can't be changed while the VM is running\n");
-        goto leave;
-    }
-
-    if (fRunTime && pszBandwidthGroup)
-    {
-        errorArgument("Bandwidth group can't be changed while the VM is running\n");
-        goto leave;
-    }
-
-    /* get the mutable session machine */
-    a->session->COMGETTER(Machine)(machine.asOutParam());
-
-    /* check if the storage controller is present */
-    rc = machine->GetStorageControllerByName(Bstr(pszCtl).raw(),
-                                             storageCtl.asOutParam());
-    if (FAILED(rc))
-    {
-        errorSyntax(USAGE_STORAGEATTACH, "Couldn't find the controller with the name: '%s'\n", pszCtl);
-        goto leave;
-    }
-
-    /* for sata controller check if the port count is big enough
-     * to accommodate the current port which is being assigned
-     * else just increase the port count
-     */
-    {
-        ULONG ulPortCount = 0;
-        ULONG ulMaxPortCount = 0;
-
-        CHECK_ERROR(storageCtl, COMGETTER(MaxPortCount)(&ulMaxPortCount));
-        CHECK_ERROR(storageCtl, COMGETTER(PortCount)(&ulPortCount));
-
-        if (   (ulPortCount != ulMaxPortCount)
-            && (port >= ulPortCount)
-            && (port < ulMaxPortCount))
-            CHECK_ERROR(storageCtl, COMSETTER(PortCount)(port + 1));
-    }
-
-    if (!RTStrICmp(pszMedium, "none"))
-    {
-        CHECK_ERROR(machine, DetachDevice(Bstr(pszCtl).raw(), port, device));
-    }
-    else if (!RTStrICmp(pszMedium, "emptydrive"))
-    {
+        bool fRunTime = (st == SessionType_Shared);
         if (fRunTime)
         {
-            ComPtr<IMediumAttachment> mediumAttachment;
-            DeviceType_T deviceType = DeviceType_Null;
-            rc = machine->GetMediumAttachment(Bstr(pszCtl).raw(), port, device,
-                                              mediumAttachment.asOutParam());
-            if (SUCCEEDED(rc))
-            {
-                mediumAttachment->COMGETTER(Type)(&deviceType);
-
-                if (   (deviceType == DeviceType_DVD)
-                    || (deviceType == DeviceType_Floppy))
-                {
-                    /* just unmount the floppy/dvd */
-                    CHECK_ERROR(machine, MountMedium(Bstr(pszCtl).raw(),
-                                                     port,
-                                                     device,
-                                                     NULL,
-                                                     fForceUnmount));
-                }
-            }
-
-            if (   FAILED(rc)
-                || !(   deviceType == DeviceType_DVD
-                     || deviceType == DeviceType_Floppy))
-            {
-                errorArgument("No DVD/Floppy Drive attached to the controller '%s'"
-                              "at the port: %u, device: %u", pszCtl, port, device);
-                goto leave;
-            }
-
-        }
+            if (devTypeRequested == DeviceType_HardDisk)
+                throw Utf8Str("Hard disk drives cannot be changed while the VM is running\n");
+            else if (!RTStrICmp(pszMedium, "none"))
+                throw Utf8Str("Drives cannot be removed while the VM is running\n");
+            else if (pszPassThrough)
+                throw Utf8Str("Drive passthrough state cannot be changed while the VM is running\n");
+            else if (pszBandwidthGroup)
+                throw Utf8Str("Bandwidth group cannot be changed while the VM is running\n");
+        }
+
+        /* check if the storage controller is present */
+        rc = machine->GetStorageControllerByName(Bstr(pszCtl).raw(),
+                                                 storageCtl.asOutParam());
+        if (FAILED(rc))
+            throw Utf8StrFmt("Could not find a controller named '%s'\n", pszCtl);
+
+        /* for sata controller check if the port count is big enough
+         * to accommodate the current port which is being assigned
+         * else just increase the port count
+         */
+        {
+            ULONG ulPortCount = 0;
+            ULONG ulMaxPortCount = 0;
+
+            CHECK_ERROR(storageCtl, COMGETTER(MaxPortCount)(&ulMaxPortCount));
+            CHECK_ERROR(storageCtl, COMGETTER(PortCount)(&ulPortCount));
+
+            if (   (ulPortCount != ulMaxPortCount)
+                && (port >= ulPortCount)
+                && (port < ulMaxPortCount))
+                CHECK_ERROR(storageCtl, COMSETTER(PortCount)(port + 1));
+        }
+
+        StorageControllerType_T ctlType = StorageControllerType_Null;
+        CHECK_ERROR(storageCtl, COMGETTER(ControllerType)(&ctlType));
+
+        if (!RTStrICmp(pszMedium, "none"))
+        {
+            CHECK_ERROR(machine, DetachDevice(Bstr(pszCtl).raw(), port, device));
+        }
+        else if (!RTStrICmp(pszMedium, "emptydrive"))
+        {
+            if (fRunTime)
+            {
+                ComPtr<IMediumAttachment> mediumAttachment;
+                DeviceType_T deviceType = DeviceType_Null;
+                rc = machine->GetMediumAttachment(Bstr(pszCtl).raw(), port, device,
+                                                  mediumAttachment.asOutParam());
+                if (SUCCEEDED(rc))
+                {
+                    mediumAttachment->COMGETTER(Type)(&deviceType);
+
+                    if (   (deviceType == DeviceType_DVD)
+                        || (deviceType == DeviceType_Floppy))
+                    {
+                        /* just unmount the floppy/dvd */
+                        CHECK_ERROR(machine, MountMedium(Bstr(pszCtl).raw(),
+                                                         port,
+                                                         device,
+                                                         NULL,
+                                                         fForceUnmount));
+                    }
+                }
+
+                if (   FAILED(rc)
+                    || !(   deviceType == DeviceType_DVD
+                         || deviceType == DeviceType_Floppy)
+                   )
+                    throw Utf8StrFmt("No DVD/Floppy Drive attached to the controller '%s'"
+                                     "at the port: %u, device: %u", pszCtl, port, device);
+
+            }
+            else
+            {
+                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)
+                    throw Utf8StrFmt("The attachment is not supported by the storage controller '%s'", pszCtl);
+
+                if (storageBus == StorageBus_Floppy)
+                    deviceType = DeviceType_Floppy;
+                else
+                    deviceType = DeviceType_DVD;
+
+                /* attach a empty floppy/dvd drive after removing previous attachment */
+                machine->DetachDevice(Bstr(pszCtl).raw(), port, device);
+                CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl).raw(), port, device,
+                                                  deviceType, NULL));
+            }
+        } // end if (!RTStrICmp(pszMedium, "emptydrive"))
         else
         {
-            StorageBus_T storageBus = StorageBus_Null;
-            DeviceType_T deviceType = DeviceType_Null;
-            com::SafeArray <DeviceType_T> saDeviceTypes;
-            ULONG driveCheck = 0;
+            ComPtr<IMedium> pMedium2Mount;
+
+            // not "none", not "emptydrive": then it must be a UUID or filename or hostdrive or iSCSI;
+            // for all these we first need to know the type of drive we're attaching to
+            {
+                /*
+                 * try to determine the type of the drive from the
+                 * storage controller chipset, the attachment and
+                 * the medium being attached
+                 */
+                if (ctlType == StorageControllerType_I82078)        // floppy controller
+                    devTypeRequested = DeviceType_Floppy;
+                else
+                {
+                    /*
+                     * for SATA/SCSI/IDE it is hard to tell if it is a harddisk or
+                     * a dvd being attached so lets check if the medium attachment
+                     * and the medium, both are of same type. if yes then we are
+                     * sure of its type and don't need the user to enter it manually
+                     * else ask the user for the type.
+                     */
+                    ComPtr<IMediumAttachment> mediumAttachment;
+                    rc = machine->GetMediumAttachment(Bstr(pszCtl).raw(), port,
+                                                      device,
+                                                      mediumAttachment.asOutParam());
+                    if (SUCCEEDED(rc))
+                    {
+                        DeviceType_T deviceType;
+                        mediumAttachment->COMGETTER(Type)(&deviceType);
+
+                        ComPtr<IMedium> pExistingMedium;
+                        rc = a->virtualBox->FindMedium(Bstr(pszMedium).raw(),
+                                                       deviceType,
+                                                       pExistingMedium.asOutParam());
+                        if (pExistingMedium)
+                        {
+                            if (    (deviceType == DeviceType_DVD)
+                                 || (deviceType == DeviceType_HardDisk)
+                               )
+                                devTypeRequested == deviceType;
+                        }
+                    }
+                }
+                /* for all other cases lets ask the user what type of drive it is */
+            }
+
+            if (devTypeRequested == DeviceType_Null)        // still the initializer value?
+                throw Utf8Str("Argument --type must be specified\n");
 
             /* 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)
-                deviceType = DeviceType_Floppy;
-            else
-                deviceType = DeviceType_DVD;
-
-            /* attach a empty floppy/dvd drive after removing previous attachment */
-            machine->DetachDevice(Bstr(pszCtl).raw(), port, device);
-            CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl).raw(), port, device,
-                                              deviceType, NULL));
-        }
-    }
-    else
-    {
-        {
-            /*
-             * try to determine the type of the drive from the
-             * storage controller chipset, the attachment and
-             * the medium being attached
-             */
-            StorageControllerType_T ctlType = StorageControllerType_Null;
-            CHECK_ERROR(storageCtl, COMGETTER(ControllerType)(&ctlType));
-            if (ctlType == StorageControllerType_I82078)
-            {
-                /*
-                 * floppy controller found so lets assume the medium
-                 * given by the user is also a floppy image or floppy
-                 * host drive
-                 */
-                pszType = "fdd";
-            }
-            else
-            {
-                /*
-                 * for SATA/SCSI/IDE it is hard to tell if it is a harddisk or
-                 * a dvd being attached so lets check if the medium attachment
-                 * and the medium, both are of same type. if yes then we are
-                 * sure of its type and don't need the user to enter it manually
-                 * else ask the user for the type.
-                 */
-                ComPtr<IMediumAttachment> mediumAttachement;
-                rc = machine->GetMediumAttachment(Bstr(pszCtl).raw(), port,
-                                                  device,
-                                                  mediumAttachement.asOutParam());
+            {
+                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))
                 {
-                    DeviceType_T deviceType;
-                    mediumAttachement->COMGETTER(Type)(&deviceType);
-
-                    if (deviceType == DeviceType_DVD)
-                    {
-                        ComPtr<IMedium> dvdMedium;
-                        rc = a->virtualBox->FindMedium(Bstr(pszMedium).raw(),
-                                                       DeviceType_DVD,
-                                                       dvdMedium.asOutParam());
-                        if (dvdMedium)
-                            /*
-                             * ok so the medium and attachment both are DVD's so it is
-                             * safe to assume that we are dealing with a DVD here
-                             */
-                            pszType = "dvddrive";
-                    }
-                    else if (deviceType == DeviceType_HardDisk)
-                    {
-                        ComPtr<IMedium> hardDisk;
-                        rc = a->virtualBox->FindMedium(Bstr(pszMedium).raw(),
-                                                       DeviceType_HardDisk,
-                                                       hardDisk.asOutParam());
-                        if (hardDisk)
-                            /*
-                             * ok so the medium and attachment both are hdd's so it is
-                             * safe to assume that we are dealing with a hdd here
-                             */
-                            pszType = "hdd";
-                    }
-                }
-            }
-            /* for all other cases lets ask the user what type of drive it is */
-        }
-
-        if (!pszType)
-        {
-            errorSyntax(USAGE_STORAGEATTACH, "Argument --type not specified\n");
-            goto leave;
-        }
-
-        /* 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))
-            {
-                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);
+                    ULONG driveCheck = 0;
+                    for (size_t i = 0; i < saDeviceTypes.size(); ++ i)
+                        if (saDeviceTypes[i] == devTypeRequested)
+                            driveCheck++;
+                    if (!driveCheck)
+                        throw Utf8StrFmt("The given attachment is not supported by the storage controller '%s'", pszCtl);
+                }
+                else
                     goto leave;
-                }
-            }
-            else
-                goto leave;
-        }
-
-        if (!RTStrICmp(pszType, "dvddrive"))
-        {
-            ComPtr<IMedium> dvdMedium;
-
-            if (!fRunTime)
-            {
-                ComPtr<IMediumAttachment> mediumAttachement;
-
-                /* check if there is a dvd drive at the given location, if not attach one */
-                rc = machine->GetMediumAttachment(Bstr(pszCtl).raw(), port,
-                                                  device,
-                                                  mediumAttachement.asOutParam());
-                if (SUCCEEDED(rc))
-                {
-                    DeviceType_T deviceType;
-                    mediumAttachement->COMGETTER(Type)(&deviceType);
-
-                    if (deviceType != DeviceType_DVD)
-                    {
-                        machine->DetachDevice(Bstr(pszCtl).raw(), port, device);
-                        rc = machine->AttachDevice(Bstr(pszCtl).raw(), port,
-                                                   device, DeviceType_DVD, NULL);
-                    }
-                }
-                else
-                {
-                    rc = machine->AttachDevice(Bstr(pszCtl).raw(), port,
-                                               device, DeviceType_DVD, NULL);
-                }
-            }
-
-            /* Attach/Detach the dvd medium now */
-            do
-            {
-                /* host drive? */
-                if (!RTStrNICmp(pszMedium, "host:", 5))
-                {
-                    ComPtr<IHost> host;
-                    CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
+            }
+
+            // find the medium given
+            /* host drive? */
+            if (!RTStrNICmp(pszMedium, "host:", 5))
+            {
+                ComPtr<IHost> host;
+                CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
+
+                if (devTypeRequested == DeviceType_DVD)
+                {
                     rc = host->FindHostDVDDrive(Bstr(pszMedium + 5).raw(),
-                                                dvdMedium.asOutParam());
-                    if (!dvdMedium)
+                                                pMedium2Mount.asOutParam());
+                    if (!pMedium2Mount)
                     {
                         /* 2nd try: try with the real name, important on Linux+libhal */
                         char szPathReal[RTPATH_MAX];
                         if (RT_FAILURE(RTPathReal(pszMedium + 5, szPathReal, sizeof(szPathReal))))
+                            throw Utf8StrFmt("Invalid host DVD drive name \"%s\"", pszMedium + 5);
+                        rc = host->FindHostDVDDrive(Bstr(szPathReal).raw(),
+                                                    pMedium2Mount.asOutParam());
+                        if (!pMedium2Mount)
+                            throw Utf8StrFmt("Invalid host DVD drive name \"%s\"", pszMedium + 5);
+                    }
+                }
+                else
+                {
+                    // floppy
+                    rc = host->FindHostFloppyDrive(Bstr(pszMedium + 5).raw(),
+                                                   pMedium2Mount.asOutParam());
+                    if (!pMedium2Mount)
+                        throw Utf8StrFmt("Invalid host floppy drive name \"%s\"", pszMedium + 5);
+                }
+            }
+            else if (!RTStrICmp(pszMedium, "iSCSI"))
+            {
+                /* check for required options */
+                if (bstrServer.isEmpty() || bstrTarget.isEmpty())
+                    throw Utf8StrFmt("Parameters --server and --target are required for iSCSI media");
+
+                /** @todo move the location stuff to Main, which can use pfnComposeName
+                 * from the disk backends to construct the location properly. Also do
+                 * not use slashes to separate the parts, as otherwise only the last
+                 * element containing information will be shown. */
+                Bstr bstrISCSIMedium;
+                if (    bstrLun.isEmpty()
+                     || (bstrLun == "0")
+                     || (bstrLun == "enc0")
+                   )
+                    bstrISCSIMedium = BstrFmt("%ls|%ls", bstrServer.raw(), bstrTarget.raw());
+                else
+                    bstrISCSIMedium = BstrFmt("%ls|%ls|%ls", bstrServer.raw(), bstrTarget.raw(), bstrLun.raw());
+
+                CHECK_ERROR(a->virtualBox, CreateHardDisk(Bstr("iSCSI").raw(),
+                                                          bstrISCSIMedium.raw(),
+                                                          pMedium2Mount.asOutParam()));
+                if (FAILED(rc)) goto leave;
+                if (!bstrPort.isEmpty())
+                    bstrServer = BstrFmt("%ls:%ls", bstrServer.raw(), bstrPort.raw());
+
+                // set the other iSCSI parameters as properties
+                com::SafeArray <BSTR> names;
+                com::SafeArray <BSTR> values;
+                Bstr("TargetAddress").detachTo(names.appendedRaw());
+                bstrServer.detachTo(values.appendedRaw());
+                Bstr("TargetName").detachTo(names.appendedRaw());
+                bstrTarget.detachTo(values.appendedRaw());
+
+                if (!bstrLun.isEmpty())
+                {
+                    Bstr("LUN").detachTo(names.appendedRaw());
+                    bstrLun.detachTo(values.appendedRaw());
+                }
+                if (!bstrUsername.isEmpty())
+                {
+                    Bstr("InitiatorUsername").detachTo(names.appendedRaw());
+                    bstrUsername.detachTo(values.appendedRaw());
+                }
+                if (!bstrPassword.isEmpty())
+                {
+                    Bstr("InitiatorSecret").detachTo(names.appendedRaw());
+                    bstrPassword.detachTo(values.appendedRaw());
+                }
+
+                /// @todo add --initiator option - until that happens rely on the
+                // defaults of the iSCSI initiator code. Setting it to a constant
+                // value does more harm than good, as the initiator name is supposed
+                // to identify a particular initiator uniquely.
+        //        Bstr("InitiatorName").detachTo(names.appendedRaw());
+        //        Bstr("iqn.2008-04.com.sun.virtualbox.initiator").detachTo(values.appendedRaw());
+
+                /// @todo add --targetName and --targetPassword options
+
+                if (fIntNet)
+                {
+                    Bstr("HostIPStack").detachTo(names.appendedRaw());
+                    Bstr("0").detachTo(values.appendedRaw());
+                }
+
+                CHECK_ERROR(pMedium2Mount, SetProperties(ComSafeArrayAsInParam(names),
+                                                         ComSafeArrayAsInParam(values)));
+                if (FAILED(rc)) goto leave;
+                Bstr guid;
+                CHECK_ERROR(pMedium2Mount, COMGETTER(Id)(guid.asOutParam()));
+                if (FAILED(rc)) goto leave;
+                RTPrintf("iSCSI disk created. UUID: %s\n", Utf8Str(guid).c_str());
+            }
+            else
+            {
+                Bstr bstrMedium(pszMedium);
+                if (bstrMedium.isEmpty())
+                    throw Utf8Str("Missing --medium argument");
+
+                rc = a->virtualBox->FindMedium(bstrMedium.raw(),
+                                               devTypeRequested,
+                                               pMedium2Mount.asOutParam());
+                if (FAILED(rc) || !pMedium2Mount)
+                {
+                    /* not registered, do that on the fly */
+                    CHECK_ERROR(a->virtualBox,
+                                OpenMedium(bstrMedium.raw(),
+                                           devTypeRequested,
+                                           AccessMode_ReadWrite,
+                                           pMedium2Mount.asOutParam()));
+                }
+                if (!pMedium2Mount)
+                    throw Utf8StrFmt("Invalid UUID or filename \"%s\"", pszMedium);
+            }
+
+            switch (devTypeRequested)
+            {
+                case DeviceType_DVD:
+                case DeviceType_Floppy:
+                {
+                    if (!fRunTime)
+                    {
+                        ComPtr<IMediumAttachment> mediumAttachment;
+                        // check if there is a dvd/floppy drive at the given location, if not attach one first
+                        rc = machine->GetMediumAttachment(Bstr(pszCtl).raw(),
+                                                          port,
+                                                          device,
+                                                          mediumAttachment.asOutParam());
+                        if (SUCCEEDED(rc))
                         {
-                            errorArgument("Invalid host DVD drive name \"%s\"", pszMedium + 5);
-                            rc = E_FAIL;
-                            break;
+                            DeviceType_T deviceType;
+                            mediumAttachment->COMGETTER(Type)(&deviceType);
+                            if (deviceType != devTypeRequested)
+                            {
+                                machine->DetachDevice(Bstr(pszCtl).raw(), port, device);
+                                rc = machine->AttachDevice(Bstr(pszCtl).raw(),
+                                                           port,
+                                                           device,
+                                                           devTypeRequested,    // DeviceType_DVD or DeviceType_Floppy
+                                                           NULL);
+                            }
                         }
-                        rc = host->FindHostDVDDrive(Bstr(szPathReal).raw(),
-                                                    dvdMedium.asOutParam());
-                        if (!dvdMedium)
+                        else
                         {
-                            errorArgument("Invalid host DVD drive name \"%s\"", pszMedium + 5);
-                            rc = E_FAIL;
-                            break;
+                            rc = machine->AttachDevice(Bstr(pszCtl).raw(),
+                                                       port,
+                                                       device,
+                                                       devTypeRequested,    // DeviceType_DVD or DeviceType_Floppy
+                                                       NULL);
                         }
                     }
-                }
-                else
-                {
-                    rc = a->virtualBox->FindMedium(Bstr(pszMedium).raw(),
-                                                   DeviceType_DVD,
-                                                   dvdMedium.asOutParam());
-                    if (FAILED(rc) || !dvdMedium)
+
+                    if (pMedium2Mount)
                     {
-                        /* not registered, do that on the fly */
-                        Bstr emptyUUID;
-                        CHECK_ERROR(a->virtualBox,
-                                    OpenMedium(Bstr(pszMedium).raw(),
-                                               DeviceType_DVD,
-                                               AccessMode_ReadWrite,
-                                               dvdMedium.asOutParam()));
+                        CHECK_ERROR(machine, MountMedium(Bstr(pszCtl).raw(),
+                                                         port,
+                                                         device,
+                                                         pMedium2Mount,
+                                                         fForceUnmount));
                     }
-                    if (!dvdMedium)
+                } // end DeviceType_DVD or DeviceType_Floppy:
+                break;
+
+                case DeviceType_HardDisk:
+                {
+                    if (fRunTime)
+                        throw Utf8Str("Hard disk attachments cannot be changed while the VM is running");
+
+                    // if there is anything attached at the given location, remove it
+                    machine->DetachDevice(Bstr(pszCtl).raw(), port, device);
+                    CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl).raw(),
+                                                      port,
+                                                      device,
+                                                      DeviceType_HardDisk,
+                                                      pMedium2Mount));
+                }
+                break;
+            }
+
+            // set medium type, if so desired
+            if (pMedium2Mount && mediumType != MediumType_Normal)
+            {
+                CHECK_ERROR(pMedium2Mount, COMSETTER(Type)(mediumType));
+            }
+
+            if (!bstrComment.isEmpty())
+            {
+                CHECK_ERROR(pMedium2Mount, COMSETTER(Description)(bstrComment.raw()));
+            }
+        }
+
+        if (   pszPassThrough
+            && (SUCCEEDED(rc)))
+        {
+            ComPtr<IMediumAttachment> mattach;
+            CHECK_ERROR(machine, GetMediumAttachment(Bstr(pszCtl).raw(), port,
+                                                     device, mattach.asOutParam()));
+
+            if (SUCCEEDED(rc))
+            {
+                if (!RTStrICmp(pszPassThrough, "on"))
+                {
+                    CHECK_ERROR(machine, PassthroughDevice(Bstr(pszCtl).raw(),
+                                                           port, device, TRUE));
+                }
+                else if (!RTStrICmp(pszPassThrough, "off"))
+                {
+                    CHECK_ERROR(machine, PassthroughDevice(Bstr(pszCtl).raw(),
+                                                           port, device, FALSE));
+                }
+                else
+                    throw Utf8StrFmt("Invalid --passthrough argument '%s'", pszPassThrough);
+            }
+            else
+                throw Utf8StrFmt("Couldn't find the controller attachment for the controller '%s'\n", pszCtl);
+        }
+
+        if (   pszBandwidthGroup
+            && !fRunTime
+            && SUCCEEDED(rc))
+        {
+
+            if (!RTStrICmp(pszBandwidthGroup, "none"))
+            {
+                /* Just remove the bandwidth gorup. */
+                CHECK_ERROR(machine, SetBandwidthGroupForDevice(Bstr(pszCtl).raw(),
+                                                                port, device, NULL));
+            }
+            else
+            {
+                ComPtr<IBandwidthControl> bwCtrl;
+                ComPtr<IBandwidthGroup> bwGroup;
+
+                CHECK_ERROR(machine, COMGETTER(BandwidthControl)(bwCtrl.asOutParam()));
+
+                if (SUCCEEDED(rc))
+                {
+                    CHECK_ERROR(bwCtrl, GetBandwidthGroup(Bstr(pszBandwidthGroup).raw(), bwGroup.asOutParam()));
+                    if (SUCCEEDED(rc))
                     {
-                        errorArgument("Invalid UUID or filename \"%s\"", pszMedium);
-                        rc = E_FAIL;
-                        break;
+                        CHECK_ERROR(machine, SetBandwidthGroupForDevice(Bstr(pszCtl).raw(),
+                                                                        port, device, bwGroup));
                     }
                 }
-            } while (0);
-
-            if (dvdMedium)
-            {
-                CHECK_ERROR(machine, MountMedium(Bstr(pszCtl).raw(), port,
-                                                 device, dvdMedium,
-                                                 fForceUnmount));
-            }
-        }
-        else if (   !RTStrICmp(pszType, "hdd")
-                 && !fRunTime)
-        {
-            ComPtr<IMediumAttachment> mediumAttachement;
-
-            /* if there is anything attached at the given location, remove it */
-            machine->DetachDevice(Bstr(pszCtl).raw(), port, device);
-
-            /* first guess is that it's a UUID */
-            ComPtr<IMedium> hardDisk;
-            rc = a->virtualBox->FindMedium(Bstr(pszMedium).raw(),
-                                           DeviceType_HardDisk,
-                                           hardDisk.asOutParam());
-
-            /* not successful? Then it must be a filename */
-            if (!hardDisk)
-            {
-                /* open the new hard disk object */
-                CHECK_ERROR(a->virtualBox,
-                            OpenMedium(Bstr(pszMedium).raw(),
-                                       DeviceType_HardDisk,
-                                       AccessMode_ReadWrite,
-                                       hardDisk.asOutParam()));
-            }
-
-            if (hardDisk)
-            {
-                CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl).raw(), port,
-                                                  device, DeviceType_HardDisk,
-                                                  hardDisk));
-            }
-            else
-            {
-                errorArgument("Invalid UUID or filename \"%s\"", pszMedium);
-                rc = E_FAIL;
-            }
-        }
-        else if (!RTStrICmp(pszType, "fdd"))
-        {
-            Bstr uuid;
-            ComPtr<IMedium> floppyMedium;
-            ComPtr<IMediumAttachment> floppyAttachment;
-            machine->GetMediumAttachment(Bstr(pszCtl).raw(), port, device,
-                                         floppyAttachment.asOutParam());
-
-            if (   !fRunTime
-                && !floppyAttachment)
-                CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl).raw(), port,
-                                                  device, DeviceType_Floppy,
-                                                  NULL));
-
-            /* host drive? */
-            if (!RTStrNICmp(pszMedium, "host:", 5))
-            {
-                ComPtr<IHost> host;
-
-                CHECK_ERROR(a->virtualBox, COMGETTER(Host)(host.asOutParam()));
-                rc = host->FindHostFloppyDrive(Bstr(pszMedium + 5).raw(),
-                                               floppyMedium.asOutParam());
-                if (!floppyMedium)
-                {
-                    errorArgument("Invalid host floppy drive name \"%s\"", pszMedium + 5);
-                    rc = E_FAIL;
-                }
-            }
-            else
-            {
-                /* first assume it's a UUID */
-                rc = a->virtualBox->FindMedium(Bstr(pszMedium).raw(),
-                                               DeviceType_Floppy,
-                                               floppyMedium.asOutParam());
-                if (FAILED(rc) || !floppyMedium)
-                {
-                    /* not registered, do that on the fly */
-                    Bstr emptyUUID;
-                    CHECK_ERROR(a->virtualBox,
-                                 OpenMedium(Bstr(pszMedium).raw(),
-                                            DeviceType_Floppy,
-                                            AccessMode_ReadWrite,
-                                            floppyMedium.asOutParam()));
-                }
-
-                if (!floppyMedium)
-                {
-                    errorArgument("Invalid UUID or filename \"%s\"", pszMedium);
-                    rc = E_FAIL;
-                }
-            }
-
-            if (floppyMedium)
-            {
-                CHECK_ERROR(machine, MountMedium(Bstr(pszCtl).raw(), port,
-                                                 device,
-                                                 floppyMedium,
-                                                 fForceUnmount));
-            }
-        }
-        else
-        {
-            errorArgument("Invalid --type argument '%s'", pszType);
-            rc = E_FAIL;
-        }
+            }
+        }
+
+        /* commit changes */
+        if (SUCCEEDED(rc))
+            CHECK_ERROR(machine, SaveSettings());
     }
-
-    if (   pszPassThrough
-        && (SUCCEEDED(rc)))
+    catch (const Utf8Str &strError)
     {
-        ComPtr<IMediumAttachment> mattach;
-
-        CHECK_ERROR(machine, GetMediumAttachment(Bstr(pszCtl).raw(), port,
-                                                 device, mattach.asOutParam()));
-
-        if (SUCCEEDED(rc))
-        {
-            if (!RTStrICmp(pszPassThrough, "on"))
-            {
-                CHECK_ERROR(machine, PassthroughDevice(Bstr(pszCtl).raw(),
-                                                       port, device, TRUE));
-            }
-            else if (!RTStrICmp(pszPassThrough, "off"))
-            {
-                CHECK_ERROR(machine, PassthroughDevice(Bstr(pszCtl).raw(),
-                                                       port, device, FALSE));
-            }
-            else
-            {
-                errorArgument("Invalid --passthrough argument '%s'", pszPassThrough);
-                rc = E_FAIL;
-            }
-        }
-        else
-        {
-            errorArgument("Couldn't find the controller attachment for the controller '%s'\n", pszCtl);
-            rc = E_FAIL;
-        }
+        errorArgument("%s", strError.c_str());
+        rc = E_FAIL;
     }
 
-    if (   pszBandwidthGroup
-        && !fRunTime
-        && SUCCEEDED(rc))
-    {
-
-        if (!RTStrICmp(pszBandwidthGroup, "none"))
-        {
-            /* Just remove the bandwidth gorup. */
-            CHECK_ERROR(machine, SetBandwidthGroupForDevice(Bstr(pszCtl).raw(),
-                                                            port, device, NULL));
-        }
-        else
-        {
-            ComPtr<IBandwidthControl> bwCtrl;
-            ComPtr<IBandwidthGroup> bwGroup;
-
-            CHECK_ERROR(machine, COMGETTER(BandwidthControl)(bwCtrl.asOutParam()));
-
-            if (SUCCEEDED(rc))
-            {
-                CHECK_ERROR(bwCtrl, GetBandwidthGroup(Bstr(pszBandwidthGroup).raw(), bwGroup.asOutParam()));
-                if (SUCCEEDED(rc))
-                {
-                    CHECK_ERROR(machine, SetBandwidthGroupForDevice(Bstr(pszCtl).raw(),
-                                                                    port, device, bwGroup));
-                }
-            }
-        }
-    }
-
-    /* commit changes */
-    if (SUCCEEDED(rc))
-        CHECK_ERROR(machine, SaveSettings());
-
+    // machine must always be unlocked, even on errors
 leave:
-    /* it's important to always close sessions */
     a->session->UnlockMachine();