Changeset 98351 in vbox

Timestamp:

Jan 30, 2023 7:26:27 PM (2 years ago)

Author:

vboxsync

Message:

Main: Fix plural of "medium" in many comments.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (5 diffs)
• src-server/MachineImplCloneVM.cpp (modified) (6 diffs)
• src-server/MachineImplMoveVM.cpp (modified) (2 diffs)
• src-server/MediumImpl.cpp (modified) (9 diffs)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -6539 +6539 @@
     </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>
+      <desc>Delete all snapshots, detach all media and return hard disks and removable
+        media located in the folder of the machine to be deleted and referenced only
+        by this machine, for closing.</desc>
     </const>
   </enum>

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

@@ -1146 +1146 @@
      *   "cannot be closed because it is still attached to 1 virtual machines"
      * because at this point we did not call uninitDataAndChildObjects() yet
-     * and therefore also removeBackReference() for all these mediums was not called! */
+     * and therefore also removeBackReference() for all these media was not called! */
 
     if (uuidMachine.isValid() && !uuidMachine.isZero())     // can be empty if we're called from a failure of Machine::init
@@ -11838 +11838 @@
  * 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
+ * CleanupMode_DetachAllReturnHardDisksAndVMRemovable adds hard disks and
+ * also removable media if they are located in the VM folder and referenced
  * only by this VM (media prepared by unattended installer).
  *
