|
@@ -3797,18 +3797,19 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length)
|
|
|
}
|
|
|
|
|
|
ret = fallocate(rb->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
|
|
|
- start, length);
|
|
|
+ start + rb->fd_offset, length);
|
|
|
if (ret) {
|
|
|
ret = -errno;
|
|
|
- error_report("%s: Failed to fallocate %s:%" PRIx64 " +%zx (%d)",
|
|
|
- __func__, rb->idstr, start, length, ret);
|
|
|
+ error_report("%s: Failed to fallocate %s:%" PRIx64 "+%" PRIx64
|
|
|
+ " +%zx (%d)", __func__, rb->idstr, start,
|
|
|
+ rb->fd_offset, length, ret);
|
|
|
goto err;
|
|
|
}
|
|
|
#else
|
|
|
ret = -ENOSYS;
|
|
|
error_report("%s: fallocate not available/file"
|
|
|
- "%s:%" PRIx64 " +%zx (%d)",
|
|
|
- __func__, rb->idstr, start, length, ret);
|
|
|
+ "%s:%" PRIx64 "+%" PRIx64 " +%zx (%d)", __func__,
|
|
|
+ rb->idstr, start, rb->fd_offset, length, ret);
|
|
|
goto err;
|
|
|
#endif
|
|
|
}
|
|
@@ -3855,6 +3856,7 @@ int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start,
|
|
|
int ret = -1;
|
|
|
|
|
|
#ifdef CONFIG_FALLOCATE_PUNCH_HOLE
|
|
|
+ /* ignore fd_offset with guest_memfd */
|
|
|
ret = fallocate(rb->guest_memfd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
|
|
|
start, length);
|
|
|
|