[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/15] qcow2: removed cur_nr_sectors field in QCo
From: |
Frediano Ziglio |
Subject: |
[Qemu-devel] [PATCH v2 07/15] qcow2: removed cur_nr_sectors field in QCowAIOCB |
Date: |
Tue, 9 Aug 2011 09:46:42 +0200 |
Signed-off-by: Frediano Ziglio <address@hidden>
---
block/qcow2.c | 98 +++++++++++++++++++++++++--------------------------------
1 files changed, 43 insertions(+), 55 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 5c454bb..0cf4465 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -377,7 +377,6 @@ typedef struct QCowAIOCB {
int64_t sector_num;
QEMUIOVector *qiov;
int remaining_sectors;
- int cur_nr_sectors; /* number of sectors in current iteration */
uint64_t bytes_done;
uint64_t cluster_offset;
uint8_t *cluster_data;
@@ -395,42 +394,22 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
BDRVQcowState *s = bs->opaque;
int index_in_cluster, n1;
int ret;
-
- /* post process the read buffer */
- if (!acb->cluster_offset) {
- /* nothing to do */
- } else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) {
- /* nothing to do */
- } else {
- if (s->crypt_method) {
- qcow2_encrypt_sectors(s, acb->sector_num, acb->cluster_data,
- acb->cluster_data, acb->cur_nr_sectors, 0,
&s->aes_decrypt_key);
- qemu_iovec_reset(&acb->hd_qiov);
- qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done,
- acb->cur_nr_sectors * 512);
- qemu_iovec_from_buffer(&acb->hd_qiov, acb->cluster_data,
- 512 * acb->cur_nr_sectors);
- }
- }
-
- acb->remaining_sectors -= acb->cur_nr_sectors;
- acb->sector_num += acb->cur_nr_sectors;
- acb->bytes_done += acb->cur_nr_sectors * 512;
+ int cur_nr_sectors; /* number of sectors in current iteration */
if (acb->remaining_sectors == 0) {
/* request completed */
return 0;
}
- /* prepare next AIO request */
- acb->cur_nr_sectors = acb->remaining_sectors;
+ /* prepare next request */
+ cur_nr_sectors = acb->remaining_sectors;
if (s->crypt_method) {
- acb->cur_nr_sectors = MIN(acb->cur_nr_sectors,
+ cur_nr_sectors = MIN(cur_nr_sectors,
QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors);
}
ret = qcow2_get_cluster_offset(bs, acb->sector_num << 9,
- &acb->cur_nr_sectors, &acb->cluster_offset);
+ &cur_nr_sectors, &acb->cluster_offset);
if (ret < 0) {
return ret;
}
@@ -439,14 +418,14 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
qemu_iovec_reset(&acb->hd_qiov);
qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done,
- acb->cur_nr_sectors * 512);
+ cur_nr_sectors * 512);
if (!acb->cluster_offset) {
if (bs->backing_hd) {
/* read from the base image */
n1 = qcow2_backing_read1(bs->backing_hd, &acb->hd_qiov,
- acb->sector_num, acb->cur_nr_sectors);
+ acb->sector_num, cur_nr_sectors);
if (n1 > 0) {
BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
qemu_co_mutex_unlock(&s->lock);
@@ -457,11 +436,9 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
return ret;
}
}
- return 1;
} else {
/* Note: in this case, no need to wait */
- qemu_iovec_memset(&acb->hd_qiov, 0, 512 * acb->cur_nr_sectors);
- return 1;
+ qemu_iovec_memset(&acb->hd_qiov, 0, 512 * cur_nr_sectors);
}
} else if (acb->cluster_offset & QCOW_OFLAG_COMPRESSED) {
/* add AIO support for compressed blocks ? */
@@ -472,9 +449,7 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
qemu_iovec_from_buffer(&acb->hd_qiov,
s->cluster_cache + index_in_cluster * 512,
- 512 * acb->cur_nr_sectors);
-
- return 1;
+ 512 * cur_nr_sectors);
} else {
if ((acb->cluster_offset & 511) != 0) {
return -EIO;
@@ -490,24 +465,37 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
qemu_mallocz(QCOW_MAX_CRYPT_CLUSTERS * s->cluster_size);
}
- assert(acb->cur_nr_sectors <=
+ assert(cur_nr_sectors <=
QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors);
qemu_iovec_reset(&acb->hd_qiov);
qemu_iovec_add(&acb->hd_qiov, acb->cluster_data,
- 512 * acb->cur_nr_sectors);
+ 512 * cur_nr_sectors);
}
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,
- acb->cur_nr_sectors, &acb->hd_qiov);
+ cur_nr_sectors, &acb->hd_qiov);
qemu_co_mutex_lock(&s->lock);
if (ret < 0) {
return ret;
}
+ if (s->crypt_method) {
+ qcow2_encrypt_sectors(s, acb->sector_num, acb->cluster_data,
+ acb->cluster_data, cur_nr_sectors, 0, &s->aes_decrypt_key);
+ qemu_iovec_reset(&acb->hd_qiov);
+ qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done,
+ cur_nr_sectors * 512);
+ qemu_iovec_from_buffer(&acb->hd_qiov, acb->cluster_data,
+ 512 * cur_nr_sectors);
+ }
}
+ acb->remaining_sectors -= cur_nr_sectors;
+ acb->sector_num += cur_nr_sectors;
+ acb->bytes_done += cur_nr_sectors * 512;
+
return 1;
}
@@ -525,7 +513,6 @@ static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs,
int64_t sector_num,
acb->bytes_done = 0;
acb->remaining_sectors = nb_sectors;
- acb->cur_nr_sectors = 0;
acb->cluster_offset = 0;
acb->l2meta.nb_clusters = 0;
qemu_co_queue_init(&acb->l2meta.dependent_requests);
@@ -578,18 +565,7 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb)
int index_in_cluster;
int n_end;
int ret;
-
- ret = qcow2_alloc_cluster_link_l2(bs, &acb->l2meta);
-
- run_dependent_requests(s, &acb->l2meta);
-
- if (ret < 0) {
- return ret;
- }
-
- acb->remaining_sectors -= acb->cur_nr_sectors;
- acb->sector_num += acb->cur_nr_sectors;
- acb->bytes_done += acb->cur_nr_sectors * 512;
+ int cur_nr_sectors; /* number of sectors in current iteration */
if (acb->remaining_sectors == 0) {
/* request completed */
@@ -603,7 +579,7 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb)
n_end = QCOW_MAX_CRYPT_CLUSTERS * s->cluster_sectors;
ret = qcow2_alloc_cluster_offset(bs, acb->sector_num << 9,
- index_in_cluster, n_end, &acb->cur_nr_sectors, &acb->l2meta);
+ index_in_cluster, n_end, &cur_nr_sectors, &acb->l2meta);
if (ret < 0) {
return ret;
}
@@ -613,7 +589,7 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb)
qemu_iovec_reset(&acb->hd_qiov);
qemu_iovec_copy(&acb->hd_qiov, acb->qiov, acb->bytes_done,
- acb->cur_nr_sectors * 512);
+ cur_nr_sectors * 512);
if (s->crypt_method) {
if (!acb->cluster_data) {
@@ -625,23 +601,35 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb)
qemu_iovec_to_buffer(&acb->hd_qiov, acb->cluster_data);
qcow2_encrypt_sectors(s, acb->sector_num, acb->cluster_data,
- acb->cluster_data, acb->cur_nr_sectors, 1, &s->aes_encrypt_key);
+ acb->cluster_data, cur_nr_sectors, 1, &s->aes_encrypt_key);
qemu_iovec_reset(&acb->hd_qiov);
qemu_iovec_add(&acb->hd_qiov, acb->cluster_data,
- acb->cur_nr_sectors * 512);
+ cur_nr_sectors * 512);
}
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,
- acb->cur_nr_sectors, &acb->hd_qiov);
+ cur_nr_sectors, &acb->hd_qiov);
qemu_co_mutex_lock(&s->lock);
if (ret < 0) {
return ret;
}
+ ret = qcow2_alloc_cluster_link_l2(bs, &acb->l2meta);
+
+ run_dependent_requests(s, &acb->l2meta);
+
+ if (ret < 0) {
+ return ret;
+ }
+
+ acb->remaining_sectors -= cur_nr_sectors;
+ acb->sector_num += cur_nr_sectors;
+ acb->bytes_done += cur_nr_sectors * 512;
+
return 1;
}
--
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 <=
- [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, 2011/08/09
- [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