From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0xna-0003tv-1E for qemu-devel@nongnu.org; Fri, 05 Jun 2015 16:01:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0xnZ-00006S-6H for qemu-devel@nongnu.org; Fri, 05 Jun 2015 16:01:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0xnZ-00006J-04 for qemu-devel@nongnu.org; Fri, 05 Jun 2015 16:01:01 -0400 From: John Snow Date: Fri, 5 Jun 2015 16:00:49 -0400 Message-Id: <1433534449-5732-13-git-send-email-jsnow@redhat.com> In-Reply-To: <1433534449-5732-1-git-send-email-jsnow@redhat.com> References: <1433534449-5732-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 12/12] macio: remove remainder_len DBDMA_io property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Mark Cave-Ayland , jsnow@redhat.com From: Mark Cave-Ayland Since the block alignment code is now effectively independent of the DMA implementation, this variable is no longer required and can be removed. Signed-off-by: Mark Cave-Ayland Reviewed-by: John Snow Message-id: 1433455177-21243-5-git-send-email-mark.cave-ayland@ilande.co.uk Signed-off-by: John Snow --- hw/ide/macio.c | 13 ------------- include/hw/ppc/mac_dbdma.h | 1 - 2 files changed, 14 deletions(-) diff --git a/hw/ide/macio.c b/hw/ide/macio.c index d353bd2..dd52d50 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -278,7 +278,6 @@ static void pmac_ide_transfer_cb(void *opaque, int ret) MACIO_DPRINTF("DMA error: %d\n", ret); m->aiocb = NULL; ide_dma_error(s); - io->remainder_len = 0; goto done; } @@ -509,9 +508,6 @@ static void ide_dbdma_start(IDEDMA *dma, IDEState *s, BlockCompletionFunc *cb) { MACIOIDEState *m = container_of(dma, MACIOIDEState, dma); - DBDMAState *dbdma = m->dbdma; - DBDMA_io *io; - int i; s->io_buffer_index = 0; if (s->drive_kind == IDE_CD) { @@ -526,15 +522,6 @@ static void ide_dbdma_start(IDEDMA *dma, IDEState *s, MACIO_DPRINTF("lba: %x size: %x\n", s->lba, s->io_buffer_size); MACIO_DPRINTF("-------------------------\n"); - for (i = 0; i < DBDMA_CHANNELS; i++) { - io = &dbdma->channels[i].io; - - if (io->opaque == m) { - io->remainder_len = 0; - } - } - - MACIO_DPRINTF("\n"); m->dma_active = true; DBDMA_kick(m->dbdma); } diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h index 7f247fa..c687021 100644 --- a/include/hw/ppc/mac_dbdma.h +++ b/include/hw/ppc/mac_dbdma.h @@ -42,7 +42,6 @@ struct DBDMA_io { /* unaligned last sector of a request */ uint8_t head_remainder[0x200]; uint8_t tail_remainder[0x200]; - int remainder_len; QEMUIOVector iov; }; -- 2.1.0