[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 16/36] file-win32: Support .bdrv_co_create
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v3 16/36] file-win32: Support .bdrv_co_create |
Date: |
Fri, 23 Feb 2018 20:25:29 +0100 |
This adds the .bdrv_co_create driver callback to file-win32, which
enables image creation over QMP.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/file-win32.c | 45 +++++++++++++++++++++++++++++++++++++--------
1 file changed, 37 insertions(+), 8 deletions(-)
diff --git a/block/file-win32.c b/block/file-win32.c
index f24c7bb92c..d572cde357 100644
--- a/block/file-win32.c
+++ b/block/file-win32.c
@@ -553,29 +553,58 @@ static int64_t
raw_get_allocated_file_size(BlockDriverState *bs)
return st.st_size;
}
-static int raw_create(const char *filename, QemuOpts *opts, Error **errp)
+static int raw_co_create(BlockdevCreateOptions *options, Error **errp)
{
+ BlockdevCreateOptionsFile *file_opts;
int fd;
- int64_t total_size = 0;
- strstart(filename, "file:", &filename);
+ assert(options->driver == BLOCKDEV_DRIVER_FILE);
+ file_opts = &options->u.file;
- /* Read out options */
- total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),
- BDRV_SECTOR_SIZE);
+ if (file_opts->has_preallocation) {
+ error_setg(errp, "Preallocation is not supported on Windows");
+ return -EINVAL;
+ }
+ if (file_opts->has_nocow) {
+ error_setg(errp, "nocow is not supported on Windows");
+ return -EINVAL;
+ }
- fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
+ fd = qemu_open(file_opts->filename, O_WRONLY | O_CREAT | O_TRUNC |
O_BINARY,
0644);
if (fd < 0) {
error_setg_errno(errp, errno, "Could not create file");
return -EIO;
}
set_sparse(fd);
- ftruncate(fd, total_size);
+ ftruncate(fd, file_opts->size);
qemu_close(fd);
+
return 0;
}
+static int raw_create(const char *filename, QemuOpts *opts, Error **errp)
+{
+ BlockdevCreateOptions options;
+ int64_t total_size = 0;
+
+ strstart(filename, "file:", &filename);
+
+ /* Read out options */
+ total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),
+ BDRV_SECTOR_SIZE);
+
+ options = (BlockdevCreateOptions) {
+ .driver = BLOCKDEV_DRIVER_FILE,
+ .u.file = {
+ .filename = (char *) filename,
+ .size = total_size,
+ .has_preallocation = false,
+ .has_nocow = false,
+ },
+ };
+ return raw_co_create(&options, errp);
+}
static QemuOptsList raw_create_opts = {
.name = "raw-create-opts",
--
2.13.6
- [Qemu-devel] [PATCH v3 05/36] qcow2: Use BlockdevRef in qcow2_create2(), (continued)
- [Qemu-devel] [PATCH v3 05/36] qcow2: Use BlockdevRef in qcow2_create2(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 06/36] qcow2: Use QCryptoBlockCreateOptions in qcow2_create2(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 03/36] qcow2: Let qcow2_create() handle protocol layer, Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 04/36] qcow2: Pass BlockdevCreateOptions to qcow2_create2(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 07/36] qcow2: Handle full/falloc preallocation in qcow2_create2(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 08/36] util: Add qemu_opts_to_qdict_filtered(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 11/36] qdict: Introduce qdict_rename_keys(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 09/36] test-qemu-opts: Test qemu_opts_append(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 10/36] test-qemu-opts: Test qemu_opts_to_qdict_filtered(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 13/36] block: Make bdrv_is_whitelisted() public, Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 16/36] file-win32: Support .bdrv_co_create,
Kevin Wolf <=
- [Qemu-devel] [PATCH v3 14/36] block: x-blockdev-create QMP command, Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 15/36] file-posix: Support .bdrv_co_create, Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 12/36] qcow2: Use visitor for options in qcow2_create(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 17/36] gluster: Support .bdrv_co_create, Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 18/36] rbd: Fix use after free in qemu_rbd_set_keypairs() error path, Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 19/36] rbd: Factor out qemu_rbd_connect(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 21/36] rbd: Pass BlockdevOptionsRbd to qemu_rbd_connect(), Kevin Wolf, 2018/02/23
- [Qemu-devel] [PATCH v3 23/36] rbd: Assign s->snap/image_name in qemu_rbd_open(), Kevin Wolf, 2018/02/23