Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 42537) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 42538) @@ -1025,7 +1025,7 @@ /* enable the controller */ if (!floppyAttachment) - CHECK_ERROR(machine, AttachDevice(Bstr("Floppy Controller").raw(), - 0, 0, - DeviceType_Floppy, NULL)); + CHECK_ERROR(machine, AttachDeviceWithoutMedium(Bstr("Floppy Controller").raw(), + 0, 0, + DeviceType_Floppy)); /* unmount? */ Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (revision 42537) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp (revision 42538) @@ -407,6 +407,6 @@ * Main will complain if the controller doesn't support hotplugging. */ - CHECK_ERROR(machine, AttachDevice(Bstr(pszCtl).raw(), port, device, - devTypeRequested, NULL)); + CHECK_ERROR(machine, AttachDeviceWithoutMedium(Bstr(pszCtl).raw(), port, device, + devTypeRequested)); deviceType = DeviceType_DVD; /* To avoid the error message below. */ } @@ -445,6 +445,6 @@ /* 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)); + CHECK_ERROR(machine, AttachDeviceWithoutMedium(Bstr(pszCtl).raw(), port, device, + deviceType)); } } // end if (!RTStrICmp(pszMedium, "emptydrive")) @@ -690,18 +690,16 @@ { machine->DetachDevice(Bstr(pszCtl).raw(), port, device); - rc = machine->AttachDevice(Bstr(pszCtl).raw(), - port, - device, - devTypeRequested, // DeviceType_DVD or DeviceType_Floppy - NULL); + rc = machine->AttachDeviceWithoutMedium(Bstr(pszCtl).raw(), + port, + device, + devTypeRequested); // DeviceType_DVD or DeviceType_Floppy } } else { - rc = machine->AttachDevice(Bstr(pszCtl).raw(), - port, - device, - devTypeRequested, // DeviceType_DVD or DeviceType_Floppy - NULL); + rc = machine->AttachDeviceWithoutMedium(Bstr(pszCtl).raw(), + port, + device, + devTypeRequested); // DeviceType_DVD or DeviceType_Floppy } } @@ -846,6 +844,6 @@ { /* Just remove the bandwidth gorup. */ - CHECK_ERROR(machine, SetBandwidthGroupForDevice(Bstr(pszCtl).raw(), - port, device, NULL)); + CHECK_ERROR(machine, SetNoBandwidthGroupForDevice(Bstr(pszCtl).raw(), + port, device)); } else Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 42537) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 42538) @@ -1206,5 +1206,5 @@ @@ -4812,4 +4812,89 @@ + + + Attaches a device and optionally mounts a medium to the given storage + controller (, identified by @a name), + at the indicated port and device. + + This method is intended for managing storage devices in general while a + machine is powered off. It can be used to attach and detach fixed + and removable media. The following kind of media can be attached + to a machine: +
    +
  • + For fixed and removable media, you can pass in a medium that was + previously opened using . +
    • + +
  • Only for storage devices supporting removable media (such as + DVDs and floppies) with an empty drive or one of the medium objects listed + in the and + arrays to indicate a host drive. + For removable devices, you can also use + to change the media while the machine is running. +
    • +
