37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
From 2a4dcc55ce71f1251d0dc0ccd293866bfe4dc071 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 4 Dec 2023 11:15:58 +0800
|
||
|
|
Subject: [PATCH] vhost-user-blk: propagate error return from generic vhost
|
||
|
|
|
||
|
|
cherry picked from commit fb767859345506d747876c23d181155b183f8e94
|
||
|
|
|
||
|
|
Fix the only callsite that doesn't propagate the error code from the
|
||
|
|
generic vhost code.
|
||
|
|
|
||
|
|
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
|
||
|
|
Message-Id: <20211111153354.18807-11-rvkagan@yandex-team.ru>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
|
||
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/block/vhost-user-blk.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
|
||
|
|
index eddc5588fa..f1a281a965 100644
|
||
|
|
--- a/hw/block/vhost-user-blk.c
|
||
|
|
+++ b/hw/block/vhost-user-blk.c
|
||
|
|
@@ -104,7 +104,7 @@ static int vhost_user_blk_handle_config_change(struct vhost_dev *dev)
|
||
|
|
&local_err);
|
||
|
|
if (ret < 0) {
|
||
|
|
error_report_err(local_err);
|
||
|
|
- return -1;
|
||
|
|
+ return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
/* valid for resize only */
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|