Patchwork [5/6] qmp: qmp_drive_mirror(): pass Error object to bdrv_img_create()

login
register
mail settings
Submitter Luiz Capitulino
Date Nov. 30, 2012, 12:52 p.m.
Message ID <1354279929-568-6-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/202949/
State New
Headers show

Comments

Luiz Capitulino - Nov. 30, 2012, 12:52 p.m.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 blockdev.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Patch

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;
     }