Changeset 97359 in vbox

Timestamp:

Nov 1, 2022 1:28:02 AM (2 years ago)

Author:

vboxsync

Message:

bugref:4784 - separated SharedFolder API from being used from both Machine and Console

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -68 +68 @@
 #include "USBDeviceImpl.h"
 #include "RemoteUSBDeviceImpl.h"
-#include "SharedFolderImpl.h"
+#include "ConsoleSharedFolderImpl.h"
 #ifdef VBOX_WITH_AUDIO_VRDE
 # include "DrvAudioVRDE.h"

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

@@ -49 +49 @@
 #include "USBDeviceFiltersImpl.h"
 #include "HostImpl.h"
-#include "SharedFolderImpl.h"
+#include "MachineSharedFolderImpl.h"
 #include "GuestOSTypeImpl.h"
 #include "VirtualBoxErrorInfoImpl.h"
@@ -11896 +11896 @@
  * 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
@@ -11941 +11944 @@
             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)
                )