From e44064e438de03a1b8db967518d3eafef6377722 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 22 Feb 2012 14:12:39 +0100 Subject: [PATCH 083/109] dma-helpers: rename is_write to to_dev RH-Author: Paolo Bonzini Message-id: <1329919979-20948-83-git-send-email-pbonzini@redhat.com> Patchwork-id: 37563 O-Subject: [RHEL 6.3 qemu-kvm PATCH v2 082/102] dma-helpers: rename is_write to to_dev Bugzilla: 782029 RH-Acked-by: Laszlo Ersek RH-Acked-by: Orit Wasserman RH-Acked-by: Gerd Hoffmann Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf (cherry picked from bbca72c6215c3e1df72b80bb3f54fe3b2b05212b) Conflicts: dma-helpers.c (RHEL6 does not have dma_bdrv_io) dma.h (RHEL6 does not have dma_bdrv_io) hw/ide/core.c (code is not in RHEL6) hw/ide/macio.c (code is not in RHEL6) --- dma-helpers.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) Signed-off-by: Michal Novotny --- dma-helpers.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dma-helpers.c b/dma-helpers.c index d4fc077..08df151 100644 --- a/dma-helpers.c +++ b/dma-helpers.c @@ -42,7 +42,7 @@ typedef struct { BlockDriverAIOCB *acb; QEMUSGList *sg; uint64_t sector_num; - int is_write; + bool to_dev; int sg_cur_index; target_phys_addr_t sg_cur_byte; QEMUIOVector iov; @@ -74,7 +74,7 @@ static void dma_bdrv_unmap(DMAAIOCB *dbs) for (i = 0; i < dbs->iov.niov; ++i) { cpu_physical_memory_unmap(dbs->iov.iov[i].iov_base, - dbs->iov.iov[i].iov_len, !dbs->is_write, + dbs->iov.iov[i].iov_len, !dbs->to_dev, dbs->iov.iov[i].iov_len); } } @@ -100,7 +100,7 @@ static void dma_bdrv_cb(void *opaque, int ret) while (dbs->sg_cur_index < dbs->sg->nsg) { cur_addr = dbs->sg->sg[dbs->sg_cur_index].base + dbs->sg_cur_byte; cur_len = dbs->sg->sg[dbs->sg_cur_index].len - dbs->sg_cur_byte; - mem = cpu_physical_memory_map(cur_addr, &cur_len, !dbs->is_write); + mem = cpu_physical_memory_map(cur_addr, &cur_len, !dbs->to_dev); if (!mem) break; qemu_iovec_add(&dbs->iov, mem, cur_len); @@ -116,7 +116,7 @@ static void dma_bdrv_cb(void *opaque, int ret) return; } - if (dbs->is_write) { + if (dbs->to_dev) { dbs->acb = bdrv_aio_writev(dbs->bs, dbs->sector_num, &dbs->iov, dbs->iov.size / 512, dma_bdrv_cb, dbs); } else { @@ -147,7 +147,7 @@ static AIOPool dma_aio_pool = { static BlockDriverAIOCB *dma_bdrv_io( BlockDriverState *bs, QEMUSGList *sg, uint64_t sector_num, BlockDriverCompletionFunc *cb, void *opaque, - int is_write) + bool to_dev) { DMAAIOCB *dbs = qemu_aio_get(&dma_aio_pool, bs, cb, opaque); @@ -157,7 +157,7 @@ static BlockDriverAIOCB *dma_bdrv_io( dbs->sector_num = sector_num; dbs->sg_cur_index = 0; dbs->sg_cur_byte = 0; - dbs->is_write = is_write; + dbs->to_dev = to_dev; dbs->bh = NULL; qemu_iovec_init(&dbs->iov, sg->nsg); /* @@ -177,12 +177,12 @@ BlockDriverAIOCB *dma_bdrv_read(BlockDriverState *bs, QEMUSGList *sg, uint64_t sector, void (*cb)(void *opaque, int ret), void *opaque) { - return dma_bdrv_io(bs, sg, sector, cb, opaque, 0); + return dma_bdrv_io(bs, sg, sector, cb, opaque, false); } BlockDriverAIOCB *dma_bdrv_write(BlockDriverState *bs, QEMUSGList *sg, uint64_t sector, void (*cb)(void *opaque, int ret), void *opaque) { - return dma_bdrv_io(bs, sg, sector, cb, opaque, 1); + return dma_bdrv_io(bs, sg, sector, cb, opaque, true); } -- 1.7.7.6