From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 16 May 2018 16:10:34 +0000 (+0200)
Subject: nfs: Fix error path in nfs_options_qdict_to_qapi()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=54b7af4369a37afbd82573d0dcfb27febdb6dd24;p=qemu.git

nfs: Fix error path in nfs_options_qdict_to_qapi()

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

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 20180516161034.27440-1-kwolf@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---

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;
     }