Browse Source

Revert "virtualbox5: enable storage device flushing"

This reverts commit 2351e9ce86.
cached_fs_rom
Christian Helmuth 4 months ago
parent
commit
568d0ad6f8

+ 1
- 1
repos/ports/ports/virtualbox5.hash View File

@@ -1 +1 @@
1
-7924d4f6309b52fab63175d135301da03004e53f
1
+e9340716743511dca9579b5c611862501ecd15e0

+ 0
- 11
repos/ports/src/virtualbox5/patches/drvvd.patch View File

@@ -1,11 +0,0 @@
1
---- a/src/app/virtualbox/src/VBox/Devices/Storage/DrvVD.cpp
2
-+++ b/src/app/virtualbox/src/VBox/Devices/Storage/DrvVD.cpp
3
-@@ -4611,7 +4611,7 @@
4
- #endif /* VBOX_PERIODIC_FLUSH */
5
- 
6
- #ifdef VBOX_IGNORE_FLUSH
7
--            rc = CFGMR3QueryBoolDef(pCfg, "IgnoreFlush", &pThis->fIgnoreFlush, true);
8
-+            rc = CFGMR3QueryBoolDef(pCfg, "IgnoreFlush", &pThis->fIgnoreFlush, false);
9
-             if (RT_FAILURE(rc))
10
-                 return PDMDRV_SET_ERROR(pDrvIns, rc, N_("Failed to query \"IgnoreFlush\" from the config"));
11
- 

+ 0
- 1
repos/ports/src/virtualbox5/patches/series View File

@@ -36,4 +36,3 @@ rem_mem.patch
36 36
 vga.patch
37 37
 register.patch
38 38
 changeset82265.patch
39
-drvvd.patch

+ 2
- 28
repos/ports/src/virtualbox5/patches/vmdk.patch View File

@@ -4,33 +4,7 @@ diff --git a/src/app/virtualbox/src/VBox/Storage/VMDK.cpp b/src/app/virtualbox/s
4 4
 index f749ee4..0c5d49e 100644
5 5
 --- a/src/app/virtualbox/src/VBox/Storage/VMDK.cpp
6 6
 +++ b/src/app/virtualbox/src/VBox/Storage/VMDK.cpp
7
-@@ -4378,6 +4378,7 @@
8
-     PVMDKEXTENT pExtent;
9
-     int rc = VINF_SUCCESS;
10
- 
11
-+#if 0
12
-     /* Update descriptor if changed. */
13
-     if (pImage->Descriptor.fDirty)
14
-     {
15
-@@ -4385,6 +4386,7 @@
16
-         if (RT_FAILURE(rc))
17
-             goto out;
18
-     }
19
-+#endif
20
- 
21
-     for (unsigned i = 0; i < pImage->cExtents; i++)
22
-     {
23
-@@ -4440,8 +4442,7 @@
24
-             case VMDKETYPE_FLAT:
25
-                 /** @todo implement proper path absolute check. */
26
-                 if (   pExtent->pFile != NULL
27
--                    && !(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
28
--                    && !(pExtent->pszBasename[0] == RTPATH_SLASH))
29
-+                    && !(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
30
-                     rc = vdIfIoIntFileFlush(pImage->pIfIo, pExtent->pFile->pStorage, pIoCtx,
31
-                                             NULL, NULL);
32
-                 break;
33
-@@ -5796,7 +5797,6 @@
7
+@@ -5771,7 +5771,6 @@ static int vmdkRead(void *pBackendData, uint64_t uOffset, size_t cbToRead,
34 8
                          }
35 9
                          pExtent->uGrainSectorAbs = uSectorExtentAbs;
36 10
                          pExtent->uGrain = uSectorExtentRel / pExtent->cSectorsPerGrain;
@@ -38,7 +12,7 @@ index f749ee4..0c5d49e 100644
38 12
                      }
39 13
                      vdIfIoIntIoCtxCopyTo(pImage->pIfIo, pIoCtx,
40 14
                                             (uint8_t *)pExtent->pvGrain
41
-@@ -5945,7 +5945,6 @@
15
+@@ -5920,7 +5919,6 @@ static int vmdkWrite(void *pBackendData, uint64_t uOffset, size_t cbToWrite,
42 16
                       * which is somewhere between expensive and impossible. */
43 17
                      rc = VERR_VD_VMDK_INVALID_STATE;
44 18
                      pExtent->uGrainSectorAbs = 0;

Loading…
Cancel
Save