From patchwork Fri Sep 16 14:40:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 114938 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 95D4CB6FA2 for ; Sat, 17 Sep 2011 00:40:44 +1000 (EST) Received: from localhost ([::1]:57232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4Zak-0002c5-TV for incoming@patchwork.ozlabs.org; Fri, 16 Sep 2011 10:40:34 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ZaS-0002BX-1a for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:40:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4ZaN-0000Ea-Mz for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:40:16 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:35476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4ZaN-0000EC-Eg for qemu-devel@nongnu.org; Fri, 16 Sep 2011 10:40:11 -0400 Received: by wwg14 with SMTP id 14so4650252wwg.10 for ; Fri, 16 Sep 2011 07:40:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=q0ubrzrzLP+7AKv8V/flYp8ZQIwbDMvk3CvbQ1tZCIg=; b=VuTt9VpAlPvfZumbdN3/ZFEXwrpJ9YOlCAC4TAgQb+tgzxW37q7JNJ0VsJdoAUQPJD u0ds74PNMkAXKbkgHVfthcyT7Tev8xKDjeEDg5WY8vaiAcIxz70nap5jYvsBykVZDtIr 1k6fzOV/rUBSfvB7OKU2Q7NAaWwQFIAUmF4ww= Received: by 10.227.28.30 with SMTP id k30mr387461wbc.98.1316184010316; Fri, 16 Sep 2011 07:40:10 -0700 (PDT) Received: from localhost.localdomain (93-34-199-31.ip51.fastwebnet.it. [93.34.199.31]) by mx.google.com with ESMTPS id i11sm12750379wbn.25.2011.09.16.07.40.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Sep 2011 07:40:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 16 Sep 2011 16:40:00 +0200 Message-Id: <1316184004-8260-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1316184004-8260-1-git-send-email-pbonzini@redhat.com> References: <1316184004-8260-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Subject: [Qemu-devel] [PATCH v2 1/5] dma-helpers: rename is_write to to_dev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- dma-helpers.c | 14 +++++++------- dma.h | 2 +- hw/ide/core.c | 2 +- hw/ide/macio.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dma-helpers.c b/dma-helpers.c index 4610ea0..717e384 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; @@ -75,7 +75,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); } } @@ -101,7 +101,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); @@ -143,7 +143,7 @@ static AIOPool dma_aio_pool = { BlockDriverAIOCB *dma_bdrv_io( BlockDriverState *bs, QEMUSGList *sg, uint64_t sector_num, DMAIOFunc *io_func, BlockDriverCompletionFunc *cb, - void *opaque, int is_write) + void *opaque, bool to_dev) { DMAAIOCB *dbs = qemu_aio_get(&dma_aio_pool, bs, cb, opaque); @@ -153,7 +153,7 @@ 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->io_func = io_func; dbs->bh = NULL; qemu_iovec_init(&dbs->iov, sg->nsg); @@ -170,12 +170,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, bdrv_aio_readv, cb, opaque, 0); + return dma_bdrv_io(bs, sg, sector, bdrv_aio_readv, 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, bdrv_aio_writev, cb, opaque, 1); + return dma_bdrv_io(bs, sg, sector, bdrv_aio_writev, cb, opaque, true); } diff --git a/dma.h b/dma.h index a6db5ba..b222346 100644 --- a/dma.h +++ b/dma.h @@ -39,7 +39,7 @@ typedef BlockDriverAIOCB *DMAIOFunc(BlockDriverState *bs, int64_t sector_num, BlockDriverAIOCB *dma_bdrv_io(BlockDriverState *bs, QEMUSGList *sg, uint64_t sector_num, DMAIOFunc *io_func, BlockDriverCompletionFunc *cb, - void *opaque, int is_write); + void *opaque, bool to_dev); BlockDriverAIOCB *dma_bdrv_read(BlockDriverState *bs, QEMUSGList *sg, uint64_t sector, BlockDriverCompletionFunc *cb, void *opaque); diff --git a/hw/ide/core.c b/hw/ide/core.c index e06f442..e61ab77 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -602,7 +602,7 @@ handle_rw_error: break; case IDE_DMA_TRIM: s->bus->dma->aiocb = dma_bdrv_io(s->bs, &s->sg, sector_num, - ide_issue_trim, ide_dma_cb, s, 1); + ide_issue_trim, ide_dma_cb, s, true); break; } diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 11a145c..bfb49e6 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -157,7 +157,7 @@ static void pmac_ide_transfer_cb(void *opaque, int ret) break; case IDE_DMA_TRIM: m->aiocb = dma_bdrv_io(s->bs, &s->sg, sector_num, - ide_issue_trim, pmac_ide_transfer_cb, s, 1); + ide_issue_trim, pmac_ide_transfer_cb, s, true); break; }