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)
64 lines
1.8 KiB
Diff
64 lines
1.8 KiB
Diff
From cfc15dc456126a6fb811f0c51af8d8ce5c4a4a1b Mon Sep 17 00:00:00 2001
|
|
From: yexiao <yexiao7@huawei.com>
|
|
Date: Thu, 21 Jan 2021 15:46:45 +0800
|
|
Subject: [PATCH] qapi/block-core: Add retry option for error action
|
|
|
|
Add a new error action 'retry' to support retry on errors.
|
|
|
|
Signed-off-by: Jiahui Cen <cenjiahui(a)huawei.com>
|
|
Signed-off-by: Ying Fang <fangying1(a)huawei.com>
|
|
Signed-off-by: Alex Chen <alex.chen@huawei.com>
|
|
---
|
|
blockdev.c | 2 ++
|
|
qapi/block-core.json | 8 ++++++--
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/blockdev.c b/blockdev.c
|
|
index c91f49e7b6..2817f73fad 100644
|
|
--- a/blockdev.c
|
|
+++ b/blockdev.c
|
|
@@ -326,6 +326,8 @@ static int parse_block_error_action(const char *buf, bool is_read, Error **errp)
|
|
return BLOCKDEV_ON_ERROR_STOP;
|
|
} else if (!strcmp(buf, "report")) {
|
|
return BLOCKDEV_ON_ERROR_REPORT;
|
|
+ } else if (!strcmp(buf, "retry")) {
|
|
+ return BLOCKDEV_ON_ERROR_RETRY;
|
|
} else {
|
|
error_setg(errp, "'%s' invalid %s error action",
|
|
buf, is_read ? "read" : "write");
|
|
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
|
index 1444624590..ded6f0f6d2 100644
|
|
--- a/qapi/block-core.json
|
|
+++ b/qapi/block-core.json
|
|
@@ -1286,10 +1286,12 @@
|
|
#
|
|
# @auto: inherit the error handling policy of the backend (since: 2.7)
|
|
#
|
|
+# @retry: retrying IO with errors
|
|
+#
|
|
# Since: 1.3
|
|
##
|
|
{ 'enum': 'BlockdevOnError',
|
|
- 'data': ['report', 'ignore', 'enospc', 'stop', 'auto'] }
|
|
+ 'data': ['report', 'ignore', 'enospc', 'stop', 'auto', 'retry'] }
|
|
|
|
##
|
|
# @MirrorSyncMode:
|
|
@@ -5480,10 +5482,12 @@
|
|
#
|
|
# @stop: error caused VM to be stopped
|
|
#
|
|
+# @retry: retry IO with errors
|
|
+#
|
|
# Since: 2.1
|
|
##
|
|
{ 'enum': 'BlockErrorAction',
|
|
- 'data': [ 'ignore', 'report', 'stop' ] }
|
|
+ 'data': [ 'ignore', 'report', 'stop', 'retry' ] }
|
|
|
|
##
|
|
# @BLOCK_IMAGE_CORRUPTED:
|
|
--
|
|
2.27.0
|
|
|