50 lines
2.0 KiB
Diff
50 lines
2.0 KiB
Diff
From bc38981e098c0dd2430c125ceb08188813e7ba12 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Date: Wed, 1 Apr 2026 13:19:25 -0400
|
|
Subject: [PATCH 1/5] scsi: adjust error_prepend() formatting
|
|
|
|
RH-Author: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-MergeRequest: 493: scsi: PR live migration PREEMPT fixes [9.9]
|
|
RH-Jira: RHEL-158243
|
|
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
|
RH-Commit: [1/3] 8ba6738b878a8926f8aaab487b863a42a44a736e (stefanha/centos-stream-qemu-kvm)
|
|
|
|
The error strings will be concatenated so add a separator to make the
|
|
combined error message easy to read.
|
|
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Link: https://lore.kernel.org/r/20260401171927.396672-2-stefanha@redhat.com
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 15c57ac351ccb4af625cd7dc582831f472c1a68f)
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
---
|
|
hw/scsi/scsi-generic.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
|
|
index b8b3f399f0..5825a47311 100644
|
|
--- a/hw/scsi/scsi-generic.c
|
|
+++ b/hw/scsi/scsi-generic.c
|
|
@@ -438,7 +438,7 @@ static bool scsi_generic_pr_register(SCSIDevice *s, uint64_t key, Error **errp)
|
|
ret = scsi_SG_IO(s->conf.blk, SG_DXFER_TO_DEV, cmd, sizeof(cmd),
|
|
buf, sizeof(buf), s->io_timeout, errp);
|
|
if (ret < 0) {
|
|
- error_prepend(errp, "PERSISTENT RESERVE OUT with REGISTER");
|
|
+ error_prepend(errp, "PERSISTENT RESERVE OUT with REGISTER: ");
|
|
return false;
|
|
}
|
|
return true;
|
|
@@ -462,7 +462,7 @@ static bool scsi_generic_pr_preempt(SCSIDevice *s, uint64_t key,
|
|
ret = scsi_SG_IO(s->conf.blk, SG_DXFER_TO_DEV, cmd, sizeof(cmd),
|
|
buf, sizeof(buf), s->io_timeout, errp);
|
|
if (ret < 0) {
|
|
- error_prepend(errp, "PERSISTENT RESERVE OUT with PREEMPT");
|
|
+ error_prepend(errp, "PERSISTENT RESERVE OUT with PREEMPT: ");
|
|
return false;
|
|
}
|
|
return true;
|
|
--
|
|
2.52.0
|
|
|