diff options
| author | Felix Geyer <fgeyer@debian.org> | 2014-04-05 22:17:15 +0200 |
|---|---|---|
| committer | Felix Geyer <fgeyer@debian.org> | 2014-04-05 22:17:15 +0200 |
| commit | 1700c7d32f7d9d101cbba9f1fcb8bb57ed16a727 (patch) | |
| tree | 727251ad65172262944f82bb0f28601c3fb6f6b3 /src/VBox/Storage | |
| parent | 1e85aed889b772c2f2daa7a6d9e8bd967aa213d8 (diff) | |
| download | virtualbox-upstream.tar.gz | |
Imported Upstream version 4.3.10-dfsgupstream/4.3.10-dfsgupstream
Diffstat (limited to 'src/VBox/Storage')
| -rw-r--r-- | src/VBox/Storage/VD.cpp | 2 | ||||
| -rw-r--r-- | src/VBox/Storage/VHD.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/VBox/Storage/VD.cpp b/src/VBox/Storage/VD.cpp index 12535998b..5632e133b 100644 --- a/src/VBox/Storage/VD.cpp +++ b/src/VBox/Storage/VD.cpp @@ -1917,7 +1917,7 @@ static int vdParentRead(void *pvUser, uint64_t uOffset, void *pvBuf, Segment.cbSeg = cbRead; RTSgBufInit(&SgBuf, &Segment, 1); vdIoCtxInit(&IoCtx, pParentState->pDisk, VDIOCTXTXDIR_READ, uOffset, cbRead, pParentState->pImage, - &SgBuf, NULL, NULL, VDIOCTX_FLAGS_SYNC); + &SgBuf, NULL, NULL, VDIOCTX_FLAGS_SYNC | VDIOCTX_FLAGS_ZERO_FREE_BLOCKS); int rc = vdReadHelperAsync(&IoCtx); ASMAtomicXchgBool(&pParentState->pDisk->fLocked, false); return rc; diff --git a/src/VBox/Storage/VHD.cpp b/src/VBox/Storage/VHD.cpp index 3af2eba8e..c563a267c 100644 --- a/src/VBox/Storage/VHD.cpp +++ b/src/VBox/Storage/VHD.cpp @@ -2462,7 +2462,7 @@ static int vhdCompact(void *pBackendData, unsigned uPercentStart, if (pfnParentRead) { pvParent = RTMemTmpAlloc(pImage->cbDataBlock); - AssertBreakStmt(VALID_PTR(pvBuf), rc = VERR_NO_MEMORY); + AssertBreakStmt(VALID_PTR(pvParent), rc = VERR_NO_MEMORY); } pvBuf = RTMemTmpAlloc(pImage->cbDataBlock); AssertBreakStmt(VALID_PTR(pvBuf), rc = VERR_NO_MEMORY); |