From b4df2e19a64735b6c46b1daa5b65bba43c8b3e7a Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 14 Feb 2012 11:14:30 +0100 Subject: [PATCH 65/99] qcow2: remove l2meta from QCowAIOCB RH-Author: Kevin Wolf Message-id: <1329218101-24213-66-git-send-email-kwolf@redhat.com> Patchwork-id: 37254 O-Subject: [RHEL-6.3 qemu-kvm PATCH v2 65/96] qcow2: remove l2meta from QCowAIOCB Bugzilla: 783950 RH-Acked-by: Paolo Bonzini RH-Acked-by: Marcelo Tosatti RH-Acked-by: Laszlo Ersek From: Frediano Ziglio Bugzilla: 783950 Signed-off-by: Frediano Ziglio Signed-off-by: Kevin Wolf (cherry picked from commit c227140397c7167479862632498b78a3d680ec57) --- block/qcow2.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) Signed-off-by: Michal Novotny --- block/qcow2.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index b5256f2..b96c9fe 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -383,7 +383,6 @@ typedef struct QCowAIOCB { uint64_t cluster_offset; uint8_t *cluster_data; QEMUIOVector hd_qiov; - QCowL2Meta l2meta; } QCowAIOCB; /* @@ -516,8 +515,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; } @@ -568,6 +565,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 */ @@ -581,12 +582,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); @@ -620,9 +621,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.7.5