SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iscsi.c: replace QEMUOptionParameter with QemuOpts

Browse Source 
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Chunyan Liu 2014-06-05 17:20:55 +08:00 committed by Stefan Hajnoczi
parent 90c772de56
commit a59479e3f3
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
block/iscsi.c
View File

@ -1530,8 +1530,7 @@ static int iscsi_truncate(BlockDriverState *bs, int64_t offset)
return 0; return 0;
} }
static int iscsi_create(const char *filename, QEMUOptionParameter *options, static int iscsi_create(const char *filename, QemuOpts *opts, Error **errp)
Error **errp)
{ {
int ret = 0; int ret = 0;
int64_t total_size = 0; int64_t total_size = 0;
@ -1542,13 +1541,8 @@ static int iscsi_create(const char *filename, QEMUOptionParameter *options,
bs = bdrv_new("", &error_abort); bs = bdrv_new("", &error_abort);
/* Read out options */ /* Read out options */
while (options && options->name) { total_size =
if (!strcmp(options->name, "size")) { qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE;
total_size = options->value.n / BDRV_SECTOR_SIZE;
}
options++;
}
bs->opaque = g_malloc0(sizeof(struct IscsiLun)); bs->opaque = g_malloc0(sizeof(struct IscsiLun));
iscsilun = bs->opaque; iscsilun = bs->opaque;
@ -1590,13 +1584,17 @@ static int iscsi_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
return 0; return 0;
} }
static QEMUOptionParameter iscsi_create_options[] = { static QemuOptsList iscsi_create_opts = {
.name = "iscsi-create-opts",
.head = QTAILQ_HEAD_INITIALIZER(iscsi_create_opts.head),
.desc = {
{ {
.name = BLOCK_OPT_SIZE, .name = BLOCK_OPT_SIZE,
.type = OPT_SIZE, .type = QEMU_OPT_SIZE,
.help = "Virtual disk size" .help = "Virtual disk size"
}, },
{ NULL } { /* end of list */ }
}
}; };
static BlockDriver bdrv_iscsi = { static BlockDriver bdrv_iscsi = {
@ -1607,8 +1605,8 @@ static BlockDriver bdrv_iscsi = {
.bdrv_needs_filename = true, .bdrv_needs_filename = true,
.bdrv_file_open = iscsi_open, .bdrv_file_open = iscsi_open,
.bdrv_close = iscsi_close, .bdrv_close = iscsi_close,
.bdrv_create = iscsi_create, .bdrv_create2 = iscsi_create,
.create_options = iscsi_create_options, .create_opts = &iscsi_create_opts,
.bdrv_reopen_prepare = iscsi_reopen_prepare, .bdrv_reopen_prepare = iscsi_reopen_prepare,
.bdrv_getlength = iscsi_getlength, .bdrv_getlength = iscsi_getlength,