From patchwork Mon Apr 29 18:42:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 10922407 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 782D3933 for ; Mon, 29 Apr 2019 18:47:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C7AA2863E for ; Mon, 29 Apr 2019 18:47:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FCD1287AA; Mon, 29 Apr 2019 18:47:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 518582863E for ; Mon, 29 Apr 2019 18:47:01 +0000 (UTC) Received: from localhost ([127.0.0.1]:33757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLBIq-0006O0-Ma for patchwork-qemu-devel@patchwork.kernel.org; Mon, 29 Apr 2019 14:47:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56808) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLBF4-0003Ig-OR for qemu-devel@nongnu.org; Mon, 29 Apr 2019 14:43:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLBF0-0002QU-Od for qemu-devel@nongnu.org; Mon, 29 Apr 2019 14:43:06 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:54753) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hLBF0-0002Pe-5t; Mon, 29 Apr 2019 14:43:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=N9Ijrdys9rcn5uS4tPdtWX/PEwV61+M0Lnq/0LHPSa4=; b=bFZ5AH9H+7FNi5Bx/jXnw/r89Hqs+y9rSbVehFhSif8nojjtW0xrVF95poZUWJb+djIatNocG0i1wwd83BSpPISnBjP/2Wtw1XXc9l11wiqbGG9GHecO+cKeuWGufDPw2XgVH9qcot8YX1jaqPcgm9kX2Jij9065bNRfAvBnLhQlMNlb/Jr2dyhtwMsX9/Ssav1trYYGI7fpZbd5slBqMdlK5DVB+oRc1g0oGwrYVN3jvmD+sRcbGnPVRKvrsNl0jilIPI50F6/CY+E2vpNQbtAjtkbSAGsLFgHhea7QdlD+JUTAXkxPPmgO5oNyOJAOSHXwYfslsMHtiMSA7D+/kA==; Received: from static-191-95-145-212.ipcom.comunitel.net ([212.145.95.191] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1hLBEx-0006XN-Rd; Mon, 29 Apr 2019 20:42:59 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from ) id 1hLBEl-0002ZX-Ax; Mon, 29 Apr 2019 21:42:47 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Mon, 29 Apr 2019 20:42:40 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH 5/5] qcow2: Remove BDRVQcow2State.cluster_sectors 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 , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The last user of this field disappeared when we replace the sector-based bdrv_write() with the byte-based bdrv_pwrite(). Signed-off-by: Alberto Garcia --- block/qcow2.c | 1 - block/qcow2.h | 1 - 2 files changed, 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 3ace3b2209..3a3240fcca 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1259,7 +1259,6 @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options, s->cluster_bits = header.cluster_bits; s->cluster_size = 1 << s->cluster_bits; - s->cluster_sectors = 1 << (s->cluster_bits - BDRV_SECTOR_BITS); /* Initialise version 3 header fields */ if (header.version == 2) { diff --git a/block/qcow2.h b/block/qcow2.h index fdee297f33..e62508d1ce 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -266,7 +266,6 @@ typedef struct Qcow2BitmapHeaderExt { typedef struct BDRVQcow2State { int cluster_bits; int cluster_size; - int cluster_sectors; int l2_slice_size; int l2_bits; int l2_size;