@@ -11907 +11907 @@
                 lock.release();
                 /*
-                 * Search for medias which are not attached to any machine, but
-                 * in the chain to an attached disk. Mediums are only consided
+                 * Search for media which are not attached to any machine, but
+                 * in the chain to an attached disk. Media are only consided
                  * if they are:
                  * - have only one child
@@ -16588 +16588 @@
         Bstr bstrNewPassword(task.mstrNewPassword);
         Bstr bstrNewPasswordId(task.mstrNewPasswordId);
-        /* encrypt mediums */
+        /* encrypt media */
         alock.release();
         for (MediaList::iterator it = task.mllMedia.begin();
@@ -16695 +16695 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    /* define mediums to be change encryption */
+    /* define media to be change encryption */
 
     MediaList llMedia;

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

@@ -387 +387 @@
                                                                    bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight)
 {
-    /* This is basically a three step approach. First select all medias
+    /* This is basically a three step approach. First select all media
      * directly or indirectly involved in the clone. Second create a histogram
-     * of the usage of all that medias. Third select the medias which are
+     * of the usage of all that media. Third select the media which are
      * directly attached or have more than one directly/indirectly used child
      * in the new clone. Step one and two are done in the first loop.
@@ -419 +419 @@
     Assert(!fAttachLinked);
     HRESULT hrc = S_OK;
-    std::map<ComPtr<IMedium>, uint32_t> mediaHist; /* Our usage histogram for the medias */
+    std::map<ComPtr<IMedium>, uint32_t> mediaHist; /* Our usage histogram for the media */
     for (size_t i = 0; i < machineList.size(); ++i)
     {
@@ -458 +458 @@
             while (!pSrcMedium.isNull())
             {
-                /* Build a histogram of used medias and the parent chain. */
+                /* Build a histogram of used media and the parent chain. */
                 ++mediaHist[pSrcMedium];
 
@@ -1000 +1000 @@
         }
 
-        /* We have different approaches for getting the medias which needs to
+        /* We have different approaches for getting the media which needs to
          * be replicated based on the clone mode the user requested (this is
          * mostly about the full clone mode).
@@ -1182 +1182 @@
         bool fKeepDiskNames = d->options.contains(CloneOptions_KeepDiskNames);
 
-        /* We need to create a map with the already created medias. This is
+        /* We need to create a map with the already created media. This is
          * necessary, cause different snapshots could have the same
          * parents/parent chain. If a medium is in this map already, it isn't
@@ -1646 +1646 @@
                                       tr("Could not delete file '%s' (%Rrc)"), newFiles.at(i).c_str(), vrc);
         }
-        /* Delete all already created medias. (Reverse, cause there could be
+        /* Delete all already created media. (Reverse, cause there could be
          * parent->child relations.) */
         for (size_t i = newMedia.size(); i > 0; --i)

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

@@ -959 +959 @@
         Machine::Data *machineData = machine->mData.data();
 
-        /* Restoring the original mediums */
+        /* Restoring the original media */
         try
         {
@@ -1081 +1081 @@
         {
             hrc = aRc;
-            Log2(("Rollback scenario: restoration the original mediums were failed. Machine can be corrupted.\n"));
+            Log2(("Rollback scenario: restoration the original media failed. Machine can be corrupted.\n"));
         }
         catch (...)
         {
-            Log2(("Rollback scenario: restoration the original mediums were failed. Machine can be corrupted.\n"));
+            Log2(("Rollback scenario: restoration the original media failed. Machine can be corrupted.\n"));
             hrc = VirtualBoxBase::handleUnexpectedExceptions(machine, RT_SRC_POS);
         }

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

@@ -1064 +1064 @@
        )
     {
-        /* Storage for mediums of this format can neither be explicitly
+        /* Storage for media of this format can neither be explicitly
          * created by VirtualBox nor deleted, so we place the medium to
          * Inaccessible state here and also add it to the registry. The
@@ -5446 +5446 @@
  * @param aWait             @c true if this method should block instead of
  *                          creating an asynchronous thread.
- * @param aNotify           Notify about mediums which metadatа are changed
+ * @param aNotify           Notify about media for which metadata is changed
  *                          during execution of the function.
  *
@@ -5730 +5730 @@
  * @param aWait         @c true if this method should block instead of creating
  *                      an asynchronous thread.
- * @param aNotify       Notify about mediums which metadatа are changed
+ * @param aNotify       Notify about media for which metadata is changed
  *                      during execution of the function.
  *
@@ -6549 +6549 @@
  * @param aWait         @c true if this method should block instead of creating
  *                      an asynchronous thread.
- * @param aNotify       Notify about mediums which metadatа are changed
+ * @param aNotify       Notify about media for which metadata is changed
  *                      during execution of the function.
  *
@@ -6730 +6730 @@
  * @param aWait         @c true if this method should block instead of creating
  *                      an asynchronous thread.
- * @param aNotify       Notify about mediums which metadatа are changed
+ * @param aNotify       Notify about media for which metadata is changed
  *                      during execution of the function.
  *
@@ -7083 +7083 @@
  * @param aParent               Parent medium. May be NULL.
  * @param aProgress             Progress object to use.
- * @param aNotify               Notify about mediums which metadatа are changed
+ * @param aNotify               Notify about media for which metadata is changed
  *                              during execution of the function.
  * @return
@@ -7197 +7197 @@
  *                           same content as the given image in the source chain.
  *                           Use UINT32_MAX to disable this optimization.
- * @param aNotify            Notify about mediums which metadatа are changed
+ * @param aNotify            Notify about media for which metadata is changed
  *                           during execution of the function.
  * @return
@@ -9317 +9317 @@
             if (i_isMediumFormatFile())
             {
-                // Have to make own lock list, because "resize" method resizes only last image
-                // in the lock chain. The lock chain already in the task.mpMediumLockList, so
-                // just make new lock list based on it. In fact the own lock list neither makes
-                // double locking of mediums nor unlocks them during delete, because medium
-                // already locked by task.mpMediumLockList and own list is used just to specify
-                // what "resize" method should resize.
-
+                /// @todo r=klaus Can this use the standard code for creating a medium lock list?
+                // Have to make own lock list, because "resize" method resizes the last image
+                // in the lock chain only. The lock chain is already in the task.mpMediumLockList,
+                // so just make new lock list based on it, with the right last medium. The own
+                // lock list skips double locking and therefore does not affect the general lock
+                // state after the "resize" method.
                 MediumLockList* pMediumLockListForResize = new MediumLockList();
 
@@ -9337 +9336 @@
 
                 // just to switch internal state of the lock list to avoid errors during list deletion,
-                // because all meduims in the list already locked by task.mpMediumLockList
+                // because all media in the list already locked by task.mpMediumLockList
                 HRESULT hrc = pMediumLockListForResize->Lock(true /* fSkipOverLockedMedia */);
                 if (FAILED(hrc))

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

@@ -2728 +2728 @@
  *
  * So far we only have encrypted iSCSI initiator secrets so we just go through
- * all hard disk mediums and determine the plain 'InitiatorSecret' from
+ * all hard disk media and determine the plain 'InitiatorSecret' from
  * 'InitiatorSecretEncrypted. The latter is stored as Base64 because medium
  * properties need to be null-terminated strings.