From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMuh0-00060P-4K for qemu-devel@nongnu.org; Mon, 10 Mar 2014 03:32:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WMugs-0000XA-3s for qemu-devel@nongnu.org; Mon, 10 Mar 2014 03:32:09 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:34000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMugr-0000WW-T0 for qemu-devel@nongnu.org; Mon, 10 Mar 2014 03:32:02 -0400 From: Chunyan Liu Date: Mon, 10 Mar 2014 15:31:46 +0800 Message-Id: <1394436721-21812-11-git-send-email-cyliu@suse.com> In-Reply-To: <1394436721-21812-1-git-send-email-cyliu@suse.com> References: <1394436721-21812-1-git-send-email-cyliu@suse.com> Subject: [Qemu-devel] [PATCH v22 10/25] iscsi.c: replace QEMUOptionParameter with QemuOpts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Dong Xu Wang , Chunyan Liu , stefanha@redhat.com Signed-off-by: Dong Xu Wang Signed-off-by: Chunyan Liu --- block/iscsi.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index b490e98..4379d14 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1394,13 +1394,8 @@ 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_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE; bs->opaque = g_malloc0(sizeof(struct IscsiLun)); iscsilun = bs->opaque; @@ -1451,13 +1446,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" - }, - { NULL } +static QemuOptsList iscsi_create_opts = { + .name = "iscsi-create-opts", + .head = QTAILQ_HEAD_INITIALIZER(iscsi_create_opts.head), + .desc = { + { + .name = BLOCK_OPT_SIZE, + .type = QEMU_OPT_SIZE, + .help = "Virtual disk size" + }, + { /* end of list */ } + } }; static BlockDriver bdrv_iscsi = { @@ -1469,7 +1468,7 @@ static BlockDriver bdrv_iscsi = { .bdrv_file_open = iscsi_open, .bdrv_close = iscsi_close, .bdrv_create = iscsi_create, - .create_options = iscsi_create_options, + .create_opts = &iscsi_create_opts, .bdrv_reopen_prepare = iscsi_reopen_prepare, .bdrv_getlength = iscsi_getlength, -- 1.7.12.4