[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/11] block: move input parsing code in qmp_transac
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 02/11] block: move input parsing code in qmp_transaction() |
Date: |
Fri, 24 May 2013 16:32:18 +0200 |
From: Wenchao Xia <address@hidden>
The code is moved into preparation function, and changed
a bit to tip more clearly what it is doing.
Signed-off-by: Wenchao Xia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 1cb9640..0115f46 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -785,10 +785,7 @@ 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,
+static void external_snapshot_prepare(BlockdevAction *action,
BlkTransactionStates *states,
Error **errp)
{
@@ -796,7 +793,24 @@ static void external_snapshot_prepare(const char *device,
BlockDriver *drv;
int flags, ret;
Error *local_err = NULL;
+ const char *device;
+ const char *new_image_file;
+ const char *format = "qcow2";
+ enum NewImageMode mode = NEW_IMAGE_MODE_ABSOLUTE_PATHS;
+ /* get parameters */
+ g_assert(action->kind == BLOCKDEV_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC);
+
+ device = action->blockdev_snapshot_sync->device;
+ new_image_file = action->blockdev_snapshot_sync->snapshot_file;
+ if (action->blockdev_snapshot_sync->has_format) {
+ format = action->blockdev_snapshot_sync->format;
+ }
+ if (action->blockdev_snapshot_sync->has_mode) {
+ mode = action->blockdev_snapshot_sync->mode;
+ }
+
+ /* start processing */
drv = bdrv_find_format(format);
if (!drv) {
error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
@@ -877,10 +891,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;
- enum NewImageMode mode;
- const char *new_image_file;
- const char *device;
- const char *format = "qcow2";
dev_info = dev_entry->value;
dev_entry = dev_entry->next;
@@ -890,17 +900,7 @@ void qmp_transaction(BlockdevActionList *dev_list, Error
**errp)
switch (dev_info->kind) {
case BLOCKDEV_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC:
- device = dev_info->blockdev_snapshot_sync->device;
- if (!dev_info->blockdev_snapshot_sync->has_mode) {
- dev_info->blockdev_snapshot_sync->mode =
NEW_IMAGE_MODE_ABSOLUTE_PATHS;
- }
- new_image_file = dev_info->blockdev_snapshot_sync->snapshot_file;
- if (dev_info->blockdev_snapshot_sync->has_format) {
- format = dev_info->blockdev_snapshot_sync->format;
- }
- mode = dev_info->blockdev_snapshot_sync->mode;
- external_snapshot_prepare(device, format, new_image_file,
- mode, states, &local_err);
+ external_snapshot_prepare(dev_info, states, errp);
if (error_is_set(&local_err)) {
error_propagate(errp, local_err);
goto delete_and_fail;
--
1.8.1.4
- [Qemu-devel] [PULL 00/11] Block patches, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 02/11] block: move input parsing code in qmp_transaction(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 03/11] block: package committing code in qmp_transaction(), Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 05/11] block: make all steps in qmp_transaction() as callback, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 06/11] blockdev: Rename BlockdevAction -> TransactionAction, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 07/11] qemu-io: Fix 'map' output, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 08/11] qcow2.py: Subcommand for changing header fields, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 10/11] coroutine: protect global pool with a mutex, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 09/11] qemu-iotests: Try creating huge qcow2 image, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 01/11] block: package preparation code in qmp_transaction(), Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 11/11] coroutine: stop using AioContext in CoQueue, Stefan Hajnoczi, 2013/05/24
- [Qemu-devel] [PATCH 04/11] block: package rollback code in qmp_transaction(), Stefan Hajnoczi, 2013/05/24