ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qcow2: Removed unused AIOCB fields 

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Frediano Ziglio 2011-08-23 15:21:13 +02:00 committed by Kevin Wolf
parent 122bbd1dd9
commit 4617310c33
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/qcow2.c
View File

@ -385,11 +385,8 @@ typedef struct QCowAIOCB {
uint64_t bytes_done; uint64_t bytes_done;
uint64_t cluster_offset; uint64_t cluster_offset;
uint8_t *cluster_data; uint8_t *cluster_data;
bool is_write;
QEMUIOVector hd_qiov; QEMUIOVector hd_qiov;
QEMUBH *bh;
QCowL2Meta l2meta; QCowL2Meta l2meta;
QLIST_ENTRY(QCowAIOCB) next_depend;
} QCowAIOCB; } QCowAIOCB;
/* /*
@ -521,13 +518,12 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb)
static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs, int64_t sector_num, static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs, int64_t sector_num,
QEMUIOVector *qiov, int nb_sectors, QEMUIOVector *qiov, int nb_sectors,
BlockDriverCompletionFunc *cb, BlockDriverCompletionFunc *cb,
void *opaque, int is_write, QCowAIOCB *acb) void *opaque, QCowAIOCB *acb)
{ {
memset(acb, 0, sizeof(*acb)); memset(acb, 0, sizeof(*acb));
acb->common.bs = bs; acb->common.bs = bs;
acb->sector_num = sector_num; acb->sector_num = sector_num;
acb->qiov = qiov; acb->qiov = qiov;
acb->is_write = is_write;
qemu_iovec_init(&acb->hd_qiov, qiov->niov); qemu_iovec_init(&acb->hd_qiov, qiov->niov);
@ -547,7 +543,7 @@ static int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num,
QCowAIOCB acb; QCowAIOCB acb;
int ret; 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); qemu_co_mutex_lock(&s->lock);
do { do {
@ -662,7 +658,7 @@ static int qcow2_co_writev(BlockDriverState *bs,
QCowAIOCB acb; QCowAIOCB acb;
int ret; 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 */ s->cluster_cache_offset = -1; /* disable compressed cache */
qemu_co_mutex_lock(&s->lock); qemu_co_mutex_lock(&s->lock);