From patchwork Tue Jan 19 17:39:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 8064291 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C822E9F1CC for ; Tue, 19 Jan 2016 17:41:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A28F204E3 for ; Tue, 19 Jan 2016 17:41:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8F7D20456 for ; Tue, 19 Jan 2016 17:41:47 +0000 (UTC) Received: from localhost ([::1]:38553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLaHr-0000VN-2R for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Jan 2016 12:41:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLaG7-0005fA-ES for qemu-devel@nongnu.org; Tue, 19 Jan 2016 12:40:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLaG6-00012b-Ox for qemu-devel@nongnu.org; Tue, 19 Jan 2016 12:39:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLaG5-00010N-4N; Tue, 19 Jan 2016 12:39:57 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id BF524A3265; Tue, 19 Jan 2016 17:39:56 +0000 (UTC) Received: from scv.usersys.redhat.com (vpn-54-49.rdu2.redhat.com [10.10.54.49]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0JHdq53013984; Tue, 19 Jan 2016 12:39:55 -0500 From: John Snow To: qemu-block@nongnu.org Date: Tue, 19 Jan 2016 12:39:49 -0500 Message-Id: <1453225191-11871-5-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pbonzini@redhat.com, John Snow , qemu-devel@nongnu.org, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 4/6] ide: replace blk_drain_all by blk_drain 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Target the drain for just one device. Signed-off-by: John Snow --- hw/ide/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 7d32266..cf0b5ec 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -648,7 +648,7 @@ void ide_cancel_dma_sync(IDEState *s) #ifdef DEBUG_IDE printf("%s: draining all remaining requests", __func__); #endif - blk_drain_all(); + blk_drain(s->blk); assert(s->bus->dma->aiocb == NULL); } }