From patchwork Wed Jan 16 09:54:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 212466 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 41F2A2C0040 for ; Wed, 16 Jan 2013 20:54:48 +1100 (EST) Received: from localhost ([::1]:38063 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvPhm-0008AI-Cf for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 04:54:46 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvPhf-0008AD-QN for qemu-devel@nongnu.org; Wed, 16 Jan 2013 04:54:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvPhe-000470-Hw for qemu-devel@nongnu.org; Wed, 16 Jan 2013 04:54:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27430) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvPhe-00046v-9w for qemu-devel@nongnu.org; Wed, 16 Jan 2013 04:54:38 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0G9sbHg016584 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 16 Jan 2013 04:54:37 -0500 Received: from dhcp-5-188.str.redhat.com (vpn1-6-32.ams2.redhat.com [10.36.6.32]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0G9sZuJ007708; Wed, 16 Jan 2013 04:54:36 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 10:54:34 +0100 Message-Id: <1358330074-18475-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH] 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 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 --- hw/ide/pci.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) 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;