From 99bbae5b0d2b5c729c90287c0a8bf7921479e06b Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Wed, 1 Apr 2026 13:19:25 -0400 Subject: [PATCH 1/5] scsi: adjust error_prepend() formatting RH-Author: Stefan Hajnoczi RH-MergeRequest: 550: scsi: PR live migration PREEMPT fixes [10.2.z] RH-Jira: RHEL-166007 RH-Acked-by: Miroslav Rezanina RH-Acked-by: Kevin Wolf RH-Commit: [1/3] 1997589e1c019d11a2c5a5689f73d908847d91d2 The error strings will be concatenated so add a separator to make the combined error message easy to read. Signed-off-by: Stefan Hajnoczi Link: https://lore.kernel.org/r/20260401171927.396672-2-stefanha@redhat.com Signed-off-by: Paolo Bonzini (cherry picked from commit 15c57ac351ccb4af625cd7dc582831f472c1a68f) Signed-off-by: Stefan Hajnoczi --- 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