From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLaG8-0005hB-JP for qemu-devel@nongnu.org; Tue, 19 Jan 2016 12:40:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLaG7-00015I-Mr for qemu-devel@nongnu.org; Tue, 19 Jan 2016 12:40:00 -0500 From: John Snow Date: Tue, 19 Jan 2016 12:39:50 -0500 Message-Id: <1453225191-11871-6-git-send-email-jsnow@redhat.com> In-Reply-To: <1453225191-11871-1-git-send-email-jsnow@redhat.com> References: <1453225191-11871-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 5/6] ide: Add silent DRQ cancellation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, John Snow , qemu-devel@nongnu.org, stefanha@redhat.com Split apart the ide_transfer_stop function into two versions: one that interrupts and one that doesn't. The one that doesn't can be used to halt any PIO transfers that are in the DRQ phase. It will not halt any PIO transfers that are currently in the process of buffering data for the guest to read. Signed-off-by: John Snow --- hw/ide/core.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index cf0b5ec..9bc8e58 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -486,13 +486,26 @@ static void ide_cmd_done(IDEState *s) } } -void ide_transfer_stop(IDEState *s) +static void ide_transfer_halt(IDEState *s, void(*etf)(IDEState *), bool notify) { - s->end_transfer_func = ide_transfer_stop; + s->end_transfer_func = etf; s->data_ptr = s->io_buffer; s->data_end = s->io_buffer; s->status &= ~DRQ_STAT; - ide_cmd_done(s); + if (notify) { + ide_cmd_done(s); + } +} + +void ide_transfer_stop(IDEState *s) +{ + ide_transfer_halt(s, ide_transfer_stop, true); +} + +__attribute__((__unused__)) +static void ide_transfer_cancel(IDEState *s) +{ + ide_transfer_halt(s, ide_transfer_cancel, false); } int64_t ide_get_sector(IDEState *s) -- 2.4.3