From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com, armbru@redhat.com
Subject: [Qemu-devel] [PATCH 4/6] qmp: qmp_transaction(): pass Error object to bdrv_img_create()
Date: Fri, 30 Nov 2012 10:52:07 -0200 [thread overview]
Message-ID: <1354279929-568-5-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1354279929-568-1-git-send-email-lcapitulino@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
blockdev.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 2ec02ac..cc9692d 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -707,6 +707,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);
@@ -786,12 +787,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.8.0
next prev parent reply other threads:[~2012-11-30 12:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-30 12:52 [Qemu-devel] [PATCH v3 0/6] block: bdrv_img_create(): propagate errors Luiz Capitulino
2012-11-30 12:52 ` [Qemu-devel] [PATCH 1/6] block: bdrv_img_create(): add Error ** argument Luiz Capitulino
2012-11-30 12:52 ` [Qemu-devel] [PATCH 2/6] qemu-img: img_create(): pass Error object to bdrv_img_create() Luiz Capitulino
2012-11-30 12:52 ` [Qemu-devel] [PATCH 3/6] qemu-img: img_create(): drop unneeded goto and ret variable Luiz Capitulino
2012-11-30 12:52 ` Luiz Capitulino [this message]
2012-11-30 12:52 ` [Qemu-devel] [PATCH 5/6] qmp: qmp_drive_mirror(): pass Error object to bdrv_img_create() Luiz Capitulino
2012-11-30 12:52 ` [Qemu-devel] [PATCH 6/6] block: bdrv_img_create(): drop unused error handling code Luiz Capitulino
2012-11-30 13:19 ` [Qemu-devel] [PATCH v3 0/6] block: bdrv_img_create(): propagate errors Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354279929-568-5-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@redhat.com \
--cc=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).