From patchwork Fri Jan 18 16:28:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 213672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6E40A2C0080 for ; Sat, 19 Jan 2013 03:29:19 +1100 (EST) Received: from localhost ([::1]:40635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwEof-0001cJ-GZ for incoming@patchwork.ozlabs.org; Fri, 18 Jan 2013 11:29:17 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwEoL-0001Ld-7m for qemu-devel@nongnu.org; Fri, 18 Jan 2013 11:29:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TwEoI-0004v1-Fo for qemu-devel@nongnu.org; Fri, 18 Jan 2013 11:28:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwEoI-0004u1-6X for qemu-devel@nongnu.org; Fri, 18 Jan 2013 11:28:54 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0IGSrO5013348 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 18 Jan 2013 11:28:53 -0500 Received: from localhost (ovpn-112-41.ams2.redhat.com [10.36.112.41]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0IGSqgj027145; Fri, 18 Jan 2013 11:28:53 -0500 From: Stefan Hajnoczi To: Date: Fri, 18 Jan 2013 17:28:35 +0100 Message-Id: <1358526521-24300-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1358526521-24300-1-git-send-email-stefanha@redhat.com> References: <1358526521-24300-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 2/8] ide: Remove wrong assertion 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 From: Kevin Wolf The Bus Master IDE Active bit (BM_STATUS_DMAING) is not only set when the request is still in flight, but also when it has completed and the size of the physical memory regions in the PRDT was larger than the transfer size. Signed-off-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- hw/ide/pci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/ide/pci.c b/hw/ide/pci.c index e6226e3..59fd539 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -311,7 +311,6 @@ void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val) if (bm->bus->dma->aiocb) { bdrv_drain_all(); assert(bm->bus->dma->aiocb == NULL); - assert((bm->status & BM_STATUS_DMAING) == 0); } } else { bm->cur_addr = bm->addr;