Changeset 98035 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 10, 2023 6:35:56 AM (2 years ago)

Author:

vboxsync

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

155131

Message:

reimplemented changes for bugref:10180 after seperating the changes from bugref:4787

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (2 diffs)
• src-server/MediumImpl.cpp (modified) (1 diff)
• src-server/UnattendedImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -6523 +6523 @@
     <desc>Cleanup mode, used with <link to="IMachine::unregister" />.
     </desc>
-    <const name="UnregisterOnly"                  value="1">
+    <const name="UnregisterOnly"                          value="1">
       <desc>Unregister only the machine, but neither delete snapshots nor detach media.</desc>
     </const>
-    <const name="DetachAllReturnNone"             value="2">
+    <const name="DetachAllReturnNone"                     value="2">
       <desc>Delete all snapshots and detach all media but return none; this will keep all media registered.</desc>
     </const>
-    <const name="DetachAllReturnHardDisksOnly"    value="3">
+    <const name="DetachAllReturnHardDisksOnly"            value="3">
       <desc>Delete all snapshots, detach all media and return hard disks for closing, but not removable media.</desc>
     </const>
-    <const name="Full"                            value="4">
+    <const name="Full"                                    value="4">
       <desc>Delete all snapshots, detach all media and return all media for closing.</desc>
+    </const>
+    <const name="DetachAllReturnHardDisksAndVMRemovable"  value="5">
+      <desc>Delete all snapshots, detach all media and return hard disks and removable locating in the folder of the machine to be deleted and referenced only to this machine, for closing.</desc>
     </const>
   </enum>

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -11897 +11897 @@
  * adds hard disks to the list. If it is CleanupMode_Full, this adds all
  * media to the list.
+ * CleanupMode_DetachAllReturnHardDisksAndVMRemovable adds hard disk and
+ * also removable medias if they are located in the VM folder and referenced
+ * only by this VM (media prepared by unattended installer).
  *
  * This gets called from Machine::Unregister, both for the actual Machine and
@@ -11942 +11945 @@
             AutoReadLock lock(pMedium COMMA_LOCKVAL_SRC_POS);
             DeviceType_T devType = pMedium->i_getDeviceType();
+            size_t cBackRefs = pMedium->i_getMachineBackRefCount();
+            Utf8Str strMediumLocation = pMedium->i_getLocationFull();
+            strMediumLocation.stripFilename();
+            Utf8Str strMachineFolder =  i_getSettingsFileFull();
+            strMachineFolder.stripFilename();
             if (    (    cleanupMode == CleanupMode_DetachAllReturnHardDisksOnly
                       && devType == DeviceType_HardDisk)
+                 || (    cleanupMode == CleanupMode_DetachAllReturnHardDisksAndVMRemovable
+                      && (    devType == DeviceType_HardDisk
+                           || (    cBackRefs <= 1
+                                && strMediumLocation == strMachineFolder
+                                && *pMedium->i_getFirstMachineBackrefId() == i_getId())))
                  || (cleanupMode == CleanupMode_Full)
                )

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -1061 +1061 @@
 
     if (!(m->formatObj->i_getCapabilities() & (  MediumFormatCapabilities_CreateFixed
-                                               | MediumFormatCapabilities_CreateDynamic))
+                                               | MediumFormatCapabilities_CreateDynamic
+                                               | MediumFormatCapabilities_File))
        )
     {

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -141 +141 @@
     bool            fMountOnly;
     Utf8Str         strImagePath;
+    bool            fAuxiliary;
 
     UnattendedInstallationDisk(StorageBus_T a_enmBusType, Utf8Str const &a_rBusName, DeviceType_T a_enmDeviceType,
                                AccessMode_T a_enmAccessType, LONG a_iPort, LONG a_iDevice, bool a_fMountOnly,
-                               Utf8Str const &a_rImagePath)
+                               Utf8Str const &a_rImagePath, bool a_fAuxiliary)
         : enmBusType(a_enmBusType), strControllerName(a_rBusName), enmDeviceType(a_enmDeviceType), enmAccessType(a_enmAccessType)
-        , iPort(a_iPort), iDevice(a_iDevice), fMountOnly(a_fMountOnly), strImagePath(a_rImagePath)
+        , iPort(a_iPort), iDevice(a_iDevice), fMountOnly(a_fMountOnly), strImagePath(a_rImagePath), fAuxiliary(a_fAuxiliary)
     {
         Assert(strControllerName.length() > 0);
     }
 
-    UnattendedInstallationDisk(std::list<ControllerSlot>::const_iterator const &itDvdSlot, Utf8Str const &a_rImagePath)
+    UnattendedInstallationDisk(std::list<ControllerSlot>::const_iterator const &itDvdSlot, Utf8Str const &a_rImagePath,
+                               bool a_fAuxiliary)
         : enmBusType(itDvdSlot->enmBus), strControllerName(itDvdSlot->strControllerName), enmDeviceType(DeviceType_DVD)
         , enmAccessType(AccessMode_ReadOnly), iPort(itDvdSlot->iPort), iDevice(itDvdSlot->iDevice)