+ + In a VM's default configuration of virtual machines, the secondary + master of the IDE controller is used for a CD/DVD drive. + will appear in the machine's list of medium + attachments (see ). + + See and for more + information about attaching media. + + The specified device slot must not have a device attached to it, + or this method will fail. + + You cannot attach a device to a newly created machine until + this machine's settings are saved to disk using + . + + + If the medium is being attached indirectly, a new differencing medium + will implicitly be created for it and attached instead. If the + changes made to the machine settings (including this indirect + attachment) are later cancelled using , + this implicitly created differencing medium will implicitly + be deleted. + + + + SATA device, SATA port, IDE port or IDE slot out of range, or + file or UUID not found. + + + Machine must be registered before media can be attached. + + + Invalid machine state. + + + A medium is already attached to this or another virtual machine. + + + + Name of the storage controller to attach the device to. + + + Port to attach the device to. For an IDE controller, 0 specifies + the primary controller and 1 specifies the secondary controller. + For a SCSI controller, this must range from 0 to 15; for a SATA controller, + from 0 to 29; for an SAS controller, from 0 to 7. + + + Device slot in the given port to attach the device to. This is only + relevant for IDE controllers, for which 0 specifies the master device and + 1 specifies the slave device. For all other controller types, this must + be 0. + + + Device type of the attached device. For media opened by + , this must match the device type + specified there. + + + @@ -5042,5 +5127,35 @@ - + + + Sets no bandwidth group for an existing storage device. + The device must already exist; see + for how to attach a new device. + The @a controllerPort and @a device parameters specify the device slot and + have have the same meaning as with . + + SATA device, SATA port, IDE port or IDE slot out of range. + + + Attempt to modify an unregistered virtual machine. + + + Invalid machine state. + + + + + Name of the storage controller. + + + Storage controller port. + + + Device slot in the given port. + + + + + Unmounts any currently mounted medium (, @@ -12252,5 +12367,5 @@ @@ -13389,4 +13504,50 @@ Progress object to track the operation completion. + + + + + Starts creating a clone of this medium in the format and at the + location defined by the @a target argument. + + The target medium must be either in + state (i.e. must not have an existing storage unit) or in + state (i.e. created and not locked, and + big enough to hold the data or else the copy will be partial). Upon + successful completion, the cloned medium will contain exactly the + same sector data as the medium being cloned, except that in the + first case a new UUID for the clone will be randomly generated, and in + the second case the UUID will remain unchanged. + + The @a parent argument defines which medium will be the parent + of the clone. In this case the clone will be a base image, i.e. + completely independent. It is possible to specify an arbitrary + medium for this parameter, including the parent of the + medium which is being cloned. Even cloning to a child of the source + medium is possible. Note that when cloning to an existing image, the + @a parent argument is ignored. + + After the returned progress object reports that the operation is + successfully complete, the target medium gets remembered by this + VirtualBox installation and may be attached to virtual machines. + + + This medium will be placed to + state for the duration of this operation. + + + The specified cloning variant is not supported at the moment. + + + + Target medium. + + + Exact image variant which should be created (as a combination of + flags). + + + Progress object to track the operation completion. + Index: /trunk/src/VBox/Main/include/MachineImpl.h =================================================================== --- /trunk/src/VBox/Main/include/MachineImpl.h (revision 42537) +++ /trunk/src/VBox/Main/include/MachineImpl.h (revision 42538) @@ -500,4 +500,6 @@ STDMETHOD(SetBootOrder)(ULONG aPosition, DeviceType_T aDevice); STDMETHOD(GetBootOrder)(ULONG aPosition, DeviceType_T *aDevice); + STDMETHOD(AttachDeviceWithoutMedium)(IN_BSTR aControllerName, LONG aControllerPort, + LONG aDevice, DeviceType_T aType); STDMETHOD(AttachDevice)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice, DeviceType_T aType, IMedium *aMedium); @@ -507,4 +509,6 @@ STDMETHOD(NonRotationalDevice)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice, BOOL aNonRotational); STDMETHOD(SetAutoDiscardForDevice)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice, BOOL aDiscard); + STDMETHOD(SetNoBandwidthGroupForDevice)(IN_BSTR aControllerName, LONG aControllerPort, + LONG aDevice); STDMETHOD(SetBandwidthGroupForDevice)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice, IBandwidthGroup *aBandwidthGroup); Index: /trunk/src/VBox/Main/include/MediumImpl.h =================================================================== --- /trunk/src/VBox/Main/include/MediumImpl.h (revision 42537) +++ /trunk/src/VBox/Main/include/MediumImpl.h (revision 42538) @@ -154,4 +154,6 @@ STDMETHOD(CloneTo)(IMedium *aTarget, ULONG aVariant, IMedium *aParent, IProgress **aProgress); + STDMETHOD(CloneToBase)(IMedium *aTarget, ULONG aVariant, + IProgress **aProgress); STDMETHOD(Compact)(IProgress **aProgress); STDMETHOD(Resize)(LONG64 aLogicalSize, IProgress **aProgress); @@ -183,5 +185,5 @@ bool getFirstRegistryMachineId(Guid &uuid) const; void markRegistriesModified(); - + HRESULT setPropertyDirect(const Utf8Str &aName, const Utf8Str &aValue); Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 42537) +++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 42538) @@ -4291,4 +4291,16 @@ } +STDMETHODIMP Machine::SetNoBandwidthGroupForDevice(IN_BSTR aControllerName, LONG aControllerPort, + LONG aDevice) +{ + int rc = S_OK; + LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%d aDevice=%d\n", + aControllerName, aControllerPort, aDevice)); + + rc = SetBandwidthGroupForDevice(aControllerName, aControllerPort, aDevice, NULL); + + return rc; +} + STDMETHODIMP Machine::SetBandwidthGroupForDevice(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice, IBandwidthGroup *aBandwidthGroup) @@ -4353,4 +4365,21 @@ return S_OK; } + +STDMETHODIMP Machine::AttachDeviceWithoutMedium(IN_BSTR aControllerName, + LONG aControllerPort, + LONG aDevice, + DeviceType_T aType) +{ + HRESULT rc = S_OK; + + LogFlowThisFunc(("aControllerName=\"%ls\" aControllerPort=%d aDevice=%d aType=%d aMedium=%p\n", + aControllerName, aControllerPort, aDevice, aType)); + + rc = AttachDevice(aControllerName, aControllerPort, aDevice, aType, NULL); + + return rc; +} + + STDMETHODIMP Machine::UnmountMedium(IN_BSTR aControllerName, Index: /trunk/src/VBox/Main/src-server/MediumImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/MediumImpl.cpp (revision 42537) +++ /trunk/src/VBox/Main/src-server/MediumImpl.cpp (revision 42538) @@ -2643,4 +2643,15 @@ return rc; +} + +STDMETHODIMP Medium::CloneToBase(IMedium *aTarget, + ULONG aVariant, + IProgress **aProgress) +{ + int rc = S_OK; + CheckComArgNotNull(aTarget); + CheckComArgOutPointerValid(aProgress); + rc = CloneTo(aTarget, aVariant, NULL, aProgress); + return rc; }