|
 |
1bdc94 |
From 05767713c9bd39d7d035b8edce4f7149d23500b6 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Date: Tue, 26 Jun 2018 09:47:47 +0200
|
|
|
1bdc94 |
Subject: [PATCH 18/89] nfs: Fix error path in nfs_options_qdict_to_qapi()
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180626094856.6924-5-kwolf@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81057
|
|
|
1bdc94 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 04/73] nfs: Fix error path in nfs_options_qdict_to_qapi()
|
|
|
1bdc94 |
Bugzilla: 1513543
|
|
|
1bdc94 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Don't throw away local_err, but propagate it to errp.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Message-id: 20180516161034.27440-1-kwolf@redhat.com
|
|
|
1bdc94 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 54b7af4369a37afbd82573d0dcfb27febdb6dd24)
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
block/nfs.c | 1 +
|
|
|
1bdc94 |
1 file changed, 1 insertion(+)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/block/nfs.c b/block/nfs.c
|
|
|
1bdc94 |
index 1e12958..3059ef2 100644
|
|
|
1bdc94 |
--- a/block/nfs.c
|
|
|
1bdc94 |
+++ b/block/nfs.c
|
|
|
1bdc94 |
@@ -568,6 +568,7 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
|
|
|
1bdc94 |
visit_free(v);
|
|
|
1bdc94 |
|
|
|
1bdc94 |
if (local_err) {
|
|
|
1bdc94 |
+ error_propagate(errp, local_err);
|
|
|
1bdc94 |
return NULL;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|