From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjARd-00005M-B3 for qemu-devel@nongnu.org; Thu, 13 Dec 2012 10:12:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TjARM-0005xR-HX for qemu-devel@nongnu.org; Thu, 13 Dec 2012 10:11:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjARM-0005xI-8W for qemu-devel@nongnu.org; Thu, 13 Dec 2012 10:11:12 -0500 From: Kevin Wolf Date: Thu, 13 Dec 2012 16:10:24 +0100 Message-Id: <1355411450-12761-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1355411450-12761-1-git-send-email-kwolf@redhat.com> References: <1355411450-12761-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 17/43] qmp: qmp_drive_mirror(): pass Error object to bdrv_img_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Luiz Capitulino Signed-off-by: Luiz Capitulino Signed-off-by: Kevin Wolf --- blockdev.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/blockdev.c b/blockdev.c index 6fb3362..463f4c2 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; } -- 1.7.6.5