[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/15] qcow2: remove cluster_offset from QCowAIOC
From: |
Frediano Ziglio |
Subject: |
[Qemu-devel] [PATCH v2 09/15] qcow2: remove cluster_offset from QCowAIOCB |
Date: |
Tue, 9 Aug 2011 09:46:44 +0200 |
Signed-off-by: Frediano Ziglio <address@hidden>
---
block/qcow2.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index adf31ce..446946e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -378,7 +378,6 @@ typedef struct QCowAIOCB {
QEMUIOVector *qiov;
int remaining_sectors;
uint64_t bytes_done;
- uint64_t cluster_offset;
uint8_t *cluster_data;
QEMUIOVector hd_qiov;
} QCowAIOCB;
@@ -394,6 +393,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
int index_in_cluster, n1;
int ret;
int cur_nr_sectors; /* number of sectors in current iteration */
+ uint64_t cluster_offset = 0;
if (acb->remaining_sectors == 0) {
/* request completed */
@@ -408,7 +408,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
}
ret = qcow2_get_cluster_offset(bs, acb->sector_num << 9,
- &cur_nr_sectors, &acb->cluster_offset);
+ &cur_nr_sectors, &cluster_offset);
if (ret < 0) {
return ret;
}
@@ -419,7 +419,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done,
cur_nr_sectors * 512);
- if (!acb->cluster_offset) {
+ if (!cluster_offset) {
if (bs->backing_hd) {
/* read from the base image */
@@ -439,9 +439,9 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
/* Note: in this case, no need to wait */
qemu_iovec_memset(&acb->hd_qiov, 0, 512 * cur_nr_sectors);
}
- } else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) {
+ } else if (cluster_offset & QCOW_OFLAG_COMPRESSED) {
/* add AIO support for compressed blocks ? */
- ret = qcow2_decompress_cluster(bs, acb->cluster_offset);
+ ret = qcow2_decompress_cluster(bs, cluster_offset);
if (ret < 0) {
return ret;
}
@@ -450,7 +450,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
s->cluster_cache + index_in_cluster * 512,
512 * cur_nr_sectors);
} else {
- if ((acb->cluster_offset & 511) != 0) {
+ if ((cluster_offset & 511) != 0) {
return -EIO;
}
@@ -474,7 +474,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
qemu_co_mutex_unlock(&s->lock);
ret = bdrv_co_readv(bs->file,
- (acb->cluster_offset >> 9) + index_in_cluster,
+ (cluster_offset >> 9) + index_in_cluster,
cur_nr_sectors, &acb->hd_qiov);
qemu_co_mutex_lock(&s->lock);
if (ret < 0) {
@@ -512,7 +512,6 @@ static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs,
int64_t sector_num,
acb->bytes_done = 0;
acb->remaining_sectors = nb_sectors;
- acb->cluster_offset = 0;
return acb;
}
@@ -564,6 +563,7 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb)
int ret;
int cur_nr_sectors; /* number of sectors in current iteration */
QCowL2Meta l2meta;
+ uint64_t cluster_offset;
l2meta.nb_clusters = 0;
qemu_co_queue_init(&l2meta.dependent_requests);
@@ -585,8 +585,8 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb)
return ret;
}
- acb->cluster_offset = l2meta.cluster_offset;
- assert((acb->cluster_offset & 511) == 0);
+ cluster_offset = l2meta.cluster_offset;
+ assert((cluster_offset & 511) == 0);
qemu_iovec_reset(&acb->hd_qiov);
qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done,
@@ -612,7 +612,7 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb)
BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
qemu_co_mutex_unlock(&s->lock);
ret = bdrv_co_writev(bs->file,
- (acb->cluster_offset >> 9) + index_in_cluster,
+ (cluster_offset >> 9) + index_in_cluster,
cur_nr_sectors, &acb->hd_qiov);
qemu_co_mutex_lock(&s->lock);
if (ret < 0) {
--
1.7.1
- [Qemu-devel] [PATCH v2 00/15] qcow/qcow2 cleanups, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 01/15] qcow: allocate QCowAIOCB structure using stack, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 02/15] qcow: QCowAIOCB field cleanup, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 03/15] qcow: move some blocks of code to avoid useless variable initialization, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 04/15] qcow: embed qcow_aio_read_cb into qcow_co_readv and qcow_aio_write_cb into qcow_co_writev, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 05/15] qcow: remove old #undefined code, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 06/15] qcow2: removed unused fields, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 07/15] qcow2: removed cur_nr_sectors field in QCowAIOCB, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 08/15] qcow2: remove l2meta from QCowAIOCB, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 09/15] qcow2: remove cluster_offset from QCowAIOCB,
Frediano Ziglio <=
- [Qemu-devel] [PATCH v2 11/15] qcow2: reindent and use while before the big jump, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 10/15] qcow2: remove common from QCowAIOCB, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 13/15] qcow2: remove memory leak, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 12/15] qcow2: removed QCowAIOCB entirely, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 14/15] qcow2: small math optimization, Frediano Ziglio, 2011/08/09
- [Qemu-devel] [PATCH v2 15/15] qcow2: small optimization, Frediano Ziglio, 2011/08/09
- Re: [Qemu-devel] [PATCH v2 00/15] qcow/qcow2 cleanups, Kevin Wolf, 2011/08/22