From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPDXw-0005Df-0O for qemu-devel@nongnu.org; Fri, 19 Oct 2012 10:27:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPDXq-0006xj-2F for qemu-devel@nongnu.org; Fri, 19 Oct 2012 10:27:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPDXp-0006xQ-Jg for qemu-devel@nongnu.org; Fri, 19 Oct 2012 10:27:25 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9JERPdM006445 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 19 Oct 2012 10:27:25 -0400 From: Luiz Capitulino Date: Fri, 19 Oct 2012 11:28:04 -0300 Message-Id: <1350656885-6485-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1350656885-6485-1-git-send-email-lcapitulino@redhat.com> References: <1350656885-6485-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 5/6] qmp: qmp_transaction(): pass Error object to bdrv_img_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, armbru@redhat.com Signed-off-by: Luiz Capitulino --- blockdev.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/blockdev.c b/blockdev.c index 9dddefd..f2ec780 100644 --- a/blockdev.c +++ b/blockdev.c @@ -701,6 +701,7 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp) int ret = 0; BlockdevActionList *dev_entry = dev_list; BlkTransactionStates *states, *next; + Error *local_err = NULL; QSIMPLEQ_HEAD(snap_bdrv_states, BlkTransactionStates) snap_bdrv_states; QSIMPLEQ_INIT(&snap_bdrv_states); @@ -780,12 +781,12 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp) /* create new image w/backing file */ if (mode != NEW_IMAGE_MODE_EXISTING) { - ret = bdrv_img_create(new_image_file, format, - states->old_bs->filename, - states->old_bs->drv->format_name, - NULL, -1, flags, NULL); - if (ret) { - error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file); + bdrv_img_create(new_image_file, format, + states->old_bs->filename, + states->old_bs->drv->format_name, + NULL, -1, flags, &local_err); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); goto delete_and_fail; } } -- 1.7.12.315.g682ce8b