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)
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From 94580294f0fda3c715caa19f4b33718212c9c531 Mon Sep 17 00:00:00 2001
|
|
From: yexiao <yexiao7@huawei.com>
|
|
Date: Thu, 21 Jan 2021 15:46:47 +0800
|
|
Subject: [PATCH] block-backend: Add device specific retry callback
|
|
|
|
Add retry_request_cb in BlockDevOps to do device specific retry action.
|
|
Backend's timer would be registered only when the backend is set 'retry'
|
|
on errors and the device supports retry action.
|
|
|
|
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>
|
|
---
|
|
block/block-backend.c | 8 ++++++++
|
|
include/sysemu/block-backend-common.h | 4 ++++
|
|
2 files changed, 12 insertions(+)
|
|
|
|
diff --git a/block/block-backend.c b/block/block-backend.c
|
|
index 2f56cc8382..7e25d5a058 100644
|
|
--- a/block/block-backend.c
|
|
+++ b/block/block-backend.c
|
|
@@ -1123,6 +1123,14 @@ void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops,
|
|
blk->dev_ops = ops;
|
|
blk->dev_opaque = opaque;
|
|
|
|
+ if ((blk->on_read_error == BLOCKDEV_ON_ERROR_RETRY ||
|
|
+ blk->on_write_error == BLOCKDEV_ON_ERROR_RETRY) &&
|
|
+ ops->retry_request_cb) {
|
|
+ blk->retry_timer = aio_timer_new(blk->ctx, QEMU_CLOCK_REALTIME,
|
|
+ SCALE_MS, ops->retry_request_cb,
|
|
+ opaque);
|
|
+ }
|
|
+
|
|
/* Are we currently quiesced? Should we enforce this right now? */
|
|
if (qatomic_read(&blk->quiesce_counter) && ops && ops->drained_begin) {
|
|
ops->drained_begin(opaque);
|
|
diff --git a/include/sysemu/block-backend-common.h b/include/sysemu/block-backend-common.h
|
|
index 780cea7305..b76df8834a 100644
|
|
--- a/include/sysemu/block-backend-common.h
|
|
+++ b/include/sysemu/block-backend-common.h
|
|
@@ -71,6 +71,10 @@ typedef struct BlockDevOps {
|
|
* Is the device still busy?
|
|
*/
|
|
bool (*drained_poll)(void *opaque);
|
|
+ /*
|
|
+ * Runs when retrying failed requests.
|
|
+ */
|
|
+ void (*retry_request_cb)(void *opaque);
|
|
|
|
/*
|
|
* I/O API functions. These functions are thread-safe.
|
|
--
|
|
2.27.0
|
|
|