From patchwork Mon Jun 22 23:38:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 487423 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7702C1401AD for ; Tue, 23 Jun 2015 09:39:18 +1000 (AEST) Received: from localhost ([::1]:42439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7BJ6-0002Qj-KN for incoming@patchwork.ozlabs.org; Mon, 22 Jun 2015 19:39:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7BIT-0001Ab-JI for qemu-devel@nongnu.org; Mon, 22 Jun 2015 19:38:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7BIS-0005Gb-PE for qemu-devel@nongnu.org; Mon, 22 Jun 2015 19:38:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7BIP-0005FA-FD; Mon, 22 Jun 2015 19:38:33 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 1ACC7DB6; Mon, 22 Jun 2015 23:38:33 +0000 (UTC) Received: from scv.usersys.redhat.com (dhcp-17-29.bos.redhat.com [10.18.17.29]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5MNcTe8023300; Mon, 22 Jun 2015 19:38:32 -0400 From: John Snow To: qemu-block@nongnu.org Date: Mon, 22 Jun 2015 19:38:15 -0400 Message-Id: <1435016308-6150-4-git-send-email-jsnow@redhat.com> In-Reply-To: <1435016308-6150-1-git-send-email-jsnow@redhat.com> References: <1435016308-6150-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 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 03/16] ahci: add ncq_err helper 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 Set some appropriate error bits for NCQ for us. Signed-off-by: John Snow --- hw/ide/ahci.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 14eccb8..375aa44 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -922,6 +922,15 @@ out: return r; } +static void ncq_err(NCQTransferState *ncq_tfs) +{ + IDEState *ide_state = &ncq_tfs->drive->port.ifs[0]; + + ide_state->error = ABRT_ERR; + ide_state->status = READY_STAT | ERR_STAT; + ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag); +} + static void ncq_cb(void *opaque, int ret) { NCQTransferState *ncq_tfs = (NCQTransferState *)opaque; @@ -934,10 +943,7 @@ static void ncq_cb(void *opaque, int ret) ncq_tfs->drive->port_regs.scr_act &= ~(1 << ncq_tfs->tag); if (ret < 0) { - /* error */ - ide_state->error = ABRT_ERR; - ide_state->status = READY_STAT | ERR_STAT; - ncq_tfs->drive->port_regs.scr_err |= (1 << ncq_tfs->tag); + ncq_err(ncq_tfs); } else { ide_state->status = READY_STAT | SEEK_STAT; }