From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V96IM-00072X-Qn for qemu-devel@nongnu.org; Tue, 13 Aug 2013 00:33:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V96IE-0000Np-Cj for qemu-devel@nongnu.org; Tue, 13 Aug 2013 00:33:22 -0400 Received: from mail-pb0-x235.google.com ([2607:f8b0:400e:c01::235]:54786) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V96IE-0000Ne-4W for qemu-devel@nongnu.org; Tue, 13 Aug 2013 00:33:14 -0400 Received: by mail-pb0-f53.google.com with SMTP id up15so7514784pbc.26 for ; Mon, 12 Aug 2013 21:33:13 -0700 (PDT) Sender: Dong Xu Wang From: Dong Xu Wang Date: Tue, 13 Aug 2013 12:31:50 +0800 Message-Id: <1376368326-7433-10-git-send-email-wdongxu@linux.vnet.ibm.com> In-Reply-To: <1376368326-7433-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1376368326-7433-1-git-send-email-wdongxu@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V18 09/25] block: add QemuOpts support for iscsi.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, wdongxu@cn.ibm.com, stefanha@redhat.com, Dong Xu Wang Signed-off-by: Dong Xu Wang --- block/iscsi.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index e7c1c2b..de2fd8c 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1305,6 +1305,65 @@ static QEMUOptionParameter iscsi_create_options[] = { { NULL } }; +static int iscsi_create_new(const char *filename, QemuOpts *opts) +{ + int ret = 0; + int64_t total_size = 0; + BlockDriverState bs; + IscsiLun *iscsilun = NULL; + QDict *bs_options; + + memset(&bs, 0, sizeof(BlockDriverState)); + + /* Read out 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; + + bs_options = qdict_new(); + qdict_put(bs_options, "filename", qstring_from_str(filename)); + ret = iscsi_open(&bs, bs_options, 0); + QDECREF(bs_options); + + if (ret != 0) { + goto out; + } + if (iscsilun->nop_timer) { + qemu_del_timer(iscsilun->nop_timer); + qemu_free_timer(iscsilun->nop_timer); + } + if (iscsilun->type != TYPE_DISK) { + ret = -ENODEV; + goto out; + } + if (bs.total_sectors < total_size) { + ret = -ENOSPC; + goto out; + } + + ret = 0; +out: + if (iscsilun->iscsi != NULL) { + iscsi_destroy_context(iscsilun->iscsi); + } + g_free(bs.opaque); + return ret; +} + +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 = { .format_name = "iscsi", .protocol_name = "iscsi", @@ -1313,7 +1372,9 @@ static BlockDriver bdrv_iscsi = { .bdrv_file_open = iscsi_open, .bdrv_close = iscsi_close, .bdrv_create = iscsi_create, + .bdrv_create_new = iscsi_create_new, .create_options = iscsi_create_options, + .bdrv_create_opts = &iscsi_create_opts, .bdrv_getlength = iscsi_getlength, .bdrv_truncate = iscsi_truncate, -- 1.7.11.7