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

Timestamp:

Jul 4, 2018 3:22:02 PM (7 years ago)

Author:

vboxsync

Message:

Main/Medium: add API flag for creating formatted floppy images
Frontends/VBoxManage: matching CLI code

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImplCloneVM.cpp (modified) (1 diff)
• MediumImpl.cpp (modified) (14 diffs)

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

@@ -1250 +1250 @@
                         srcLock.release();
                         rc = pLMedium->i_cloneToEx(pTarget,
-                                                   srcVar,
+                                                   (MediumVariant_T)srcVar,
                                                    pNewParent,
                                                    progress2.asOutParam(),

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

@@ -38 +38 @@
 #include <iprt/memsafer.h>
 #include <iprt/base64.h>
+#include <iprt/vfs.h>
+#include <iprt/fsvfs.h>
 
 #include <VBox/vd.h>
@@ -2594 +2596 @@
                            m->strFormat.c_str());
 
+        if (    (mediumVariantFlags & MediumVariant_Formatted)
+            &&  i_getDeviceType() != DeviceType_Floppy)
+            throw setError(VBOX_E_NOT_SUPPORTED,
+                           tr("Medium variant 'formatted' applies to floppy images only"));
+
         if (m->state != MediumState_NotCreated)
             throw i_setStateError();
@@ -2610 +2617 @@
         pTask = new Medium::CreateBaseTask(this, pProgress, aLogicalSize,
                                            (MediumVariant_T)mediumVariantFlags);
-                                           //(MediumVariant_T)aVariant);
         rc = pTask->rc();
         AssertComRC(rc);
@@ -2749 +2755 @@
     }
 
+    if (mediumVariantFlags & MediumVariant_Formatted)
+    {
+        delete pMediumLockList;
+        return setError(VBOX_E_NOT_SUPPORTED,
+                        tr("Medium variant 'formatted' applies to floppy images only"));
+    }
+
     rc = i_createDiffStorage(diff, (MediumVariant_T)mediumVariantFlags, pMediumLockList,
                              &pProgress, false /* aWait */);
@@ -2915 +2928 @@
             for (size_t i = 0; i < aVariant.size(); i++)
                 mediumVariantFlags |= (ULONG)aVariant[i];
+        }
+
+        if (mediumVariantFlags & MediumVariant_Formatted)
+        {
+            delete pSourceMediumLockList;
+            delete pTargetMediumLockList;
+            throw setError(VBOX_E_NOT_SUPPORTED,
+                           tr("Medium variant 'formatted' applies to floppy images only"));
         }
 
@@ -6227 +6248 @@
                                          false /* fMoveByRename */,
                                          0 /* cbSize */,
-                                         aVariant & ~MediumVariant_NoCreateDir,
+                                         aVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted),
                                          NULL /* pDstUuid */,
                                          VD_OPEN_FLAGS_NORMAL | VD_OPEN_FLAGS_SEQUENTIAL,
@@ -6376 +6397 @@
  * @return
  */
-HRESULT Medium::i_cloneToEx(const ComObjPtr<Medium> &aTarget, ULONG aVariant,
+HRESULT Medium::i_cloneToEx(const ComObjPtr<Medium> &aTarget, MediumVariant_T aVariant,
                             const ComObjPtr<Medium> &aParent, IProgress **aProgress,
                             uint32_t idxSrcImageSame, uint32_t idxDstImageSame)
@@ -6480 +6501 @@
 
         /* setup task object to carry out the operation asynchronously */
-        pTask = new Medium::CloneTask(this, pProgress, aTarget,
-                                      (MediumVariant_T)aVariant,
+        pTask = new Medium::CloneTask(this, pProgress, aTarget, aVariant,
                                       aParent, idxSrcImageSame,
                                       idxDstImageSame, pSourceMediumLockList,
@@ -8187 +8207 @@
                                location.c_str(),
                                task.mSize,
-                               task.mVariant & ~MediumVariant_NoCreateDir,
+                               task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted),
                                NULL,
                                &geo,
@@ -8204 +8224 @@
                     throw setError(VBOX_E_FILE_ERROR,
                                    tr("Could not create the medium storage unit '%s'%s"),
+                                   location.c_str(), i_vdError(vrc).c_str());
+            }
+
+            if (task.mVariant & MediumVariant_Formatted)
+            {
+                RTVFSFILE hVfsFile;
+                vrc = RTVfsFileOpenNormal(location.c_str(), RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_ALL, &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,
+                                       0 /* cbSector */, 0 /* cbSectorPerCluster */, RTFSFATTYPE_INVALID,
+                                       0 /* cHeads */, 0 /* cSectorsPerTrack*/, 0 /* bMedia */,
+                                       0 /* cRootDirEntries */, 0 /* cHiddenSectors */,
+                                       NULL /* pErrInfo */);
+                RTVfsFileRelease(hVfsFile);
+                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());
             }
@@ -8379 +8419 @@
                                targetFormat.c_str(),
                                targetLocation.c_str(),
-                               (task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_VmdkESX)) | VD_IMAGE_FLAGS_DIFF,
+                                 (task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted | MediumVariant_VmdkESX))
+                               | VD_IMAGE_FLAGS_DIFF,
                                NULL,
                                targetId.raw(),
@@ -8975 +9016 @@
                                  false /* fMoveByRename */,
                                  0 /* cbSize */,
-                                 task.mVariant & ~MediumVariant_NoCreateDir,
+                                 task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted),
                                  targetId.raw(),
                                  VD_OPEN_FLAGS_NORMAL | m->uOpenFlagsDef,
@@ -8993 +9034 @@
                                    task.midxSrcImageSame,
                                    task.midxDstImageSame,
-                                   task.mVariant & ~MediumVariant_NoCreateDir,
+                                   task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted),
                                    targetId.raw(),
                                    VD_OPEN_FLAGS_NORMAL | m->uOpenFlagsDef,
@@ -9864 +9905 @@
                              false /* fMoveByRename */,
                              0 /* cbSize */,
-                             task.mVariant & ~MediumVariant_NoCreateDir,
+                             task.mVariant & ~(MediumVariant_NoCreateDir | MediumVariant_Formatted),
                              targetId.raw(),
                              VD_OPEN_FLAGS_NORMAL,