[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/26] raw-win32: migrate cow driver QemuOptionParam
From: |
Leandro Dorileo |
Subject: |
[Qemu-devel] [PATCH 15/26] raw-win32: migrate cow driver QemuOptionParameter usage |
Date: |
Thu, 20 Mar 2014 21:13:22 -0300 |
Do the directly migration from QemuOptionParameter to QemuOpts on
raw-win32 block driver.
Signed-off-by: Leandro Dorileo <address@hidden>
---
block/raw-win32.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/block/raw-win32.c b/block/raw-win32.c
index 48cb2c2..4cca514 100644
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -475,21 +475,14 @@ static int64_t
raw_get_allocated_file_size(BlockDriverState *bs)
return st.st_size;
}
-static int raw_create(const char *filename, QEMUOptionParameter *options,
- Error **errp)
+static int raw_create(const char *filename, QemuOpts *options, Error **errp)
{
int fd;
int64_t total_size = 0;
strstart(filename, "file:", &filename);
- /* Read out options */
- while (options && options->name) {
- if (!strcmp(options->name, BLOCK_OPT_SIZE)) {
- total_size = options->value.n / 512;
- }
- options++;
- }
+ total_size = qemu_opt_get_size(options, BLOCK_OPT_SIZE, 0);
fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
0644);
@@ -503,13 +496,17 @@ static int raw_create(const char *filename,
QEMUOptionParameter *options,
return 0;
}
-static QEMUOptionParameter raw_create_options[] = {
- {
- .name = BLOCK_OPT_SIZE,
- .type = OPT_SIZE,
- .help = "Virtual disk size"
+static QemuOptsList raw_create_options = {
+ .name = "raw_create_options",
+ .head = QTAILQ_HEAD_INITIALIZER(raw_create_options.head),
+ .desc = {
+ {
+ .name = BLOCK_OPT_SIZE,
+ .type = QEMU_OPT_SIZE,
+ .help = "Virtual disk size"
+ },
+ { NULL }
},
- { NULL }
};
static BlockDriver bdrv_file = {
@@ -532,7 +529,7 @@ static BlockDriver bdrv_file = {
.bdrv_get_allocated_file_size
= raw_get_allocated_file_size,
- .create_options = raw_create_options,
+ .create_options = &raw_create_options,
};
/***********************************************/
--
1.9.0
- [Qemu-devel] [PATCH 05/26] QemuOpt: add qemu_opt_print_help(), (continued)
- [Qemu-devel] [PATCH 05/26] QemuOpt: add qemu_opt_print_help(), Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 06/26] block: migrate block later QemuOptionParameter, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 07/26] cow: migrate cow driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 08/26] gluster: migrate gluster driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 09/26] iscsi: migrate iscsi driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 10/26] nfs: migrate nfs driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 11/26] qcow: migrate qcow driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 12/26] qcow2: migrate qcow2 driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 13/26] qed: migrate qed driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 14/26] raw-posix: migrate raw-posix driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 15/26] raw-win32: migrate cow driver QemuOptionParameter usage,
Leandro Dorileo <=
- [Qemu-devel] [PATCH 16/26] raw_bsd: migrate raw_bsd driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 21/26] vhdx: migrate vhdx driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 22/26] vmdk: migrate vmdk driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 23/26] vpc: migrate vpc driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 24/26] vvfat: migrate vvfat driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 25/26] QemuOpt: get rid of QEMUOptionParameter, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 26/26] qemu-img: migrate QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 18/26] sheepdog: migrate sheepdog driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 20/26] vdi: migrate vdi driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 19/26] ssh: migrate ssh driver QemuOptionParameter usage, Leandro Dorileo, 2014/03/20