From 36240be25995df97f8b9316ba44e591c309e2bdd Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 14 Feb 2012 11:14:28 +0100 Subject: [PATCH 63/99] qcow2: Removed unused AIOCB fields RH-Author: Kevin Wolf Message-id: <1329218101-24213-64-git-send-email-kwolf@redhat.com> Patchwork-id: 37261 O-Subject: [RHEL-6.3 qemu-kvm PATCH v2 63/96] qcow2: Removed unused AIOCB fields 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 4617310c33990609f05a6ce7eebc2f4d51b7ddfc) --- block/qcow2.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) Signed-off-by: Michal Novotny --- block/qcow2.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 2e08ae8..26399be 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -383,11 +383,8 @@ typedef struct QCowAIOCB { uint64_t bytes_done; uint64_t cluster_offset; uint8_t *cluster_data; - bool is_write; QEMUIOVector hd_qiov; - QEMUBH *bh; QCowL2Meta l2meta; - QLIST_ENTRY(QCowAIOCB) next_depend; } QCowAIOCB; /* @@ -519,13 +516,12 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, - void *opaque, int is_write, QCowAIOCB *acb) + void *opaque, QCowAIOCB *acb) { memset(acb, 0, sizeof(*acb)); acb->common.bs = bs; acb->sector_num = sector_num; acb->qiov = qiov; - acb->is_write = is_write; qemu_iovec_init(&acb->hd_qiov, qiov->niov); @@ -545,7 +541,7 @@ static int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num, QCowAIOCB acb; int ret; - qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, NULL, NULL, 0, &acb); + qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, NULL, NULL, &acb); qemu_co_mutex_lock(&s->lock); do { @@ -660,7 +656,7 @@ static int qcow2_co_writev(BlockDriverState *bs, QCowAIOCB acb; int ret; - qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, NULL, NULL, 1, &acb); + qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, NULL, NULL, &acb); s->cluster_cache_offset = -1; /* disable compressed cache */ qemu_co_mutex_lock(&s->lock); -- 1.7.7.5