Changeset 72999 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 9, 2018 7:59:18 AM (7 years ago)

Author:

vboxsync

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

123551

Message:

MediumImpl: Fixed MediumVariant_Formatted implementation and made it a long rather than quick format. Refactored i_openHddForReading to become flexible enough for opening for both read and write and make MediumIO use it.

Location:

trunk/src/VBox/Main/src-server

Files:

• MediumIOImpl.cpp (modified) (1 diff)
• MediumImpl.cpp (modified) (13 diffs)

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

@@ -146 +146 @@
         if (SUCCEEDED(hrc))
         {
-            hrc = pMedium->i_openHddForIO(fWritable, &m->PasswordStore, &m->pHdd, &m->LockList, &m->CryptoSettings);
+            hrc = pMedium->i_openForIO(fWritable, &m->PasswordStore, &m->pHdd, &m->LockList, &m->CryptoSettings);
             if (SUCCEEDED(hrc))
             {

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

@@ -6115 +6115 @@
         MediumLockList                  SourceMediumLockList;
         PVDISK                          pHdd;
-        hrc = i_openHddForReading(pKeyStore, &pHdd, &SourceMediumLockList, &CryptoSettingsRead);
+        hrc = i_openForIO(false /*fWritable*/, pKeyStore, &pHdd, &SourceMediumLockList, &CryptoSettingsRead);
         if (SUCCEEDED(hrc))
         {
@@ -6203 +6203 @@
                 MediumLockList                  SourceMediumLockList;
                 PVDISK                          pSrcHdd;
-                hrc = i_openHddForReading(pKeyStore, &pSrcHdd, &SourceMediumLockList, &CryptoSettingsRead);
+                hrc = i_openForIO(false /*fWritable*/, pKeyStore, &pSrcHdd, &SourceMediumLockList, &CryptoSettingsRead);
                 if (SUCCEEDED(hrc))
                 {
@@ -6540 +6540 @@
 
     return it->second;
-}
-
-/**
- * This method is intended for MediumIO::initForMedium().
- *
- * @note    Caller should not hold any medium related locks as this method will
- *          acquire the medium lock for writing and others (VirtualBox).
- *
- * @returns COM status code.
- * @param   fWritable               Flag whether the medium should be opened for writing.
- * @param   pKeyStore               Keystore containing the KeyId+password for
- *                                  an encrypted medium.
- * @param   ppHdd                   Where to return the pointer to the VDISK on
- *                                  success.
- * @param   pMediumLockList         The lock list to populate and lock.  Caller
- *                                  is responsible for calling the destructor or
- *                                  MediumLockList::Clear() after destroying
- *                                  @a *ppHdd
- * @param   pCryptoSettings         The crypto settings to use for setting up
- *                                  decryption of the VDISK.  This object must
- *                                  be alive until the VDISK is destroyed!
- *
- * @note    Using a keystore here for the KeyId+password so we can share code
- *          with appliance.  Not quite sure if that's a great idea or not...
- */
-HRESULT Medium::i_openHddForIO(bool fWritable, SecretKeyStore *pKeyStore, PVDISK *ppHdd, MediumLockList *pMediumLockList,
-                               MediumCryptoFilterSettings *pCryptoSettings)
-{
-    *ppHdd = NULL;
-    if (!fWritable)
-        return i_openHddForReading(pKeyStore, ppHdd, pMediumLockList, pCryptoSettings);
-    /** @todo implement opening for writing. */
-    return E_NOTIMPL;
 }
 
@@ -8010 +7977 @@
 
 /**
- * Creates a read-only VDISK instance for this medium.
+ * Creates a VDISK instance for this medium.
  *
  * @note    Caller should not hold any medium related locks as this method will
@@ -8016 +7983 @@
  *
  * @returns COM status code.
+ * @param   fWritable               Whether to return a writable VDISK instance
+ *                                  (true) or a read-only one (false).
  * @param   pKeyStore               The key store.
  * @param   ppHdd                   Where to return the pointer to the VDISK on
@@ -8027 +7996 @@
  *                                  must be alive until the VDISK is destroyed!
  */
-HRESULT Medium::i_openHddForReading(SecretKeyStore *pKeyStore, PVDISK *ppHdd, MediumLockList *pMediumLockList,
-                                    MediumCryptoFilterSettings *pCryptoSettingsRead)
+HRESULT Medium::i_openForIO(bool fWritable, SecretKeyStore *pKeyStore, PVDISK *ppHdd, MediumLockList *pMediumLockList,
+                            MediumCryptoFilterSettings *pCryptoSettingsRead)
 {
     /*
@@ -8034 +8003 @@
      */
     HRESULT hrc = i_createMediumLockList(true /* fFailIfInaccessible */,
-                                         NULL /* pToLockWrite */,
+                                         fWritable ? this : NULL /* pToLockWrite */,
                                          false /* fMediumLockWriteAll */,
                                          NULL,
@@ -8128 +8097 @@
          */
         MediumLockList::Base::const_iterator sourceListBegin = pMediumLockList->GetBegin();
-        MediumLockList::Base::const_iterator sourceListEnd = pMediumLockList->GetEnd();
+        MediumLockList::Base::const_iterator sourceListEnd   = pMediumLockList->GetEnd();
+        MediumLockList::Base::const_iterator mediumListLast  = sourceListEnd;
+        --mediumListLast;
+
         for (MediumLockList::Base::const_iterator it = sourceListBegin; it != sourceListEnd; ++it)
         {
@@ -8136 +8108 @@
 
             /* sanity check */
-            Assert(pMedium->m->state == MediumState_LockedRead);
+            Assert(pMedium->m->state == (fWritable && it == mediumListLast ? MediumState_LockedWrite : MediumState_LockedRead));
 
             /* Open all media in read-only mode. */
@@ -8142 +8114 @@
                          pMedium->m->strFormat.c_str(),
                          pMedium->m->strLocationFull.c_str(),
-                         VD_OPEN_FLAGS_READONLY | m->uOpenFlagsDef,
+                         m->uOpenFlagsDef | (fWritable && it == mediumListLast ? VD_OPEN_FLAGS_NORMAL : VD_OPEN_FLAGS_READONLY),
                          pMedium->m->vdImageIfaces);
             if (RT_FAILURE(vrc))
@@ -8151 +8123 @@
         }
 
-        Assert(m->state == MediumState_LockedRead);
+        Assert(m->state == (fWritable ? MediumState_LockedWrite : MediumState_LockedRead));
 
         /*
@@ -8248 +8220 @@
             {
                 if (vrc == VERR_VD_INVALID_TYPE)
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Parameters for creating the medium storage unit '%s' are invalid%s"),
-                                   location.c_str(), i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Parameters for creating the medium storage unit '%s' are invalid%s"),
+                                       location.c_str(), i_vdError(vrc).c_str());
                 else
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not create the medium storage unit '%s'%s"),
-                                   location.c_str(), i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not create the medium storage unit '%s'%s"),
+                                       location.c_str(), i_vdError(vrc).c_str());
             }
 
@@ -8260 +8232 @@
             {
                 RTVFSFILE hVfsFile;
-                vrc = RTVfsFileOpenNormal(location.c_str(), RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_ALL, &hVfsFile);
+                vrc = VDCreateVfsFileFromDisk(hdd, 0 /*fFlags*/, &hVfsFile);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Opening medium storage unit '%s' failed%s"),
-                                   location.c_str(), i_vdError(vrc).c_str());
-                vrc = RTFsFatVolFormat(hVfsFile, 0 /* offVol */, 0 /* cbVol */, RTFSFATVOL_FMT_F_QUICK,
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("Opening medium storage unit '%s' failed%s"),
+                                       location.c_str(), i_vdError(vrc).c_str());
+                RTERRINFOSTATIC ErrInfo;
+                vrc = RTFsFatVolFormat(hVfsFile, 0 /* offVol */, 0 /* cbVol */, RTFSFATVOL_FMT_F_FULL,
                                        0 /* cbSector */, 0 /* cbSectorPerCluster */, RTFSFATTYPE_INVALID,
                                        0 /* cHeads */, 0 /* cSectorsPerTrack*/, 0 /* bMedia */,
                                        0 /* cRootDirEntries */, 0 /* cHiddenSectors */,
-                                       NULL /* pErrInfo */);
+                                       RTErrInfoInitStatic(&ErrInfo));
                 RTVfsFileRelease(hVfsFile);
+                if (RT_FAILURE(vrc) && RTErrInfoIsSet(&ErrInfo.Core))
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("Formatting medium storage unit '%s' failed: %s"),
+                                       location.c_str(), ErrInfo.Core.pszMsg);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Formatting medium storage unit '%s' failed%s"),
-                                   location.c_str(), i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("Formatting medium storage unit '%s' failed%s"),
+                                       location.c_str(), i_vdError(vrc).c_str());
             }