Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (revision 23901) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (revision 23902) @@ -2031,5 +2031,5 @@ { "closemedium", handleCloseMedium }, { "unregisterimage", handleCloseMedium }, /* backward compatiblity */ - { "attachdisk", handleAttachDisk }, + { "storageattach", handleStorageAttach }, { "storagectl", handleStorageController }, { "showhdinfo", handleShowHardDiskInfo }, Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h (revision 23901) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h (revision 23902) @@ -92,5 +92,5 @@ #define USAGE_DHCPSERVER RT_BIT_64(47) #define USAGE_DUMPHDINFO RT_BIT_64(48) -#define USAGE_ATTACHDISK RT_BIT_64(49) +#define USAGE_STORAGEATTACH RT_BIT_64(49) #define USAGE_STORAGECONTROLLER RT_BIT_64(50) #define USAGE_ALL (~(uint64_t)0) @@ -197,5 +197,5 @@ /* VBoxManageStorageController.cpp */ -int handleAttachDisk(HandlerArg *a); +int handleStorageAttach(HandlerArg *a); int handleStorageController(HandlerArg *a); Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 23901) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 23902) @@ -349,12 +349,13 @@ } - if (u64Cmd & USAGE_ATTACHDISK) - { - RTPrintf("VBoxManage attachdisk \n" - " --type \n" - " --file >\n" - " --controller \n" + if (u64Cmd & USAGE_STORAGEATTACH) + { + RTPrintf("VBoxManage storageattach \n" + " --storagectl \n" " --port \n" " --device \n" + " [--type \n" + " --medium >]\n" + " [--passthrough ]\n" "\n"); } @@ -366,5 +367,4 @@ " [--add ]\n" " [--controller ]\n" - " [--passthrough --port --device ]\n" " [--sataideemulation<1-4> <1-30>]\n" " [--sataportcount <1-30>]\n" Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (revision 23901) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (revision 23902) @@ -47,23 +47,25 @@ -static const RTGETOPTDEF g_aAttachDiskOptions[] = +static const RTGETOPTDEF g_aStorageAttachOptions[] = { - { "--type", 't', RTGETOPT_REQ_STRING }, - { "--file", 'f', RTGETOPT_REQ_STRING }, - { "--controller", 'c', RTGETOPT_REQ_STRING }, + { "--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 }, }; -int handleAttachDisk(HandlerArg *a) +int handleStorageAttach(HandlerArg *a) { int c; HRESULT rc = S_OK; - ULONG port = 0; - ULONG device = 0; + ULONG port = ~0U; + ULONG device = ~0U; bool fRunTime = false; const char *pszCtl = NULL; const char *pszType = NULL; - const char *pszFile = NULL; + const char *pszMedium = NULL; + const char *pszPassThrough = NULL; Bstr machineuuid (a->argv[0]); RTGETOPTUNION ValueUnion; @@ -72,11 +74,11 @@ ComPtr storageCtl; - if (a->argc < 11) - return errorSyntax(USAGE_ATTACHDISK, "Too few parameters"); - else if (a->argc > 11) - return errorSyntax(USAGE_ATTACHDISK, "Too many parameters"); - - RTGetOptInit (&GetState, a->argc, a->argv, g_aAttachDiskOptions, - RT_ELEMENTS(g_aAttachDiskOptions), 1, 0 /* fFlags */); + 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, 0 /* fFlags */); while ( SUCCEEDED(rc) @@ -85,5 +87,35 @@ switch (c) { - case 't': // type + case 's': // storage controller name + { + if (ValueUnion.psz) + pszCtl = ValueUnion.psz; + else + rc = E_FAIL; + break; + } + + case 'p': // port + { + port = ValueUnion.u32; + break; + } + + case 'd': // device + { + device = ValueUnion.u32; + break; + } + + case 'm': // medium > + { + if (ValueUnion.psz) + pszMedium = ValueUnion.psz; + else + rc = E_FAIL; + break; + } + + case 't': // type { if (ValueUnion.psz) @@ -94,31 +126,10 @@ } - case 'f': // file > + case 'h': // passthrough { if (ValueUnion.psz) - pszFile = ValueUnion.psz; - else - rc = E_FAIL; - break; - } - - case 'c': // controller name - { - if (ValueUnion.psz) - pszCtl = ValueUnion.psz; - else - rc = E_FAIL; - break; - } - - case 'p': // port - { - port = ValueUnion.u32; - break; - } - - case 'd': // device - { - device = ValueUnion.u32; + pszPassThrough = ValueUnion.psz; + else + rc = E_FAIL; break; } @@ -126,5 +137,5 @@ default: { - errorGetOpt(USAGE_ATTACHDISK, c, &ValueUnion); + errorGetOpt(USAGE_STORAGEATTACH, c, &ValueUnion); rc = E_FAIL; break; @@ -133,11 +144,10 @@ } - if (FAILED(rc)) - return 1; - - if ( fRunTime - && !RTStrICmp(pszType, "hdd")) - { - errorArgument("Harddisk's can't be changed while the VM is still running\n"); + if ( FAILED(rc) + || !pszCtl + || port == ~0U + || device == ~0U) + { + errorGetOpt(USAGE_STORAGEATTACH, c, &ValueUnion); return 1; } @@ -163,4 +173,15 @@ } + if (fRunTime) + { + if ( !RTStrICmp(pszMedium, "none") + || !RTStrICmp(pszType, "hdd")) + errorArgument("DVD/HardDisk Drives can't be changed while the VM is still running\n"); + if (pszPassThrough) + errorArgument("Drive passthrough state can't be changed while the VM is still running\n"); + + goto leave; + } + /* get the mutable session machine */ a->session->COMGETTER(Machine)(machine.asOutParam()); @@ -169,21 +190,65 @@ rc = machine->GetStorageControllerByName(Bstr(pszCtl), storageCtl.asOutParam()); if (FAILED(rc)) - return errorSyntax(USAGE_ATTACHDISK, "Couldn't find the controller with the name: '%s'\n", pszCtl); - - if (!RTStrICmp(pszType, "dvd")) - { - if (!RTStrICmp(pszFile, "null")) - { - if (fRunTime) - { - errorArgument("DVD Drive's can't be removed while the VM is still running\n"); - rc = E_FAIL; - } - else - { - CHECK_ERROR (machine, DetachDevice(Bstr(pszCtl), port, device)); - } + { + errorSyntax(USAGE_STORAGEATTACH, "Couldn't find the controller with the name: '%s'\n", pszCtl); + goto leave; + } + + if (!RTStrICmp(pszMedium, "none")) + { + CHECK_ERROR (machine, DetachDevice(Bstr(pszCtl), port, device)); + } + else if (!RTStrICmp(pszMedium, "emptydrive")) + { + if (fRunTime) + { + ComPtr mediumAttachment; + rc = machine->GetMediumAttachment(Bstr(pszCtl), port, device, mediumAttachment.asOutParam()); + if (SUCCEEDED(rc)) + { + DeviceType_T deviceType; + mediumAttachment->COMGETTER(Type) (&deviceType); + + if ( (deviceType == DeviceType_DVD) + || (deviceType == DeviceType_Floppy)) + { + /* just unmount the floppy/dvd */ + CHECK_ERROR (machine, MountMedium(Bstr(pszCtl), port, device, NULL)); + } + } + else + { + errorArgument("No DVD/Floppy Drive attached to the controller '%s'" + "at the port: %u, device: %u", pszCtl, port, device); + goto leave; + } + } else + { + StorageBus_T storageBus = StorageBus_Null; + DeviceType_T deviceType = DeviceType_Null; + + CHECK_ERROR (storageCtl, COMGETTER(Bus)(&storageBus)); + + 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), port, device); + CHECK_ERROR (machine, AttachDevice(Bstr(pszCtl), port, device, deviceType, NULL)); + } + } + else + { + if (!pszType) + { + errorSyntax(USAGE_STORAGEATTACH, "Argument --type not specified\n"); + goto leave; + } + + if (!RTStrICmp(pszType, "dvddrive")) { Bstr uuid; @@ -216,22 +281,17 @@ do { - /* unmount? */ - if (!RTStrICmp(pszFile, "none")) - { - /* nothing to do, NULL object will cause unmount */ - } /* host drive? */ - else if (!RTStrNICmp(pszFile, "host:", 5)) + if (!RTStrNICmp(pszMedium, "host:", 5)) { ComPtr host; CHECK_ERROR (a->virtualBox, COMGETTER(Host)(host.asOutParam())); - rc = host->FindHostDVDDrive(Bstr(pszFile + 5), dvdMedium.asOutParam()); + rc = host->FindHostDVDDrive(Bstr(pszMedium + 5), dvdMedium.asOutParam()); if (!dvdMedium) { /* 2nd try: try with the real name, important on Linux+libhal */ char szPathReal[RTPATH_MAX]; - if (RT_FAILURE(RTPathReal(pszFile + 5, szPathReal, sizeof(szPathReal)))) + if (RT_FAILURE(RTPathReal(pszMedium + 5, szPathReal, sizeof(szPathReal)))) { - errorArgument("Invalid host DVD drive name \"%s\"", pszFile + 5); + errorArgument("Invalid host DVD drive name \"%s\"", pszMedium + 5); rc = E_FAIL; break; @@ -240,5 +300,5 @@ if (!dvdMedium) { - errorArgument("Invalid host DVD drive name \"%s\"", pszFile + 5); + errorArgument("Invalid host DVD drive name \"%s\"", pszMedium + 5); rc = E_FAIL; break; @@ -249,15 +309,15 @@ { /* first assume it's a UUID */ - uuid = pszFile; + uuid = pszMedium; rc = a->virtualBox->GetDVDImage(uuid, dvdMedium.asOutParam()); if (FAILED(rc) || !dvdMedium) { /* must be a filename, check if it's in the collection */ - rc = a->virtualBox->FindDVDImage(Bstr(pszFile), dvdMedium.asOutParam()); + rc = a->virtualBox->FindDVDImage(Bstr(pszMedium), dvdMedium.asOutParam()); /* not registered, do that on the fly */ if (!dvdMedium) { Bstr emptyUUID; - CHECK_ERROR (a->virtualBox, OpenDVDImage(Bstr(pszFile), + CHECK_ERROR (a->virtualBox, OpenDVDImage(Bstr(pszMedium), emptyUUID, dvdMedium.asOutParam())); } @@ -265,28 +325,19 @@ if (!dvdMedium) { + errorArgument("Invalid UUID or filename \"%s\"", pszMedium); rc = E_FAIL; break; } } - } - while (0); + } while (0); if (dvdMedium) + { dvdMedium->COMGETTER(Id)(uuid.asOutParam()); - if (SUCCEEDED(rc)) CHECK_ERROR (machine, MountMedium(Bstr(pszCtl), port, device, uuid)); - } - } - else if ( !RTStrICmp(pszType, "hdd") - && !fRunTime) - { - Bstr uuid(pszFile); - - if ( !RTStrICmp(pszFile, "none") - || !RTStrICmp(pszFile, "null")) - { - machine->DetachDevice(Bstr(pszCtl), port, device); - } - else + } + } + else if ( !RTStrICmp(pszType, "hdd") + && !fRunTime) { ComPtr mediumAttachement; @@ -304,4 +355,5 @@ /* first guess is that it's a UUID */ + Bstr uuid(pszMedium); ComPtr hardDisk; rc = a->virtualBox->GetHardDisk(uuid, hardDisk.asOutParam()); @@ -310,10 +362,10 @@ if (!hardDisk) { - rc = a->virtualBox->FindHardDisk(Bstr(pszFile), hardDisk.asOutParam()); + rc = a->virtualBox->FindHardDisk(Bstr(pszMedium), hardDisk.asOutParam()); if (FAILED(rc)) { /* open the new hard disk object */ CHECK_ERROR (a->virtualBox, - OpenHardDisk(Bstr(pszFile), + OpenHardDisk(Bstr(pszMedium), AccessMode_ReadWrite, false, Bstr(""), false, Bstr(""), hardDisk.asOutParam())); @@ -327,29 +379,15 @@ } else + { + errorArgument("Invalid UUID or filename \"%s\"", pszMedium); rc = E_FAIL; - } - } - else if (!RTStrICmp(pszType, "fdd")) - { - ComPtr floppyAttachment; - machine->GetMediumAttachment(Bstr(pszCtl), port, device, floppyAttachment.asOutParam()); - - if (!RTStrICmp(pszFile, "null")) - { - if (fRunTime) - { - errorArgument("Floppy Drive's can't be removed while the VM is still running\n"); - rc = E_FAIL; - } - else - { - if (floppyAttachment) - CHECK_ERROR (machine, DetachDevice(Bstr(pszCtl), port, device)); - } - } - else + } + } + else if (!RTStrICmp(pszType, "fdd")) { Bstr uuid; ComPtr floppyMedium; + ComPtr floppyAttachment; + machine->GetMediumAttachment(Bstr(pszCtl), port, device, floppyAttachment.asOutParam()); if ( !fRunTime @@ -357,19 +395,14 @@ CHECK_ERROR (machine, AttachDevice(Bstr(pszCtl), port, device, DeviceType_Floppy, NULL)); - /* unmount? */ - if (!RTStrICmp(pszFile, "none")) - { - /* nothing to do, NULL object will cause unmount */ - } /* host drive? */ - else if (!RTStrNICmp(pszFile, "host:", 5)) + if (!RTStrNICmp(pszMedium, "host:", 5)) { ComPtr host; CHECK_ERROR (a->virtualBox, COMGETTER(Host)(host.asOutParam())); - rc = host->FindHostFloppyDrive(Bstr(pszFile + 5), floppyMedium.asOutParam()); + rc = host->FindHostFloppyDrive(Bstr(pszMedium + 5), floppyMedium.asOutParam()); if (!floppyMedium) { - errorArgument("Invalid host floppy drive name \"%s\"", pszFile + 5); + errorArgument("Invalid host floppy drive name \"%s\"", pszMedium + 5); rc = E_FAIL; } @@ -378,10 +411,10 @@ { /* first assume it's a UUID */ - uuid = pszFile; + uuid = pszMedium; rc = a->virtualBox->GetFloppyImage(uuid, floppyMedium.asOutParam()); if (FAILED(rc) || !floppyMedium) { /* must be a filename, check if it's in the collection */ - rc = a->virtualBox->FindFloppyImage(Bstr(pszFile), floppyMedium.asOutParam()); + rc = a->virtualBox->FindFloppyImage(Bstr(pszMedium), floppyMedium.asOutParam()); /* not registered, do that on the fly */ if (!floppyMedium) @@ -389,5 +422,5 @@ Bstr emptyUUID; CHECK_ERROR (a->virtualBox, - OpenFloppyImage(Bstr(pszFile), + OpenFloppyImage(Bstr(pszMedium), emptyUUID, floppyMedium.asOutParam())); @@ -396,11 +429,50 @@ if (!floppyMedium) - rc = E_FAIL; + { + errorArgument("Invalid UUID or filename \"%s\"", pszMedium); + rc = E_FAIL; + } } if (floppyMedium) + { floppyMedium->COMGETTER(Id)(uuid.asOutParam()); - if (SUCCEEDED(rc)) CHECK_ERROR (machine, MountMedium(Bstr(pszCtl), port, device, uuid)); + } + } + else + { + errorArgument("Invalid --type argument '%s'", pszType); + rc = E_FAIL; + } + } + + if ( pszPassThrough + && (SUCCEEDED(rc))) + { + ComPtr mattach; + + CHECK_ERROR (machine, GetMediumAttachment(Bstr(pszCtl), port, device, mattach.asOutParam())); + + if (SUCCEEDED(rc)) + { + if (!RTStrICmp(pszPassThrough, "on")) + { + CHECK_ERROR (mattach, COMSETTER(Passthrough)(true)); + } + else if (!RTStrICmp(pszPassThrough, "off")) + { + CHECK_ERROR (mattach, COMSETTER(Passthrough)(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; } } @@ -410,4 +482,5 @@ CHECK_ERROR (machine, SaveSettings()); +leave: /* it's important to always close sessions */ a->session->Close(); @@ -421,10 +494,7 @@ { "--name", 'n', RTGETOPT_REQ_STRING }, { "--add", 'a', RTGETOPT_REQ_STRING }, - { "--controller", 't', RTGETOPT_REQ_STRING }, - { "--port", 'p', RTGETOPT_REQ_UINT32 }, - { "--device", 'd', RTGETOPT_REQ_UINT32 }, - { "--passthrough", 'h', RTGETOPT_REQ_STRING }, + { "--controller", 'c', RTGETOPT_REQ_STRING }, { "--sataideemulation", 'e', RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_INDEX }, - { "--sataportcount", 'c', RTGETOPT_REQ_UINT32 }, + { "--sataportcount", 'p', RTGETOPT_REQ_UINT32 }, { "--remove", 'r', RTGETOPT_REQ_NOTHING }, }; @@ -437,11 +507,7 @@ const char *pszBusType = NULL; const char *pszCtlType = NULL; - const char *pszPassThrough = NULL; - ULONG cPass = 0; ULONG satabootdev = ~0U; ULONG sataidedev = ~0U; ULONG sataportcount = ~0U; - ULONG port = ~0U; - ULONG device = ~0U; bool fRemoveCtl = false; Bstr machineuuid (a->argv[0]); @@ -479,34 +545,8 @@ } - case 't': // controller + case 'c': // controller { if (ValueUnion.psz) pszCtlType = ValueUnion.psz; - else - rc = E_FAIL; - break; - } - - case 'p': // port - { - port = ValueUnion.u32; - cPass++; - break; - } - - case 'd': // device - { - device = ValueUnion.u32; - cPass++; - break; - } - - case 'h': // passthrough - { - if (ValueUnion.psz) - { - pszPassThrough = ValueUnion.psz; - cPass++; - } else rc = E_FAIL; @@ -531,5 +571,5 @@ } - case 'c': // sataportcount + case 'p': // sataportcount { sataportcount = ValueUnion.u32; @@ -574,13 +614,7 @@ if (!pszCtl) { + /* it's important to always close sessions */ + a->session->Close(); errorSyntax(USAGE_STORAGECONTROLLER, "Storage Controller Name not specified\n"); - return 1; - } - - if (cPass != 0 && cPass != 3) - { - errorSyntax(USAGE_STORAGECONTROLLER, - "All three options (--passthrough, --port, --device)\n" - "need to be specified for dvd passthrough to be applied\n"); return 1; } @@ -596,10 +630,10 @@ { ComPtr mediumAttach = mediumAttachments[i]; - LONG cPort = 0; - LONG cDevice = 0; - - CHECK_ERROR (mediumAttach, COMGETTER(Port)(&cPort)); - CHECK_ERROR (mediumAttach, COMGETTER(Device)(&cDevice)); - CHECK_ERROR (machine, DetachDevice(Bstr(pszCtl), cPort, cDevice)); + LONG port = 0; + LONG device = 0; + + CHECK_ERROR (mediumAttach, COMGETTER(Port)(&port)); + CHECK_ERROR (mediumAttach, COMGETTER(Device)(&device)); + CHECK_ERROR (machine, DetachDevice(Bstr(pszCtl), port, device)); } @@ -689,34 +723,4 @@ } - if ( (cPass == 3) - && SUCCEEDED(rc)) - { - ComPtr mattach; - - CHECK_ERROR (machine, GetMediumAttachment(Bstr(pszCtl), port, device, mattach.asOutParam())); - - if (SUCCEEDED(rc)) - { - if (!RTStrICmp(pszPassThrough, "on")) - { - CHECK_ERROR (mattach, COMSETTER(Passthrough)(true)); - } - else if (!RTStrICmp(pszPassThrough, "off")) - { - CHECK_ERROR (mattach, COMSETTER(Passthrough)(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; - } - } - if ( (sataportcount != ~0U) && SUCCEEDED(rc))