[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] qmp: qmp_transaction(): pass Error object to bd
From: |
Luiz Capitulino |
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 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
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
- [Qemu-devel] [PATCH v3 0/6] block: bdrv_img_create(): propagate errors, Luiz Capitulino, 2012/11/30
- [Qemu-devel] [PATCH 4/6] qmp: qmp_transaction(): pass Error object to bdrv_img_create(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 1/6] block: bdrv_img_create(): add Error ** argument, Luiz Capitulino, 2012/11/30
- [Qemu-devel] [PATCH 2/6] qemu-img: img_create(): pass Error object to bdrv_img_create(), Luiz Capitulino, 2012/11/30
- [Qemu-devel] [PATCH 3/6] qemu-img: img_create(): drop unneeded goto and ret variable, Luiz Capitulino, 2012/11/30
- [Qemu-devel] [PATCH 5/6] qmp: qmp_drive_mirror(): pass Error object to bdrv_img_create(), Luiz Capitulino, 2012/11/30
- [Qemu-devel] [PATCH 6/6] block: bdrv_img_create(): drop unused error handling code, Luiz Capitulino, 2012/11/30
- Re: [Qemu-devel] [PATCH v3 0/6] block: bdrv_img_create(): propagate errors, Kevin Wolf, 2012/11/30