-        , fMountOnly(!itDvdSlot->fFree), strImagePath(a_rImagePath)
+        , fMountOnly(!itDvdSlot->fFree), strImagePath(a_rImagePath), fAuxiliary(a_fAuxiliary)
     {
         Assert(strControllerName.length() > 0);
@@ -3052 +3054 @@
                                                                  0, 0,
                                                                  fFoundPort0Dev0 /*fMountOnly*/,
-                                                                 mpInstaller->getAuxiliaryFloppyFilePath()));
+                                                                 mpInstaller->getAuxiliaryFloppyFilePath(), false));
     return S_OK;
 }
@@ -3211 +3213 @@
     if (mpInstaller->isAuxiliaryIsoNeeded() && mpInstaller->bootFromAuxiliaryIso())
     {
-        rVecInstallatationDisks.push_back(UnattendedInstallationDisk(itDvdSlot, mpInstaller->getAuxiliaryIsoFilePath()));
+        rVecInstallatationDisks.push_back(UnattendedInstallationDisk(itDvdSlot, mpInstaller->getAuxiliaryIsoFilePath(), true));
         ++itDvdSlot;
     }
@@ -3217 +3219 @@
     if (mpInstaller->isOriginalIsoNeeded())
     {
-        rVecInstallatationDisks.push_back(UnattendedInstallationDisk(itDvdSlot, i_getIsoPath()));
+        rVecInstallatationDisks.push_back(UnattendedInstallationDisk(itDvdSlot, i_getIsoPath(), false));
         ++itDvdSlot;
     }
@@ -3223 +3225 @@
     if (mpInstaller->isAuxiliaryIsoNeeded() && !mpInstaller->bootFromAuxiliaryIso())
     {
-        rVecInstallatationDisks.push_back(UnattendedInstallationDisk(itDvdSlot, mpInstaller->getAuxiliaryIsoFilePath()));
+        rVecInstallatationDisks.push_back(UnattendedInstallationDisk(itDvdSlot, mpInstaller->getAuxiliaryIsoFilePath(), true));
         ++itDvdSlot;
     }
@@ -3230 +3232 @@
     if (mpInstaller->isAdditionsIsoNeeded())
     {
-        rVecInstallatationDisks.push_back(UnattendedInstallationDisk(itDvdSlot, i_getAdditionsIsoPath()));
+        rVecInstallatationDisks.push_back(UnattendedInstallationDisk(itDvdSlot, i_getAdditionsIsoPath(), false));
         ++itDvdSlot;
     }
@@ -3236 +3238 @@
     if (mpInstaller->isValidationKitIsoNeeded())
     {
-        rVecInstallatationDisks.push_back(UnattendedInstallationDisk(itDvdSlot, i_getValidationKitIsoPath()));
+        rVecInstallatationDisks.push_back(UnattendedInstallationDisk(itDvdSlot, i_getValidationKitIsoPath(), false));
         ++itDvdSlot;
     }
@@ -4207 +4209 @@
 
     ComPtr<IMedium> ptrMedium;
-    HRESULT rc = mParent->OpenMedium(Bstr(pImage->strImagePath).raw(),
+    HRESULT hrc = mParent->OpenMedium(Bstr(pImage->strImagePath).raw(),
                                      pImage->enmDeviceType,
                                      pImage->enmAccessType,
                                      true,
                                      ptrMedium.asOutParam());
-    LogRelFlowFunc(("VirtualBox::openMedium -> %Rhrc\n", rc));
-    if (SUCCEEDED(rc))
-    {
+    LogRelFlowFunc(("VirtualBox::openMedium -> %Rhrc\n", hrc));
+    if (SUCCEEDED(hrc))
+    {
+        if (pImage->fAuxiliary && pImage->strImagePath.endsWith(".viso"))
+        {
+            hrc = ptrMedium->SetProperty(Bstr("UnattendedInstall").raw(), Bstr("1").raw());
+            LogRelFlowFunc(("Medium::SetProperty -> %Rhrc\n", hrc));
+        }
         if (pImage->fMountOnly)
         {
             // mount the opened disk image
-            rc = rPtrSessionMachine->MountMedium(Bstr(pImage->strControllerName).raw(), pImage->iPort,
-                                                 pImage->iDevice, ptrMedium, TRUE /*fForce*/);
-            LogRelFlowFunc(("Machine::MountMedium -> %Rhrc\n", rc));
+            hrc = rPtrSessionMachine->MountMedium(Bstr(pImage->strControllerName).raw(), pImage->iPort,
+                                                  pImage->iDevice, ptrMedium, TRUE /*fForce*/);
+            LogRelFlowFunc(("Machine::MountMedium -> %Rhrc\n", hrc));
         }
         else
         {
             //attach the opened disk image to the controller
-            rc = rPtrSessionMachine->AttachDevice(Bstr(pImage->strControllerName).raw(), pImage->iPort,
-                                                  pImage->iDevice, pImage->enmDeviceType, ptrMedium);
-            LogRelFlowFunc(("Machine::AttachDevice -> %Rhrc\n", rc));
+            hrc = rPtrSessionMachine->AttachDevice(Bstr(pImage->strControllerName).raw(), pImage->iPort,
+                                                   pImage->iDevice, pImage->enmDeviceType, ptrMedium);
+            LogRelFlowFunc(("Machine::AttachDevice -> %Rhrc\n", hrc));
         }
     }
 
     rLock.acquire();
-    return rc;
+    return hrc;
 }