From nobody Tue Apr 15 14:49:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582215595; cv=none; d=zohomail.com; s=zohoarc; b=eQRIQjNdxDr36woIDi1p6VTt5jxUR4o3IRklEOy2pi0Y36gWizd3Q19rR9BQJ2ot/yF7tfOkLkWR20os9Xmnx9NWi/ynvdZlKsUvy9oH9IIg5o4+rrbZhFMec3X3AJrNH7+kROX1LUnpHXxj/SPd8a8iUqqifxw7G4gdzjgue+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582215595; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qUx1jkzn2LXx673KdYZrWkQgEj1mTKxfCWKAh53agL8=; b=UqYeVt9hLrWrBNNVk8blzhBeXZVk4p86KQSY1JdpUqlE8Z6PczFYKK3yRmV23oBblKXJ+lVVmDe2yoUaXp7wPFg16ngSBb2ftd8Y8KW1wJHiphnDouASKEVftt9yKOVJP4TABfjohkkQwCqVVNyCaaJPi3Y3d1JgR9HGsJpnUkY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582215595876733.6353023600392; Thu, 20 Feb 2020 08:19:55 -0800 (PST) Received: from localhost ([::1]:45326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4oYM-0005ds-KL for importer@patchew.org; Thu, 20 Feb 2020 11:19:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55225) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4oQW-0000ez-42 for qemu-devel@nongnu.org; Thu, 20 Feb 2020 11:11:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4oQU-0007Ep-7K for qemu-devel@nongnu.org; Thu, 20 Feb 2020 11:11:48 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:32110 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4oQU-0007DF-2x for qemu-devel@nongnu.org; Thu, 20 Feb 2020 11:11:46 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-362-TKwBCt8NOOuT1vOKRkTYkg-1; Thu, 20 Feb 2020 11:11:32 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E3BD7802700; Thu, 20 Feb 2020 16:11:30 +0000 (UTC) Received: from localhost (unknown [10.36.118.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C03F5DA7B; Thu, 20 Feb 2020 16:11:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582215096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qUx1jkzn2LXx673KdYZrWkQgEj1mTKxfCWKAh53agL8=; b=iiJ3OhKs/O7XE9oWSfzq+F1sdhAPA+DMv/+Z4jBulBAFjO/KyU6KiyCwD24+F0CA6jFVtT rmU4/GOlKAmg227cKrG62TIH/GNqneUYtL0d2X03y3/rvUjqRGptE+UbJFuRiPPZjy9R17 IbrHkQBI8EstY+hWI66bmFBgttpbfu4= From: Max Reitz To: qemu-block@nongnu.org Subject: [PULL 13/18] iscsi: Drop iscsi_co_create_opts() Date: Thu, 20 Feb 2020 17:07:05 +0100 Message-Id: <20200220160710.533297-14-mreitz@redhat.com> In-Reply-To: <20200220160710.533297-1-mreitz@redhat.com> References: <20200220160710.533297-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: TKwBCt8NOOuT1vOKRkTYkg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The generic fallback implementation effectively does the same. Reviewed-by: Maxim Levitsky Signed-off-by: Max Reitz Message-Id: <20200122164532.178040-5-mreitz@redhat.com> Signed-off-by: Max Reitz --- block/iscsi.c | 56 --------------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index c8feaa2f0e..682abd8e09 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -2164,58 +2164,6 @@ static int coroutine_fn iscsi_co_truncate(BlockDrive= rState *bs, int64_t offset, return 0; } =20 -static int coroutine_fn iscsi_co_create_opts(const char *filename, QemuOpt= s *opts, - Error **errp) -{ - int ret =3D 0; - int64_t total_size =3D 0; - BlockDriverState *bs; - IscsiLun *iscsilun =3D NULL; - QDict *bs_options; - Error *local_err =3D NULL; - - bs =3D bdrv_new(); - - /* Read out options */ - total_size =3D DIV_ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE= , 0), - BDRV_SECTOR_SIZE); - bs->opaque =3D g_new0(struct IscsiLun, 1); - iscsilun =3D bs->opaque; - - bs_options =3D qdict_new(); - 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); - } - qobject_unref(bs_options); - - if (ret !=3D 0) { - goto out; - } - iscsi_detach_aio_context(bs); - if (iscsilun->type !=3D TYPE_DISK) { - ret =3D -ENODEV; - goto out; - } - if (bs->total_sectors < total_size) { - ret =3D -ENOSPC; - goto out; - } - - ret =3D 0; -out: - if (iscsilun->iscsi !=3D NULL) { - iscsi_destroy_context(iscsilun->iscsi); - } - g_free(bs->opaque); - bs->opaque =3D NULL; - bdrv_unref(bs); - return ret; -} - static int iscsi_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) { IscsiLun *iscsilun =3D bs->opaque; @@ -2486,8 +2434,6 @@ static BlockDriver bdrv_iscsi =3D { .bdrv_parse_filename =3D iscsi_parse_filename, .bdrv_file_open =3D iscsi_open, .bdrv_close =3D iscsi_close, - .bdrv_co_create_opts =3D iscsi_co_create_opts, - .create_opts =3D &iscsi_create_opts, .bdrv_reopen_prepare =3D iscsi_reopen_prepare, .bdrv_reopen_commit =3D iscsi_reopen_commit, .bdrv_co_invalidate_cache =3D iscsi_co_invalidate_cache, @@ -2525,8 +2471,6 @@ static BlockDriver bdrv_iser =3D { .bdrv_parse_filename =3D iscsi_parse_filename, .bdrv_file_open =3D iscsi_open, .bdrv_close =3D iscsi_close, - .bdrv_co_create_opts =3D iscsi_co_create_opts, - .create_opts =3D &iscsi_create_opts, .bdrv_reopen_prepare =3D iscsi_reopen_prepare, .bdrv_reopen_commit =3D iscsi_reopen_commit, .bdrv_co_invalidate_cache =3D iscsi_co_invalidate_cache, --=20 2.24.1