From cf8f2426c55245f437a91f2fdabbed4ea24e7786 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Fri, 30 Nov 2012 10:52:08 -0200 Subject: [PATCH] qmp: qmp_drive_mirror(): pass Error object to bdrv_img_create() Signed-off-by: Luiz Capitulino Signed-off-by: Kevin Wolf --- blockdev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/blockdev.c b/blockdev.c index 6fb336294c..463f4c2094 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1264,8 +1264,8 @@ void qmp_drive_mirror(const char *device, const char *target, assert(format && drv); bdrv_get_geometry(bs, &size); size *= 512; - ret = bdrv_img_create(target, format, - NULL, NULL, NULL, size, flags, NULL); + bdrv_img_create(target, format, + NULL, NULL, NULL, size, flags, &local_err); } else { switch (mode) { case NEW_IMAGE_MODE_EXISTING: @@ -1273,18 +1273,18 @@ void qmp_drive_mirror(const char *device, const char *target, break; case NEW_IMAGE_MODE_ABSOLUTE_PATHS: /* create new image with backing file */ - ret = bdrv_img_create(target, format, - source->filename, - source->drv->format_name, - NULL, -1, flags, NULL); + bdrv_img_create(target, format, + source->filename, + source->drv->format_name, + NULL, -1, flags, &local_err); break; default: abort(); } } - if (ret) { - error_set(errp, QERR_OPEN_FILE_FAILED, target); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); return; } -- 2.11.0