From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQn6M-000142-Vx for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:14:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQn6G-0007bY-U4 for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:14:22 -0400 Received: from mail-yh0-f52.google.com ([209.85.213.52]:41684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQn6G-0007bS-Oo for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:14:16 -0400 Received: by mail-yh0-f52.google.com with SMTP id c41so1696795yho.11 for ; Thu, 20 Mar 2014 17:14:16 -0700 (PDT) From: Leandro Dorileo Date: Thu, 20 Mar 2014 21:13:16 -0300 Message-Id: <1395360813-2833-10-git-send-email-l@dorileo.org> In-Reply-To: <1395360813-2833-1-git-send-email-l@dorileo.org> References: <1395360813-2833-1-git-send-email-l@dorileo.org> Subject: [Qemu-devel] [PATCH 09/26] iscsi: migrate iscsi driver QemuOptionParameter usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Liu Yuan , Jeff Cody , Markus Armbruster , Peter Lieven , "Richard W.M. Jones" , Luiz Capitulino , Leandro Dorileo , Ronnie Sahlberg , Josh Durgin , Anthony Liguori , Paolo Bonzini , Stefan Weil , Max Reitz , MORITA Kazutaka , Benoit Canet Do the directly migration from QemuOptionParameter to QemuOpts on iscsi block driver. Signed-off-by: Leandro Dorileo --- 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