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)
70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
From d69428c793ca7311c55d0efdaa82100247e35dcc Mon Sep 17 00:00:00 2001
|
|
From: Jiahui Cen <cenjiahui@huawei.com>
|
|
Date: Thu, 21 Jan 2021 15:46:54 +0800
|
|
Subject: [PATCH] scsi-bus: Refactor the code that retries requests
|
|
|
|
Move the code that retries requests from scsi_dma_restart_bh() to its own,
|
|
non-static, function. This will allow us to call it from the
|
|
retry_request_cb() of scsi-disk in a future patch.
|
|
|
|
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>
|
|
---
|
|
hw/scsi/scsi-bus.c | 16 +++++++++++-----
|
|
include/hw/scsi/scsi.h | 1 +
|
|
2 files changed, 12 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
|
|
index fc4b77fdb0..cecb02ae7e 100644
|
|
--- a/hw/scsi/scsi-bus.c
|
|
+++ b/hw/scsi/scsi-bus.c
|
|
@@ -144,14 +144,10 @@ void scsi_bus_init_named(SCSIBus *bus, size_t bus_size, DeviceState *host,
|
|
qbus_set_bus_hotplug_handler(BUS(bus));
|
|
}
|
|
|
|
-static void scsi_dma_restart_bh(void *opaque)
|
|
+void scsi_retry_requests(SCSIDevice *s)
|
|
{
|
|
- SCSIDevice *s = opaque;
|
|
SCSIRequest *req, *next;
|
|
|
|
- qemu_bh_delete(s->bh);
|
|
- s->bh = NULL;
|
|
-
|
|
aio_context_acquire(blk_get_aio_context(s->conf.blk));
|
|
QTAILQ_FOREACH_SAFE(req, &s->requests, next, next) {
|
|
scsi_req_ref(req);
|
|
@@ -175,6 +171,16 @@ static void scsi_dma_restart_bh(void *opaque)
|
|
object_unref(OBJECT(s));
|
|
}
|
|
|
|
+static void scsi_dma_restart_bh(void *opaque)
|
|
+{
|
|
+ SCSIDevice *s = opaque;
|
|
+
|
|
+ qemu_bh_delete(s->bh);
|
|
+ s->bh = NULL;
|
|
+
|
|
+ scsi_retry_requests(s);
|
|
+}
|
|
+
|
|
void scsi_req_retry(SCSIRequest *req)
|
|
{
|
|
/* No need to save a reference, because scsi_dma_restart_bh just
|
|
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
|
|
index 3692ca82f3..6ec18bf12b 100644
|
|
--- a/include/hw/scsi/scsi.h
|
|
+++ b/include/hw/scsi/scsi.h
|
|
@@ -226,6 +226,7 @@ void scsi_req_cancel_complete(SCSIRequest *req);
|
|
void scsi_req_cancel(SCSIRequest *req);
|
|
void scsi_req_cancel_async(SCSIRequest *req, Notifier *notifier);
|
|
void scsi_req_retry(SCSIRequest *req);
|
|
+void scsi_retry_requests(SCSIDevice *s);
|
|
void scsi_device_drained_begin(SCSIDevice *sdev);
|
|
void scsi_device_drained_end(SCSIDevice *sdev);
|
|
void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense);
|
|
--
|
|
2.27.0
|
|
|