From nobody Sun May 5 17:00:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491810955957633.5106600884128; Mon, 10 Apr 2017 00:55:55 -0700 (PDT) Received: from localhost ([::1]:32871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxUB0-0002MK-9I for importer@patchew.org; Mon, 10 Apr 2017 03:55:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxUAB-0001xx-5S for qemu-devel@nongnu.org; Mon, 10 Apr 2017 03:55:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxUAA-0002VJ-Df for qemu-devel@nongnu.org; Mon, 10 Apr 2017 03:55:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42112) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxUA6-0002Tm-1P; Mon, 10 Apr 2017 03:54:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6865C04B937; Mon, 10 Apr 2017 07:54:56 +0000 (UTC) Received: from lemon.redhat.com (ovpn-8-94.pek2.redhat.com [10.72.8.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AAF699597; Mon, 10 Apr 2017 07:54:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B6865C04B937 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=famz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B6865C04B937 From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 10 Apr 2017 15:54:51 +0800 Message-Id: <20170410075451.21329-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 10 Apr 2017 07:54:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.9] iscsi: Fix iscsi_create X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Peter Lieven , Max Reitz , Ronnie Sahlberg , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since d5895fcb (iscsi: Split URL into individual options), creating qcow2 image on an iscsi LUN fails: qemu-img create -f qcow2 iscsi://$SERVER/$IQN/0 1G qemu-img: iscsi://$SERVER/$IQN/0: Could not create image: Invalid argument The problem is iscsi_open now expects that transport_name, portal and target are already parsed into structured options by iscsi_parse_filename, but it is not called in iscsi_create. Signed-off-by: Fam Zheng Reviewed-by: Eric Blake --- block/iscsi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index 716e74a..07596b5 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2092,6 +2092,7 @@ static int iscsi_create(const char *filename, QemuOpt= s *opts, Error **errp) BlockDriverState *bs; IscsiLun *iscsilun =3D NULL; QDict *bs_options; + Error *local_err =3D NULL; =20 bs =3D bdrv_new(); =20 @@ -2103,7 +2104,13 @@ static int iscsi_create(const char *filename, QemuOp= ts *opts, Error **errp) =20 bs_options =3D qdict_new(); qdict_put(bs_options, "filename", qstring_from_str(filename)); - ret =3D iscsi_open(bs, bs_options, 0, NULL); + iscsi_parse_filename(filename, bs_options, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret =3D -EINVAL; + } else { + ret =3D iscsi_open(bs, bs_options, 0, NULL); + } QDECREF(bs_options); =20 if (ret !=3D 0) { --=20 2.9.3