From patchwork Fri Apr 12 20:48:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 236208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BB93B2C00A9 for ; Sat, 13 Apr 2013 06:55:34 +1000 (EST) Received: from localhost ([::1]:49681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQl0P-0004q7-2y for incoming@patchwork.ozlabs.org; Fri, 12 Apr 2013 16:55:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQkti-0002QB-2u for qemu-devel@nongnu.org; Fri, 12 Apr 2013 16:48:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQktc-0004o8-Ml for qemu-devel@nongnu.org; Fri, 12 Apr 2013 16:48:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQktc-0004nd-Fk for qemu-devel@nongnu.org; Fri, 12 Apr 2013 16:48:32 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3CKmVsX007419 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 12 Apr 2013 16:48:31 -0400 Received: from dhcp-200-207.str.redhat.com (ovpn-116-52.ams2.redhat.com [10.36.116.52]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3CKmCJ1009994; Fri, 12 Apr 2013 16:48:30 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Fri, 12 Apr 2013 22:48:03 +0200 Message-Id: <1365799688-19918-11-git-send-email-kwolf@redhat.com> In-Reply-To: <1365799688-19918-1-git-send-email-kwolf@redhat.com> References: <1365799688-19918-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 10/15] iscsi: Use bdrv_open options instead of filename X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is only to convert the internal interface that is used for passing the "filename" to be parsed, but converting to actual fine grained options is left for another day, as it doesn't look trivial. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block/iscsi.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 92d6eae..907beba 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1003,11 +1003,25 @@ out: return ret; } +/* TODO Convert to fine grained options */ +static QemuOptsList runtime_opts = { + .name = "iscsi", + .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head), + .desc = { + { + .name = "filename", + .type = QEMU_OPT_STRING, + .help = "URL to the iscsi image", + }, + { /* end of list */ } + }, +}; + /* * We support iscsi url's on the form * iscsi://[%@][:]// */ -static int iscsi_open(BlockDriverState *bs, const char *filename, +static int iscsi_open(BlockDriverState *bs, const char *dummy, QDict *options, int flags) { IscsiLun *iscsilun = bs->opaque; @@ -1016,6 +1030,9 @@ static int iscsi_open(BlockDriverState *bs, const char *filename, struct scsi_task *task = NULL; struct scsi_inquiry_standard *inq = NULL; char *initiator_name = NULL; + QemuOpts *opts; + Error *local_err = NULL; + const char *filename; int ret; if ((BDRV_SECTOR_SIZE % 512) != 0) { @@ -1025,6 +1042,18 @@ static int iscsi_open(BlockDriverState *bs, const char *filename, return -EINVAL; } + opts = qemu_opts_create_nofail(&runtime_opts); + qemu_opts_absorb_qdict(opts, options, &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); + ret = -EINVAL; + goto out; + } + + filename = qemu_opt_get(opts, "filename"); + + iscsi_url = iscsi_parse_full_url(iscsi, filename); if (iscsi_url == NULL) { error_report("Failed to parse URL : %s", filename); @@ -1126,6 +1155,7 @@ static int iscsi_open(BlockDriverState *bs, const char *filename, #endif out: + qemu_opts_del(opts); if (initiator_name != NULL) { g_free(initiator_name); } @@ -1190,6 +1220,7 @@ static int iscsi_create(const char *filename, QEMUOptionParameter *options) int64_t total_size = 0; BlockDriverState bs; IscsiLun *iscsilun = NULL; + QDict *bs_options; memset(&bs, 0, sizeof(BlockDriverState)); @@ -1204,7 +1235,11 @@ static int iscsi_create(const char *filename, QEMUOptionParameter *options) bs.opaque = g_malloc0(sizeof(struct IscsiLun)); iscsilun = bs.opaque; - ret = iscsi_open(&bs, filename, NULL, 0); + bs_options = qdict_new(); + qdict_put(bs_options, "filename", qstring_from_str(filename)); + ret = iscsi_open(&bs, NULL, bs_options, 0); + QDECREF(bs_options); + if (ret != 0) { goto out; }