From 9845ad55c470e47c0074d92611bf9fb2903ab58a Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Mon, 9 Sep 2013 14:27:52 +0200

Subject: [PATCH 01/38] block: package preparation code in qmp_transaction()

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <1378736903-18489-2-git-send-email-kwolf@redhat.com>

Patchwork-id: 54188

O-Subject: [RHEL-7.0 qemu-kvm PATCH 01/32] block: package preparation code in qmp_transaction()

Bugzilla: 1005818

RH-Acked-by: Fam Zheng <famz@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>

Bugzilla: 1005818

The code before really committing is moved into a function. Most

code is simply moved from qmp_transaction(), except that on fail it

just returns now. Other code such as input parsing is not touched,

to make it easier in review.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit 9b9877ee9f1c27588a286f591852c0b7c0548b6a)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

---

 blockdev.c | 139 ++++++++++++++++++++++++++++++++++---------------------------

 1 file changed, 77 insertions(+), 62 deletions(-)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 blockdev.c |  139 +++++++++++++++++++++++++++++++++---------------------------

 1 files changed, 77 insertions(+), 62 deletions(-)

diff --git a/blockdev.c b/blockdev.c

index 6500c47..1bff654 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -785,6 +785,78 @@ typedef struct BlkTransactionStates {

     QSIMPLEQ_ENTRY(BlkTransactionStates) entry;

 } BlkTransactionStates;

+static void external_snapshot_prepare(const char *device,

+                                      const char *format,

+                                      const char *new_image_file,

+                                      enum NewImageMode mode,

+                                      BlkTransactionStates *states,

+                                      Error **errp)

+{

+    BlockDriver *proto_drv;

+    BlockDriver *drv;

+    int flags, ret;

+    Error *local_err = NULL;

+

+    drv = bdrv_find_format(format);

+    if (!drv) {

+        error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);

+        return;

+    }

+

+    states->old_bs = bdrv_find(device);

+    if (!states->old_bs) {

+        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

+        return;

+    }

+

+    if (!bdrv_is_inserted(states->old_bs)) {

+        error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);

+        return;

+    }

+

+    if (bdrv_in_use(states->old_bs)) {

+        error_set(errp, QERR_DEVICE_IN_USE, device);

+        return;

+    }

+

+    if (!bdrv_is_read_only(states->old_bs)) {

+        if (bdrv_flush(states->old_bs)) {

+            error_set(errp, QERR_IO_ERROR);

+            return;

+        }

+    }

+

+    flags = states->old_bs->open_flags;

+

+    proto_drv = bdrv_find_protocol(new_image_file);

+    if (!proto_drv) {

+        error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);

+        return;

+    }

+

+    /* create new image w/backing file */

+    if (mode != NEW_IMAGE_MODE_EXISTING) {

+        bdrv_img_create(new_image_file, format,

+                        states->old_bs->filename,

+                        states->old_bs->drv->format_name,

+                        NULL, -1, flags, &local_err, false);

+        if (error_is_set(&local_err)) {

+            error_propagate(errp, local_err);

+            return;

+        }

+    }

+

+    /* We will manually add the backing_hd field to the bs later */

+    states->new_bs = bdrv_new("");

+    /* TODO Inherit bs->options or only take explicit options with an

+     * extended QMP command? */

+    ret = bdrv_open(states->new_bs, new_image_file, NULL,

+                    flags | BDRV_O_NO_BACKING, drv);

+    if (ret != 0) {

+        error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);

+    }

+}

+

 /*

  * 'Atomic' group snapshots.  The snapshots are taken as a set, and if any fail

  *  then we do not pivot any of the devices in the group, and abandon the

@@ -792,7 +864,6 @@ typedef struct BlkTransactionStates {

  */

 void qmp_transaction(BlockdevActionList *dev_list, Error **errp)

 {

-    int ret = 0;

     BlockdevActionList *dev_entry = dev_list;

     BlkTransactionStates *states, *next;

     Error *local_err = NULL;

@@ -806,9 +877,6 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)

     /* We don't do anything in this loop that commits us to the snapshot */

     while (NULL != dev_entry) {

         BlockdevAction *dev_info = NULL;

-        BlockDriver *proto_drv;

-        BlockDriver *drv;

-        int flags;

         enum NewImageMode mode;

         const char *new_image_file;

         const char *device;

@@ -831,70 +899,17 @@ void qmp_transaction(BlockdevActionList *dev_list, Error **errp)

                 format = dev_info->blockdev_snapshot_sync->format;

             }

             mode = dev_info->blockdev_snapshot_sync->mode;

-            break;

-        default:

-            abort();

-        }

-

-        drv = bdrv_find_format(format);

-        if (!drv) {

-            error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);

-            goto delete_and_fail;

-        }

-

-        states->old_bs = bdrv_find(device);

-        if (!states->old_bs) {

-            error_set(errp, QERR_DEVICE_NOT_FOUND, device);

-            goto delete_and_fail;

-        }

-

-        if (!bdrv_is_inserted(states->old_bs)) {

-            error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);

-            goto delete_and_fail;

-        }

-

-        if (bdrv_in_use(states->old_bs)) {

-            error_set(errp, QERR_DEVICE_IN_USE, device);

-            goto delete_and_fail;

-        }

-

-        if (!bdrv_is_read_only(states->old_bs)) {

-            if (bdrv_flush(states->old_bs)) {

-                error_set(errp, QERR_IO_ERROR);

-                goto delete_and_fail;

-            }

-        }

-

-        flags = states->old_bs->open_flags;

-

-        proto_drv = bdrv_find_protocol(new_image_file);

-        if (!proto_drv) {

-            error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);

-            goto delete_and_fail;

-        }

-

-        /* create new image w/backing file */

-        if (mode != NEW_IMAGE_MODE_EXISTING) {

-            bdrv_img_create(new_image_file, format,

-                            states->old_bs->filename,

-                            states->old_bs->drv->format_name,

-                            NULL, -1, flags, &local_err, false);

+            external_snapshot_prepare(device, format, new_image_file,

+                                      mode, states, &local_err);

             if (error_is_set(&local_err)) {

                 error_propagate(errp, local_err);

                 goto delete_and_fail;

             }

+            break;

+        default:

+            abort();

         }

-        /* We will manually add the backing_hd field to the bs later */

-        states->new_bs = bdrv_new("");

-        /* TODO Inherit bs->options or only take explicit options with an

-         * extended QMP command? */

-        ret = bdrv_open(states->new_bs, new_image_file, NULL,

-                        flags | BDRV_O_NO_BACKING, drv);

-        if (ret != 0) {

-            error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);

-            goto delete_and_fail;

-        }

     }

-- 

1.7.1