[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 07/14] qemu-img: Implement commit like QMP
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v11 07/14] qemu-img: Implement commit like QMP |
Date: |
Wed, 20 Aug 2014 20:17:57 +0200 |
qemu-img should use QMP commands whenever possible in order to ensure
feature completeness of both online and offline image operations. As
qemu-img itself has no access to QMP (since this would basically require
just everything being linked into qemu-img), imitate QMP's
implementation of block-commit by using commit_active_start() and then
waiting for the block job to finish.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/Makefile.objs | 2 +-
qemu-img.c | 83 +++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/block/Makefile.objs b/block/Makefile.objs
index 858d2b3..92ef4f6 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -9,6 +9,7 @@ block-obj-y += snapshot.o qapi.o
block-obj-$(CONFIG_WIN32) += raw-win32.o win32-aio.o
block-obj-$(CONFIG_POSIX) += raw-posix.o
block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
+block-obj-y += mirror.o
ifeq ($(CONFIG_POSIX),y)
block-obj-y += nbd.o nbd-client.o sheepdog.o
@@ -23,7 +24,6 @@ endif
common-obj-y += stream.o
common-obj-y += commit.o
-common-obj-y += mirror.o
common-obj-y += backup.o
iscsi.o-cflags := $(LIBISCSI_CFLAGS)
diff --git a/qemu-img.c b/qemu-img.c
index 18caa4b..1b2255b 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -30,6 +30,7 @@
#include "qemu/osdep.h"
#include "sysemu/sysemu.h"
#include "block/block_int.h"
+#include "block/blockjob.h"
#include "block/qapi.h"
#include <getopt.h>
#include <glib.h>
@@ -721,12 +722,46 @@ fail:
return ret;
}
+typedef struct CommonBlockJobCBInfo {
+ BlockDriverState *bs;
+ Error **errp;
+} CommonBlockJobCBInfo;
+
+static void common_block_job_cb(void *opaque, int ret)
+{
+ CommonBlockJobCBInfo *cbi = opaque;
+
+ if (ret < 0) {
+ error_setg_errno(cbi->errp, -ret, "Block job failed");
+ }
+
+ /* Drop this block job's reference */
+ bdrv_unref(cbi->bs);
+}
+
+static void run_block_job(BlockJob *job, Error **errp)
+{
+ AioContext *aio_context = bdrv_get_aio_context(job->bs);
+
+ do {
+ aio_poll(aio_context, true);
+
+ if (!job->busy && !job->ready) {
+ block_job_resume(job);
+ }
+ } while (!job->ready);
+
+ block_job_complete_sync(job, errp);
+}
+
static int img_commit(int argc, char **argv)
{
int c, ret, flags;
const char *filename, *fmt, *cache;
- BlockDriverState *bs;
+ BlockDriverState *bs, *base_bs;
bool quiet = false;
+ Error *local_err = NULL;
+ CommonBlockJobCBInfo cbi;
fmt = NULL;
cache = BDRV_DEFAULT_CACHE;
@@ -767,29 +802,39 @@ static int img_commit(int argc, char **argv)
if (!bs) {
return 1;
}
- ret = bdrv_commit(bs);
- switch(ret) {
- case 0:
- qprintf(quiet, "Image committed.\n");
- break;
- case -ENOENT:
- error_report("No disk inserted");
- break;
- case -EACCES:
- error_report("Image is read-only");
- break;
- case -ENOTSUP:
- error_report("Image is already committed");
- break;
- default:
- error_report("Error while committing image");
- break;
+
+ /* This is different from QMP, which by default uses the deepest file in
the
+ * backing chain (i.e., the very base); however, the traditional behavior
of
+ * qemu-img commit is using the immediate backing file. */
+ base_bs = bs->backing_hd;
+ if (!base_bs) {
+ error_set(&local_err, QERR_BASE_NOT_FOUND, "NULL");
+ goto done;
+ }
+
+ cbi = (CommonBlockJobCBInfo){
+ .errp = &local_err,
+ .bs = bs,
+ };
+
+ commit_active_start(bs, base_bs, 0, BLOCKDEV_ON_ERROR_REPORT,
+ common_block_job_cb, &cbi, &local_err);
+ if (local_err) {
+ goto done;
}
+ run_block_job(bs->job, &local_err);
+
+done:
bdrv_unref(bs);
- if (ret) {
+
+ if (local_err) {
+ qerror_report_err(local_err);
+ error_free(local_err);
return 1;
}
+
+ qprintf(quiet, "Image committed.\n");
return 0;
}
--
2.0.4
- [Qemu-devel] [PATCH v11 00/14] qemu-img: Implement commit like QMP, Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 01/14] qcow2: Allow "full" discard, Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 02/14] qcow2: Implement bdrv_make_empty(), Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 03/14] qcow2: Optimize bdrv_make_empty(), Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 05/14] blockjob: Add "ready" field, Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 06/14] block/mirror: Improve progress report, Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 07/14] qemu-img: Implement commit like QMP,
Max Reitz <=
- [Qemu-devel] [PATCH v11 12/14] iotests: Add test for backing-chain commits, Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 11/14] iotests: Add _filter_qemu_img_map, Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 13/14] iotests: Add test for qcow2's bdrv_make_empty, Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 14/14] iotests: Omit length/offset test in 040 and 041, Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 10/14] qemu-img: Specify backing file for commit, Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 04/14] blockjob: Introduce block_job_complete_sync(), Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 09/14] qemu-img: Enable progress output for commit, Max Reitz, 2014/08/20
- [Qemu-devel] [PATCH v11 08/14] qemu-img: Empty image after commit, Max Reitz, 2014/08/20