From 30821a80bacc1c578b3093e83c3d92c2239141d3 Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Tue, 1 Mar 2022 20:12:12 +0800 Subject: [PATCH 1/3] scsi-bus: fix unmatched object_unref() Fix commit 391dd8f1("scsi-bus: Refactor the code that retries requests"), which split scsi_dma_restart_bh(), but the object_unref() belongs to scsi_dma_restart_bh(). So, we should mv object_unref() from scsi_retry_requests() to scsi_dma_restart_bh(). Signed-off-by: Yan Wang --- scsi-bus-fix-unmatched-object_unref.patch | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 scsi-bus-fix-unmatched-object_unref.patch diff --git a/scsi-bus-fix-unmatched-object_unref.patch b/scsi-bus-fix-unmatched-object_unref.patch new file mode 100644 index 0000000..0cb39a0 --- /dev/null +++ b/scsi-bus-fix-unmatched-object_unref.patch @@ -0,0 +1,42 @@ +From 239ffdcf42e0795b5f025f87fa19ce01642811f2 Mon Sep 17 00:00:00 2001 +From: Yan Wang +Date: Tue, 1 Mar 2022 20:12:12 +0800 +Subject: [PATCH] scsi-bus: fix unmatched object_unref() + +Fix commit 391dd8f1("scsi-bus: Refactor the code that retries requests"), +which split scsi_dma_restart_bh(), but the object_unref() belongs to +scsi_dma_restart_bh(). +So, we should mv object_unref() from scsi_retry_requests() to +scsi_dma_restart_bh(). + +Signed-off-by: Yan Wang +--- + hw/scsi/scsi-bus.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c +index 5e6f891b9d..9d37f490ce 100644 +--- a/hw/scsi/scsi-bus.c ++++ b/hw/scsi/scsi-bus.c +@@ -166,8 +166,6 @@ void scsi_retry_requests(SCSIDevice *s) + scsi_req_unref(req); + } + aio_context_release(blk_get_aio_context(s->conf.blk)); +- /* Drop the reference that was acquired in scsi_dma_restart_cb */ +- object_unref(OBJECT(s)); + } + + static void scsi_dma_restart_bh(void *opaque) +@@ -178,6 +176,9 @@ static void scsi_dma_restart_bh(void *opaque) + s->bh = NULL; + + scsi_retry_requests(s); ++ ++ /* Drop the reference that was acquired in scsi_dma_restart_cb */ ++ object_unref(OBJECT(s)); + } + + void scsi_req_retry(SCSIRequest *req) +-- +2.27.0 + -- Gitee From dc51cf51b36651654ed8031a77e0ba06a2a7c618 Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Wed, 2 Mar 2022 11:27:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?spec:=20Update=20patch=20and=20changelog=20?= =?UTF-8?q?with=20!263=20=E3=80=906.2.0=E3=80=91=E4=BF=AE=E6=94=B9object?= =?UTF-8?q?=5Funref=E5=AF=BC=E8=87=B4=E7=9A=84abort=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=20!263?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit scsi-bus: fix unmatched object_unref() Signed-off-by: Chen Qun --- qemu.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qemu.spec b/qemu.spec index dc47aff..ca409f4 100644 --- a/qemu.spec +++ b/qemu.spec @@ -232,6 +232,7 @@ Patch0218: qcow2-fix-memory-leak-in-qcow2_read_extensions.patch Patch0219: scsi-disk-define-props-in-scsi_block_disk-to-avoid-m.patch Patch0220: pcie-Add-pcie-root-port-fast-plug-unplug-feature.patch Patch0221: pcie-Compat-with-devices-which-do-not-support-Link-W.patch +Patch0222: scsi-bus-fix-unmatched-object_unref.patch BuildRequires: flex BuildRequires: gcc @@ -679,6 +680,9 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Wed Mar 02 2022 Chen Qun +- scsi-bus: fix unmatched object_unref() + * Sat Feb 26 2022 Yan Wang - pl011-reset-read-FIFO-when-UARTTIMSC-0-UARTICR-0xfff.patch - qcow2-fix-memory-leak-in-qcow2_read_extensions.patch -- Gitee From 889139d42f8b8c9255751a5e148fd49385f89903 Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Wed, 2 Mar 2022 11:27:31 +0800 Subject: [PATCH 3/3] spec: Update release version with !263 increase release verison by one Signed-off-by: Chen Qun --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index ca409f4..fd9358a 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 6.2.0 -Release: 22 +Release: 23 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 -- Gitee