[PULL,3/4] nfs: Fix error path in nfs_options_qdict_to_qapi()

Commit Message

Jeff Cody May 16, 2018, 5:42 p.m. UTC

From: Kevin Wolf <[e-mail]>

Don't throw away local_err, but propagate it to errp.

Signed-off-by: Kevin Wolf <[e-mail]>
Message-id: [e-mail]
Reviewed-by: Eric Blake <[e-mail]>
Reviewed-by: Jeff Cody <[e-mail]>
Signed-off-by: Jeff Cody <[e-mail]>
---
 block/nfs.c | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/block/nfs.c b/block/nfs.c
index 66fddf12d4..4ee2ad59d9 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -570,6 +570,7 @@  static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
     qobject_unref(crumpled);
 
     if (local_err) {
+        error_propagate(errp, local_err);
         return NULL;
     }