Changeset 27232 in vbox for trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

Timestamp:

Mar 9, 2010 9:05:57 PM (15 years ago)

Author:

vboxsync

Message:

Storage/VBoxHDD+DrvVD: implement framework for providing thread synchronization. Additionally some cleanup to resolve a few minor long-standing todos.

File:

• trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -587 +587 @@
                                                            : 0,
                                                          NULL,
+                                                         pImage->pVDIfsDisk,
                                                          &pVmdkFile->pStorage);
         pVmdkFile->fAsyncIO = true;
@@ -3487 +3488 @@
 static int vmdkCreateRegularImage(PVMDKIMAGE pImage, uint64_t cbSize,
                                   unsigned uImageFlags,
-                                  PFNVMPROGRESS pfnProgress, void *pvUser,
+                                  PFNVDPROGRESS pfnProgress, void *pvUser,
                                   unsigned uPercentStart, unsigned uPercentSpan)
 {
@@ -3626 +3627 @@
                 if (pfnProgress)
                 {
-                    rc = pfnProgress(NULL /* WARNING! pVM=NULL */,
-                                     uPercentStart + uOff * uPercentSpan / cbExtent,
-                                     pvUser);
+                    rc = pfnProgress(pvUser,
+                                     uPercentStart + uOff * uPercentSpan / cbExtent);
                     if (RT_FAILURE(rc))
                     {
@@ -3695 +3695 @@
 
         if (RT_SUCCESS(rc) && pfnProgress)
-            pfnProgress(NULL /* WARNING! pVM=NULL */,
-                        uPercentStart + i * uPercentSpan / cExtents,
-                        pvUser);
+            pfnProgress(pvUser, uPercentStart + i * uPercentSpan / cExtents);
 
         cbRemaining -= cbExtent;
@@ -3746 +3744 @@
                            PCPDMMEDIAGEOMETRY pPCHSGeometry,
                            PCPDMMEDIAGEOMETRY pLCHSGeometry, PCRTUUID pUuid,
-                           PFNVMPROGRESS pfnProgress, void *pvUser,
+                           PFNVDPROGRESS pfnProgress, void *pvUser,
                            unsigned uPercentStart, unsigned uPercentSpan)
 {
@@ -3793 +3791 @@
 
     if (RT_SUCCESS(rc) && pfnProgress)
-        pfnProgress(NULL /* WARNING! pVM=NULL */,
-                    uPercentStart + uPercentSpan * 98 / 100, pvUser);
+        pfnProgress(pvUser, uPercentStart + uPercentSpan * 98 / 100);
 
     pImage->cbSize = cbSize;
@@ -3880 +3877 @@
 
     if (RT_SUCCESS(rc) && pfnProgress)
-        pfnProgress(NULL /* WARNING! pVM=NULL */,
-                    uPercentStart + uPercentSpan * 99 / 100, pvUser);
+        pfnProgress(pvUser, uPercentStart + uPercentSpan * 99 / 100);
 
     rc = vmdkFlushImage(pImage);
@@ -3887 +3883 @@
 out:
     if (RT_SUCCESS(rc) && pfnProgress)
-        pfnProgress(NULL /* WARNING! pVM=NULL */,
-                    uPercentStart + uPercentSpan, pvUser);
+        pfnProgress(pvUser, uPercentStart + uPercentSpan);
 
     if (RT_FAILURE(rc))
@@ -4515 +4510 @@
     PVMDKIMAGE pImage;
 
-    PFNVMPROGRESS pfnProgress = NULL;
+    PFNVDPROGRESS pfnProgress = NULL;
     void *pvUser = NULL;
     PVDINTERFACE pIfProgress = VDInterfaceGet(pVDIfsOperation,