From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y13Xa-0007oD-2x for qemu-devel@nongnu.org; Tue, 16 Dec 2014 20:36:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y13XS-0002TC-QW for qemu-devel@nongnu.org; Tue, 16 Dec 2014 20:36:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y13XS-0002T5-Hr for qemu-devel@nongnu.org; Tue, 16 Dec 2014 20:36:30 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBH1aTk3002407 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 16 Dec 2014 20:36:30 -0500 From: John Snow Date: Tue, 16 Dec 2014 20:35:52 -0500 Message-Id: <1418780167-16231-3-git-send-email-jsnow@redhat.com> In-Reply-To: <1418780167-16231-1-git-send-email-jsnow@redhat.com> References: <1418780167-16231-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 02/17] ide: prepare to move restart to common code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, mst@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, John Snow From: Paolo Bonzini This patch adds the restart_dma callback and adjusts the ide_restart_dma function to utilize this callback to call the BMDMA-specific restart code instead of statically executing BMDMA-specific code. Signed-off-by: Paolo Bonzini Signed-off-by: John Snow --- hw/ide/internal.h | 1 + hw/ide/pci.c | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 8a3eca4..59e24e2 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -435,6 +435,7 @@ struct IDEDMAOps { DMAu32Func *commit_buf; DMAIntFunc *rw_buf; DMAIntFunc *set_unit; + DMAVoidFunc *restart_dma; DMAStopFunc *set_inactive; DMAVoidFunc *cmd_done; DMARestartFunc *restart_cb; diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 01f3cd2..71c7f2e 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -184,8 +184,9 @@ static void bmdma_set_inactive(IDEDMA *dma, bool more) } } -static void bmdma_restart_dma(BMDMAState *bm) +static void bmdma_restart_dma(IDEDMA *dma) { + BMDMAState *bm = DO_UPCAST(BMDMAState, dma, dma); IDEState *s = bmdma_active_if(bm); ide_set_sector(s, bm->sector_num); @@ -195,13 +196,13 @@ static void bmdma_restart_dma(BMDMAState *bm) static void ide_restart_dma(IDEState *s, enum ide_dma_cmd dma_cmd) { - BMDMAState *bm = DO_UPCAST(BMDMAState, dma, s->bus->dma); - - bmdma_restart_dma(bm); + if (s->bus->dma->ops->restart_dma) { + s->bus->dma->ops->restart_dma(s->bus->dma); + } s->io_buffer_index = 0; s->io_buffer_size = 0; s->dma_cmd = dma_cmd; - bmdma_start_dma(&bm->dma, s, ide_dma_cb); + ide_start_dma(s, ide_dma_cb); } /* TODO This should be common IDE code */ @@ -521,6 +522,7 @@ static const struct IDEDMAOps bmdma_ops = { .prepare_buf = bmdma_prepare_buf, .rw_buf = bmdma_rw_buf, .set_unit = bmdma_set_unit, + .restart_dma = bmdma_restart_dma, .set_inactive = bmdma_set_inactive, .restart_cb = bmdma_restart_cb, .reset = bmdma_reset, -- 1.9.3