[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/26] iscsi: migrate iscsi driver QemuOptionParamet
From: |
Leandro Dorileo |
Subject: |
[Qemu-devel] [PATCH 09/26] iscsi: migrate iscsi driver QemuOptionParameter usage |
Date: |
Thu, 20 Mar 2014 21:13:16 -0300 |
Do the directly migration from QemuOptionParameter to QemuOpts on
iscsi block driver.
Signed-off-by: Leandro Dorileo <address@hidden>
---
block/iscsi.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index b490e98..85252e7 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1125,7 +1125,7 @@ static int iscsi_open(BlockDriverState *bs, QDict
*options, int flags,
QemuOpts *opts;
Error *local_err = NULL;
const char *filename;
- int i, ret;
+ int i, ret = 0;
if ((BDRV_SECTOR_SIZE % 512) != 0) {
error_setg(errp, "iSCSI: Invalid BDRV_SECTOR_SIZE. "
@@ -1382,8 +1382,7 @@ static int iscsi_truncate(BlockDriverState *bs, int64_t
offset)
return 0;
}
-static int iscsi_create(const char *filename, QEMUOptionParameter *options,
- Error **errp)
+static int iscsi_create(const char *filename, QemuOpts *options, Error **errp)
{
int ret = 0;
int64_t total_size = 0;
@@ -1393,12 +1392,9 @@ static int iscsi_create(const char *filename,
QEMUOptionParameter *options,
bs = bdrv_new("");
- /* Read out options */
- while (options && options->name) {
- if (!strcmp(options->name, "size")) {
- total_size = options->value.n / BDRV_SECTOR_SIZE;
- }
- options++;
+ total_size = qemu_opt_get_size(options, BLOCK_OPT_SIZE, 0);
+ if (total_size) {
+ total_size = total_size / BDRV_SECTOR_SIZE;
}
bs->opaque = g_malloc0(sizeof(struct IscsiLun));
@@ -1451,13 +1447,17 @@ static int iscsi_get_info(BlockDriverState *bs,
BlockDriverInfo *bdi)
return 0;
}
-static QEMUOptionParameter iscsi_create_options[] = {
- {
- .name = BLOCK_OPT_SIZE,
- .type = OPT_SIZE,
- .help = "Virtual disk size"
+static QemuOptsList iscsi_create_options = {
+ .name = "iscsi_create_options",
+ .head = QTAILQ_HEAD_INITIALIZER(iscsi_create_options.head),
+ .desc = {
+ {
+ .name = BLOCK_OPT_SIZE,
+ .type = QEMU_OPT_SIZE,
+ .help = "Virtual disk size"
+ },
+ { NULL }
},
- { NULL }
};
static BlockDriver bdrv_iscsi = {
@@ -1469,7 +1469,7 @@ static BlockDriver bdrv_iscsi = {
.bdrv_file_open = iscsi_open,
.bdrv_close = iscsi_close,
.bdrv_create = iscsi_create,
- .create_options = iscsi_create_options,
+ .create_options = &iscsi_create_options,
.bdrv_reopen_prepare = iscsi_reopen_prepare,
.bdrv_getlength = iscsi_getlength,
--
1.9.0
- [Qemu-devel] [PATCH 00/26] QemuOptionParameter -> QemuOpts migration, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 01/26] qapi: output def_value_str when query command line options, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 02/26] add def_value_str to QemuOptDesc, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 03/26] QemuOpt: improve default value, Leandro Dorileo, 2014/03/20
- [Qemu-devel] [PATCH 04/26] QemuOpt: introduce qemu_opts_append(), Leandro Dorileo, 2014/03/20
- [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 <=
[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