From patchwork Fri Nov 30 12:52:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 202949 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0BA8C2C0092 for ; Sat, 1 Dec 2012 00:17:54 +1100 (EST) Received: from localhost ([::1]:32803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeQ5n-0000LZ-Q3 for incoming@patchwork.ozlabs.org; Fri, 30 Nov 2012 07:53:19 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeQ50-0006rU-Al for qemu-devel@nongnu.org; Fri, 30 Nov 2012 07:52:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TeQ4u-0000M4-Bz for qemu-devel@nongnu.org; Fri, 30 Nov 2012 07:52:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4375) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeQ4u-0000Lj-2G for qemu-devel@nongnu.org; Fri, 30 Nov 2012 07:52:24 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAUCqNit015610 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 30 Nov 2012 07:52:23 -0500 Received: from localhost (ovpn-113-88.phx2.redhat.com [10.3.113.88]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAUCqMUd011437; Fri, 30 Nov 2012 07:52:22 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 30 Nov 2012 10:52:08 -0200 Message-Id: <1354279929-568-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1354279929-568-1-git-send-email-lcapitulino@redhat.com> References: <1354279929-568-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pbonzini@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 5/6] qmp: qmp_drive_mirror(): pass Error object to bdrv_img_create() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Luiz Capitulino --- blockdev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/blockdev.c b/blockdev.c index cc9692d..6b293fe 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; }