qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alberto Garcia <berto@igalia.com>
To: qemu-devel@nongnu.org
Cc: Alberto Garcia <berto@igalia.com>,
	qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Kevin Wolf <kwolf@redhat.com>, Eric Blake <eblake@redhat.com>
Subject: [Qemu-devel] [PATCH 5/5] qcow2: Remove BDRVQcow2State.cluster_sectors
Date: Mon, 29 Apr 2019 20:42:40 +0200	[thread overview]
Message-ID: <e823a4cb62ef8ab37d3e30773052a5f69393f06c.1556562150.git.berto@igalia.com> (raw)
In-Reply-To: <cover.1556562150.git.berto@igalia.com>
In-Reply-To: <cover.1556562150.git.berto@igalia.com>

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 <berto@igalia.com>
---
 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;
-- 
2.11.0

WARNING: multiple messages have this Message-ID (diff)
From: Alberto Garcia <berto@igalia.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>,
	qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH 5/5] qcow2: Remove BDRVQcow2State.cluster_sectors
Date: Mon, 29 Apr 2019 20:42:40 +0200	[thread overview]
Message-ID: <e823a4cb62ef8ab37d3e30773052a5f69393f06c.1556562150.git.berto@igalia.com> (raw)
Message-ID: <20190429184240.Zaj3TEn-n3NFiWHadn53f4gLa31NPRnO_dXcTbXUYxQ@z> (raw)
In-Reply-To: <cover.1556562150.git.berto@igalia.com>
In-Reply-To: <cover.1556562150.git.berto@igalia.com>

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 <berto@igalia.com>
---
 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;
-- 
2.11.0



  parent reply	other threads:[~2019-04-29 18:43 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-29 18:42 [Qemu-devel] [PATCH 0/5] Remove bdrv_read() and bdrv_write() Alberto Garcia
2019-04-29 18:42 ` Alberto Garcia
2019-04-29 18:42 ` [Qemu-devel] [PATCH 1/5] qcow2: Replace bdrv_write() with bdrv_pwrite() Alberto Garcia
2019-04-29 18:42   ` Alberto Garcia
2019-04-29 18:42 ` [Qemu-devel] [PATCH 2/5] vdi: Replace bdrv_{read, write}() with bdrv_{pread, pwrite}() Alberto Garcia
2019-04-29 18:42   ` Alberto Garcia
2019-04-30 10:03   ` Kevin Wolf
2019-04-30 10:03     ` Kevin Wolf
2019-04-29 18:42 ` [Qemu-devel] [PATCH 3/5] vvfat: " Alberto Garcia
2019-04-29 18:42   ` Alberto Garcia
2019-04-30  9:52   ` Kevin Wolf
2019-04-30  9:52     ` Kevin Wolf
2019-04-29 18:42 ` [Qemu-devel] [PATCH 4/5] block: Remove bdrv_read() and bdrv_write() Alberto Garcia
2019-04-29 18:42   ` Alberto Garcia
2019-04-29 18:42 ` Alberto Garcia [this message]
2019-04-29 18:42   ` [Qemu-devel] [PATCH 5/5] qcow2: Remove BDRVQcow2State.cluster_sectors Alberto Garcia
2019-04-29 19:46 ` [Qemu-devel] [PATCH 0/5] Remove bdrv_read() and bdrv_write() Eric Blake
2019-04-29 19:46   ` Eric Blake
2019-05-01  7:33 ` no-reply
2019-05-01  7:33   ` no-reply
2019-05-01  8:54 ` no-reply
2019-05-01  8:54   ` no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e823a4cb62ef8ab37d3e30773052a5f69393f06c.1556562150.git.berto@igalia.com \
    --to=berto@igalia.com \
    --cc=eblake@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).