[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 3/4] nfs: Fix error path in nfs_options_qdict_to_qapi
From: |
Jeff Cody |
Subject: |
[Qemu-block] [PULL 3/4] nfs: Fix error path in nfs_options_qdict_to_qapi() |
Date: |
Wed, 16 May 2018 13:42:33 -0400 |
From: Kevin Wolf <address@hidden>
Don't throw away local_err, but propagate it to errp.
Signed-off-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
---
block/nfs.c | 1 +
1 file changed, 1 insertion(+)
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;
}
--
2.13.6
- [Qemu-block] [PULL 0/4] Block patches, Jeff Cody, 2018/05/08
- [Qemu-block] [PULL 2/4] block/mirror: Make cancel always cancel pre-READY, Jeff Cody, 2018/05/08
- [Qemu-block] [PULL 1/4] block/mirror: honor ratelimit again, Jeff Cody, 2018/05/08
- [Qemu-block] [PULL 3/4] iotests: Add test for cancelling a mirror job, Jeff Cody, 2018/05/08
- [Qemu-block] [PULL 4/4] sheepdog: Fix sd_co_create_opts() memory leaks, Jeff Cody, 2018/05/08
- Re: [Qemu-block] [PULL 0/4] Block patches, Peter Maydell, 2018/05/08