[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/8] qcow2: remove l2meta from QCowAIOCB
From: |
Frediano Ziglio |
Subject: |
[Qemu-devel] [PATCH 3/8] qcow2: remove l2meta from QCowAIOCB |
Date: |
Thu, 28 Jul 2011 09:40:36 +0200 |
Signed-off-by: Frediano Ziglio <address@hidden>
---
block/qcow2.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 0cf4465..adf31ce 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -381,7 +381,6 @@ typedef struct QCowAIOCB {
uint64_t cluster_offset;
uint8_t *cluster_data;
QEMUIOVector hd_qiov;
- QCowL2Meta l2meta;
} QCowAIOCB;
/*
@@ -514,8 +513,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;
- acb->l2meta.nb_clusters = 0;
- qemu_co_queue_init(&acb->l2meta.dependent_requests);
return acb;
}
@@ -566,6 +563,10 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb)
int n_end;
int ret;
int cur_nr_sectors; /* number of sectors in current iteration */
+ QCowL2Meta l2meta;
+
+ l2meta.nb_clusters = 0;
+ qemu_co_queue_init(&l2meta.dependent_requests);
if (acb->remaining_sectors == 0) {
/* request completed */
@@ -579,12 +580,12 @@ 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, &cur_nr_sectors, &acb->l2meta);
+ index_in_cluster, n_end, &cur_nr_sectors, &l2meta);
if (ret < 0) {
return ret;
}
- acb->cluster_offset = acb->l2meta.cluster_offset;
+ acb->cluster_offset = l2meta.cluster_offset;
assert((acb->cluster_offset & 511) == 0);
qemu_iovec_reset(&acb->hd_qiov);
@@ -618,9 +619,9 @@ static int qcow2_aio_write_cb(QCowAIOCB *acb)
return ret;
}
- ret = qcow2_alloc_cluster_link_l2(bs, &acb->l2meta);
+ ret = qcow2_alloc_cluster_link_l2(bs, &l2meta);
- run_dependent_requests(s, &acb->l2meta);
+ run_dependent_requests(s, &l2meta);
if (ret < 0) {
return ret;
--
1.7.1
- [Qemu-devel] [PATCH 0/8] qcow2 cleanup for coroutine-block branch, Frediano Ziglio, 2011/07/28
- [Qemu-devel] [PATCH 1/8] qcow2: removed unused fields, Frediano Ziglio, 2011/07/28
- [Qemu-devel] [PATCH 2/8] qcow2: removed cur_nr_sectors field in QCowAIOCB, Frediano Ziglio, 2011/07/28
- [Qemu-devel] [PATCH 3/8] qcow2: remove l2meta from QCowAIOCB,
Frediano Ziglio <=
- [Qemu-devel] [PATCH 4/8] qcow2: remove cluster_offset from QCowAIOCB, Frediano Ziglio, 2011/07/28
- [Qemu-devel] [PATCH 5/8] qcow2: remove common from QCowAIOCB, Frediano Ziglio, 2011/07/28
- [Qemu-devel] [PATCH 6/8] qcow2: reindent and use while before the big jump, Frediano Ziglio, 2011/07/28
- [Qemu-devel] [PATCH 7/8] qcow2: removed QCowAIOCB entirely, Frediano Ziglio, 2011/07/28
- [Qemu-devel] [PATCH 8/8] qcow2: remove memory leak, Frediano Ziglio, 2011/07/28