From 50bfbe93b2ca0ab795f3de305bec5ab1df620be4 Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Tue, 7 Mar 2017 19:07:21 +0800 Subject: block: Don't use error_abort in blk_new_open We have an errp and bdrv_root_attach_child can fail permission check, error_abort is not the best choice here. Signed-off-by: Fam Zheng Signed-off-by: Kevin Wolf --- block/block-backend.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'block/block-backend.c') diff --git a/block/block-backend.c b/block/block-backend.c index daa7908d01..5742c09c2c 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -213,7 +213,12 @@ BlockBackend *blk_new_open(const char *filename, const char *reference, } blk->root = bdrv_root_attach_child(bs, "root", &child_root, - perm, BLK_PERM_ALL, blk, &error_abort); + perm, BLK_PERM_ALL, blk, errp); + if (!blk->root) { + bdrv_unref(bs); + blk_unref(blk); + return NULL; + } return blk; } -- cgit v1.2.1