1f0277483b
- block: bugfix: Don't pause vm when NOSPACE EIO happened - block: enable cache mode of empty cdrom - block/mirror: fix file-system went to read-only after block-mirror - scsi-bus: fix incorrect call for blk_error_retry_reset_timeout() - scsi-bus: fix unmatched object_unref() - block: Add sanity check when setting retry parameters - block-backend: Stop retrying when draining - scsi-disk: Add support for retry on errors - scsi-bus: Refactor the code that retries requests - virtio_blk: Add support for retry on errors - block: Add error retry param setting - block-backend: Add timeout support for retry - block-backend: Enable retry action on errors - block-backend: Add device specific retry callback - block-backend: Introduce retry timer - qapi/block-core: Add retry option for error action - scsi: bugfix: fix division by zero - scsi: cdrom: Fix crash after remote cdrom detached - qemu-pr: fixed ioctl failed for multipath disk - scsi-disk: define props in scsi_block_disk to avoid memleaks - bugfix: fix possible memory leak - bugfix: fix some illegal memory access and memory leak - util/log: add CONFIG_DISABLE_QEMU_LOG macro - log: Add some logs on VM runtime path - bugfix: fix eventfds may double free when vm_id reused in ivshmem - hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() - hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() - qemu-img create: 'cache' paramter only use for reg file image - qemu-img: add qemu-img direct create - qemu-img block: set zero flags only when discard_zeros of the block supported - Revert "file-posix: Remove unused s->discard_zeroes" - pcie_sriov: Validate NumVFs (CVE-2024-26327) - hw/nvme: Use pcie_sriov_num_vfs() (CVE-2024-26328) - hw/acpi/cpu: Use CPUState typedef - target/i386/sev: Fix missing ERRP_GUARD() for error_prepend() - virtio-gpu: remove needless condition - hw/i2c/smbus_slave: Add object path on error prints - vfio/pci: Ascend710 change to bar2 quirk - vfio/pci: Ascend910 need 4Bytes quirk in bar0 - vfio/pci: Ascend710 need 4Bytes quirk in bar0 - vfio/pci: Ascend310 need 4Bytes quirk in bar4 - chardev/char-socket: Fix TLS io channels sending too much data to the backend - i386/cpuid: Move leaf 7 to correct group - i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F - i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs - i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available - blkio: Respect memory-alignment for bounce buffer allocations - virtio-gpu: Correct virgl_renderer_resource_get_info() error check - hw/usb: Style cleanup - tests/qemu-iotests: resolved the problem that the 108 test cases in the container fail Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 404d45bf9147058a475a8031c454a6c8e0acc123)
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From db37bc0d85e141a666dd287cdc562a47f29b4343 Mon Sep 17 00:00:00 2001
|
|
From: Jinhua Cao <caojinhua1@huawei.com>
|
|
Date: Mon, 18 Mar 2024 10:01:28 +0800
|
|
Subject: [PATCH] Revert "file-posix: Remove unused s->discard_zeroes"
|
|
|
|
This reverts commit a7ca2eb488ff149c898f43abe103f8bd8e3ca3c4.
|
|
---
|
|
block/file-posix.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/block/file-posix.c b/block/file-posix.c
|
|
index b862406c71..01ae5fd88c 100644
|
|
--- a/block/file-posix.c
|
|
+++ b/block/file-posix.c
|
|
@@ -158,6 +158,7 @@ typedef struct BDRVRawState {
|
|
|
|
bool has_discard:1;
|
|
bool has_write_zeroes:1;
|
|
+ bool discard_zeroes:1;
|
|
bool use_linux_aio:1;
|
|
bool use_linux_io_uring:1;
|
|
int page_cache_inconsistent; /* errno from fdatasync failure */
|
|
@@ -765,6 +766,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
|
|
ret = -EINVAL;
|
|
goto fail;
|
|
} else {
|
|
+ s->discard_zeroes = true;
|
|
s->has_fallocate = true;
|
|
}
|
|
} else {
|
|
@@ -790,12 +792,19 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
|
|
#endif
|
|
|
|
if (S_ISBLK(st.st_mode)) {
|
|
+#ifdef BLKDISCARDZEROES
|
|
+ unsigned int arg;
|
|
+ if (ioctl(s->fd, BLKDISCARDZEROES, &arg) == 0 && arg) {
|
|
+ s->discard_zeroes = true;
|
|
+ }
|
|
+#endif
|
|
#ifdef __linux__
|
|
/* On Linux 3.10, BLKDISCARD leaves stale data in the page cache. Do
|
|
* not rely on the contents of discarded blocks unless using O_DIRECT.
|
|
* Same for BLKZEROOUT.
|
|
*/
|
|
if (!(bs->open_flags & BDRV_O_NOCACHE)) {
|
|
+ s->discard_zeroes = false;
|
|
s->has_write_zeroes = false;
|
|
}
|
|
#endif
|
|
--
|
|
2.27.0
|
|
|