[Qemu-devel] [PATCH] nfs: Fix error path in nfs_options_qdict_to_qapi()

[Kevin Wolf]

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

Signed-off-by: Kevin Wolf <***@redhat.com>
---
block/nfs.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/block/nfs.c b/block/nfs.c
index d6364d28bb..3349b67a76 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -571,6 +571,7 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
qobject_unref(crumpled);

if (local_err) {
+ error_propagate(errp, local_err);
return NULL;
}

[Eric Blake]

Post by Kevin Wolf
Don't throw away local_err, but propagate it to errp.
---
block/nfs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/block/nfs.c b/block/nfs.c
index d6364d28bb..3349b67a76 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -571,6 +571,7 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
qobject_unref(crumpled);
if (local_err) {
+ error_propagate(errp, local_err);
return NULL;
}

[Jeff Cody]

Post by Kevin Wolf
Don't throw away local_err, but propagate it to errp.
---
block/nfs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/block/nfs.c b/block/nfs.c
index d6364d28bb..3349b67a76 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -571,6 +571,7 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
qobject_unref(crumpled);
if (local_err) {
+ error_propagate(errp, local_err);
return NULL;
}
--
2.13.6

Thanks,

Applied to my block branch:

git://github.com/codyprime/qemu-kvm-jtc block

-Jeff