[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [RFC PATCH 08/11] qcow2: Add basic data-file infrastructure
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [RFC PATCH 08/11] qcow2: Add basic data-file infrastructure |
Date: |
Thu, 31 Jan 2019 18:55:46 +0100 |
This adds a .bdrv_open option to specify the external data file node.
Signed-off-by: Kevin Wolf <address@hidden>
---
qapi/block-core.json | 3 ++-
block/qcow2.h | 4 +++-
block/qcow2.c | 25 +++++++++++++++++++++++--
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 7f6b4b3ddd..fc46396079 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2928,7 +2928,8 @@
'*l2-cache-entry-size': 'int',
'*refcount-cache-size': 'int',
'*cache-clean-interval': 'int',
- '*encrypt': 'BlockdevQcow2Encryption' } }
+ '*encrypt': 'BlockdevQcow2Encryption',
+ '*data-file': 'BlockdevRef' } }
##
# @SshHostKeyCheckMode:
diff --git a/block/qcow2.h b/block/qcow2.h
index c161970882..e2114900b4 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -91,6 +91,7 @@
#define DEFAULT_CLUSTER_SIZE 65536
+#define QCOW2_OPT_DATA_FILE "data-file"
#define QCOW2_OPT_LAZY_REFCOUNTS "lazy-refcounts"
#define QCOW2_OPT_DISCARD_REQUEST "pass-discard-request"
#define QCOW2_OPT_DISCARD_SNAPSHOT "pass-discard-snapshot"
@@ -205,7 +206,8 @@ enum {
QCOW2_INCOMPAT_DATA_FILE = 1 << QCOW2_INCOMPAT_DATA_FILE_BITNR,
QCOW2_INCOMPAT_MASK = QCOW2_INCOMPAT_DIRTY
- | QCOW2_INCOMPAT_CORRUPT,
+ | QCOW2_INCOMPAT_CORRUPT
+ | QCOW2_INCOMPAT_DATA_FILE,
};
/* Compatible feature bits */
diff --git a/block/qcow2.c b/block/qcow2.c
index ac9934b3ed..376232d3f0 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1441,8 +1441,22 @@ static int coroutine_fn qcow2_do_open(BlockDriverState
*bs, QDict *options,
goto fail;
}
- /* TODO Open external data file */
- s->data_file = bs->file;
+ /* Open external data file */
+ if (s->incompatible_features & QCOW2_INCOMPAT_DATA_FILE) {
+ s->data_file = bdrv_open_child(NULL, options, "data-file", bs,
+ &child_file, false, errp);
+ if (!s->data_file) {
+ ret = -EINVAL;
+ goto fail;
+ }
+ } else if (qdict_get(options, QCOW2_OPT_DATA_FILE)) {
+ error_setg(errp, "'data-file' can only be set for images with an "
+ "external data file");
+ ret = -EINVAL;
+ goto fail;
+ } else {
+ s->data_file = bs->file;
+ }
/* qcow2_read_extension may have set up the crypto context
* if the crypt method needs a header region, some methods
@@ -1613,6 +1627,9 @@ static int coroutine_fn qcow2_do_open(BlockDriverState
*bs, QDict *options,
return ret;
fail:
+ if (has_data_file(bs)) {
+ bdrv_unref_child(bs, s->data_file);
+ }
g_free(s->unknown_header_fields);
cleanup_unknown_header_ext(bs);
qcow2_free_snapshots(bs);
@@ -2232,6 +2249,10 @@ static void qcow2_close(BlockDriverState *bs)
g_free(s->image_backing_file);
g_free(s->image_backing_format);
+ if (has_data_file(bs)) {
+ bdrv_unref_child(bs, s->data_file);
+ }
+
qcow2_refcount_close(bs);
qcow2_free_snapshots(bs);
}
--
2.20.1
- [Qemu-block] [RFC PATCH 00/11] qcow2: External data files, Kevin Wolf, 2019/01/31
- [Qemu-block] [RFC PATCH 02/11] qcow2: Basic definitions for external data files, Kevin Wolf, 2019/01/31
- [Qemu-block] [RFC PATCH 01/11] qcow2: Extend spec for external data files, Kevin Wolf, 2019/01/31
- [Qemu-block] [RFC PATCH 03/11] qcow2: Pass bs to qcow2_get_cluster_type(), Kevin Wolf, 2019/01/31
- [Qemu-block] [RFC PATCH 04/11] qcow2: Prepare qcow2_get_cluster_type() for external data file, Kevin Wolf, 2019/01/31
- [Qemu-block] [RFC PATCH 05/11] qcow2: Prepare count_contiguous_clusters() for external data file, Kevin Wolf, 2019/01/31
- [Qemu-block] [RFC PATCH 06/11] qcow2: Don't assume 0 is an invalid cluster offset, Kevin Wolf, 2019/01/31
- [Qemu-block] [RFC PATCH 07/11] qcow2: External file I/O, Kevin Wolf, 2019/01/31
- [Qemu-block] [RFC PATCH 08/11] qcow2: Add basic data-file infrastructure,
Kevin Wolf <=
- [Qemu-block] [RFC PATCH 09/11] qcow2: Creating images with external data file, Kevin Wolf, 2019/01/31
- [Qemu-block] [RFC PATCH 11/11] qcow2: Add data file to ImageInfoSpecificQCow2, Kevin Wolf, 2019/01/31
- [Qemu-block] [RFC PATCH 10/11] qcow2: Store data file name in the image, Kevin Wolf, 2019/01/31
- Re: [Qemu-block] [RFC PATCH 00/11] qcow2: External data files, Nir Soffer, 2019/01/31