If we want to add some info to errp (by error_prepend() or
error_append_hint()), we must use the ERRP_AUTO_PROPAGATE macro.
Otherwise, this info will not be added when errp == &fatal_err
(the program will exit prior to the error_append_hint() or
error_prepend() call). Fix such cases.
This commit (together with its neighbors) was generated by
git grep -l 'error_\(append_hint\|prepend\)(errp' | while read f; do \
spatch --sp-file scripts/coccinelle/fix-error-add-info.cocci \
--in-place $f; done
and then
./python/commit-per-subsystem.py MAINTAINERS "$(< auto-msg)"
(auto-msg was a file with this commit message)
and then by hand, for not maintained changed files:
git commit -m "<SUB-SYSTEM>: $(< auto-msg)" <FILES>
Still, for backporting it may be more comfortable to use only the first
command and then do one huge commit.
Reported-by: Greg Kurz <gr...@kaod.org>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
---
hw/scsi/scsi-disk.c | 1 +
hw/scsi/scsi-generic.c | 1 +
hw/scsi/vhost-scsi.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 915641a0f1..48165dc128 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -2597,6 +2597,7 @@ static int get_device_type(SCSIDiskState *s)
static void scsi_block_realize(SCSIDevice *dev, Error **errp)
{
+ ERRP_AUTO_PROPAGATE();
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev);
AioContext *ctx;
int sg_version;
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index e7798ebcd0..4c7543801f 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -653,6 +653,7 @@ static void scsi_generic_reset(DeviceState *dev)
static void scsi_generic_realize(SCSIDevice *s, Error **errp)
{
+ ERRP_AUTO_PROPAGATE();
int rc;
int sg_version;
struct sg_scsi_id scsiid;
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index c693fc748a..c01c6dfbe2 100644
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -165,6 +165,7 @@ static const VMStateDescription vmstate_virtio_vhost_scsi =
{
static void vhost_scsi_realize(DeviceState *dev, Error **errp)
{
+ ERRP_AUTO_PROPAGATE();
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev);
VHostSCSICommon *vsc = VHOST_SCSI_COMMON(dev);
Error *err = NULL;
--
2.21.0
