[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 03/36] qcow2: Let qcow2_create() handle protocol
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v3 03/36] qcow2: Let qcow2_create() handle protocol layer |
Date: |
Fri, 23 Feb 2018 20:25:16 +0100 |
Currently, qcow2_create() only parses the QemuOpts and then calls
qcow2_create2() for the actual image creation, which includes both the
creation of the actual file on the file system and writing a valid empty
qcow2 image into that file.
The plan is that qcow2_create2() becomes the function that implements
the functionality for a future 'blockdev-create' QMP command, which only
creates the qcow2 layer on an already opened file node.
This is a first step towards that goal: Let's move out anything that
deals with the protocol layer from qcow2_create2() into qcow2_create().
This means that qcow2_create2() doesn't need a file name any more.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/qcow2.c | 64 +++++++++++++++++++++++++++++++++++------------------------
1 file changed, 38 insertions(+), 26 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 288b5299d8..dc6cdea113 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2725,7 +2725,7 @@ static uint64_t qcow2_opt_get_refcount_bits_del(QemuOpts
*opts, int version,
return refcount_bits;
}
-static int qcow2_create2(const char *filename, int64_t total_size,
+static int qcow2_create2(BlockDriverState *bs, int64_t total_size,
const char *backing_file, const char *backing_format,
int flags, size_t cluster_size, PreallocMode prealloc,
QemuOpts *opts, int version, int refcount_order,
@@ -2751,28 +2751,11 @@ static int qcow2_create2(const char *filename, int64_t
total_size,
Error *local_err = NULL;
int ret;
- if (prealloc == PREALLOC_MODE_FULL || prealloc == PREALLOC_MODE_FALLOC) {
- int64_t prealloc_size =
- qcow2_calc_prealloc_size(total_size, cluster_size, refcount_order);
- qemu_opt_set_number(opts, BLOCK_OPT_SIZE, prealloc_size, &error_abort);
- qemu_opt_set(opts, BLOCK_OPT_PREALLOC, PreallocMode_str(prealloc),
- &error_abort);
- }
-
- ret = bdrv_create_file(filename, opts, &local_err);
+ blk = blk_new(BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL);
+ ret = blk_insert_bs(blk, bs, errp);
if (ret < 0) {
- error_propagate(errp, local_err);
- return ret;
- }
-
- blk = blk_new_open(filename, NULL, NULL,
- BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL,
- &local_err);
- if (blk == NULL) {
- error_propagate(errp, local_err);
- return -EIO;
+ goto out;
}
-
blk_set_allow_write_beyond_eof(blk, true);
/* Write the header */
@@ -2827,7 +2810,8 @@ static int qcow2_create2(const char *filename, int64_t
total_size,
*/
options = qdict_new();
qdict_put_str(options, "driver", "qcow2");
- blk = blk_new_open(filename, NULL, options,
+ qdict_put_str(options, "file", bs->node_name);
+ blk = blk_new_open(NULL, NULL, options,
BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_NO_FLUSH,
&local_err);
if (blk == NULL) {
@@ -2899,7 +2883,8 @@ static int qcow2_create2(const char *filename, int64_t
total_size,
*/
options = qdict_new();
qdict_put_str(options, "driver", "qcow2");
- blk = blk_new_open(filename, NULL, options,
+ qdict_put_str(options, "file", bs->node_name);
+ blk = blk_new_open(NULL, NULL, options,
BDRV_O_RDWR | BDRV_O_NO_BACKING | BDRV_O_NO_IO,
&local_err);
if (blk == NULL) {
@@ -2929,6 +2914,7 @@ static int qcow2_create(const char *filename, QemuOpts
*opts, Error **errp)
uint64_t refcount_bits;
int refcount_order;
char *encryptfmt = NULL;
+ BlockDriverState *bs = NULL;
Error *local_err = NULL;
int ret;
@@ -2997,12 +2983,38 @@ static int qcow2_create(const char *filename, QemuOpts
*opts, Error **errp)
refcount_order = ctz32(refcount_bits);
- ret = qcow2_create2(filename, size, backing_file, backing_fmt, flags,
+ /* Create and open the file (protocol layer) */
+ if (prealloc == PREALLOC_MODE_FULL || prealloc == PREALLOC_MODE_FALLOC) {
+ int64_t prealloc_size =
+ qcow2_calc_prealloc_size(size, cluster_size, refcount_order);
+ qemu_opt_set_number(opts, BLOCK_OPT_SIZE, prealloc_size, &error_abort);
+ qemu_opt_set(opts, BLOCK_OPT_PREALLOC, PreallocMode_str(prealloc),
+ &error_abort);
+ }
+
+ ret = bdrv_create_file(filename, opts, errp);
+ if (ret < 0) {
+ goto finish;
+ }
+
+ bs = bdrv_open(filename, NULL, NULL,
+ BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, errp);
+ if (bs == NULL) {
+ ret = -EIO;
+ goto finish;
+ }
+
+ /* Create the qcow2 image (format layer) */
+ ret = qcow2_create2(bs, size, backing_file, backing_fmt, flags,
cluster_size, prealloc, opts, version, refcount_order,
- encryptfmt, &local_err);
- error_propagate(errp, local_err);
+ encryptfmt, errp);
+ if (ret < 0) {
+ goto finish;
+ }
finish:
+ bdrv_unref(bs);
+
g_free(backing_file);
g_free(backing_fmt);
g_free(encryptfmt);
--
2.13.6
- [Qemu-block] [PATCH v3 00/36] x-blockdev-create for protocols and qcow2, Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 02/36] block/qapi: Add qcow2 create options to schema, Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 01/36] block/qapi: Introduce BlockdevCreateOptions, Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 05/36] qcow2: Use BlockdevRef in qcow2_create2(), Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 03/36] qcow2: Let qcow2_create() handle protocol layer,
Kevin Wolf <=
- [Qemu-block] [PATCH v3 04/36] qcow2: Pass BlockdevCreateOptions to qcow2_create2(), Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 06/36] qcow2: Use QCryptoBlockCreateOptions in qcow2_create2(), Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 07/36] qcow2: Handle full/falloc preallocation in qcow2_create2(), Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 08/36] util: Add qemu_opts_to_qdict_filtered(), Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 09/36] test-qemu-opts: Test qemu_opts_append(), Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 11/36] qdict: Introduce qdict_rename_keys(), Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 10/36] test-qemu-opts: Test qemu_opts_to_qdict_filtered(), Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 13/36] block: Make bdrv_is_whitelisted() public, Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 12/36] qcow2: Use visitor for options in qcow2_create(), Kevin Wolf, 2018/02/23
- [Qemu-block] [PATCH v3 16/36] file-win32: Support .bdrv_co_create, Kevin Wolf, 2018/02/23