From patchwork Thu May 26 10:56:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 97544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 336D8B6EE9 for ; Thu, 26 May 2011 20:59:28 +1000 (EST) Received: from localhost ([::1]:52558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPYHl-00079V-3m for incoming@patchwork.ozlabs.org; Thu, 26 May 2011 06:59:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPYFZ-0002Fq-3O for qemu-devel@nongnu.org; Thu, 26 May 2011 06:57:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QPYFX-0003ZY-LY for qemu-devel@nongnu.org; Thu, 26 May 2011 06:57:09 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:46868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPYFX-0003Sj-Ds for qemu-devel@nongnu.org; Thu, 26 May 2011 06:57:07 -0400 Received: by mail-ww0-f53.google.com with SMTP id 40so516542wwj.10 for ; Thu, 26 May 2011 03:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=b/U1hwFO0ewK4thzlhs+eLlblHZjJgBFmYVJOvm54cA=; b=iMU0yD2+zh2BQ6PyFStBVbKllgDVvFTLucBGFIR5cnqNs46V+aQZQz2bmv/tZL36BZ 78UD1yDe4b7+YEDaJ/BO68gK0j6AK9kWIKGh/W/ZvhnhCb36+B2Y3Z5v7s0l17jUgYRb b0Y12ORoK/G2wYpmxuLG/rQLnYDHFRgAoXrx0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=v9+jTV2pHzLWfuKG9B4JCuIDKAGB+3ivc3/FkOPetMpOAB1z8arC8SVuoKTWw2MaCW WYd5x5byvwdbc1LuUwbDBLbubszgJYyDqxJCngN2ZgCefY2ptCXvK1XzkuGyVYfC0rDs Ab22abjEgmUyW2JLI3LTGSUJSg4LJ4sqMiQwo= Received: by 10.216.209.212 with SMTP id s62mr651309weo.67.1306407427010; Thu, 26 May 2011 03:57:07 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id k16sm293060wed.8.2011.05.26.03.57.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 May 2011 03:57:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 26 May 2011 12:56:36 +0200 Message-Id: <1306407411-4290-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1306407411-4290-1-git-send-email-pbonzini@redhat.com> References: <1306407411-4290-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Subject: [Qemu-devel] [PATCH v5 10/25] scsi: introduce scsi_req_abort 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 This covers the case of canceling a request's I/O and still completing it. Signed-off-by: Paolo Bonzini Reviewed-by: Christoph Hellwig --- hw/scsi-bus.c | 9 +++++++++ hw/scsi.h | 1 + hw/spapr_vscsi.c | 8 ++------ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index cb3ba5f..ef8ba3b 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -549,6 +549,15 @@ void scsi_req_complete(SCSIRequest *req) scsi_req_unref(req); } +void scsi_req_abort(SCSIRequest *req, int status) +{ + req->status = status; + if (req->dev && req->dev->info->cancel_io) { + req->dev->info->cancel_io(req); + } + scsi_req_complete(req); +} + void scsi_device_purge_requests(SCSIDevice *sdev) { SCSIRequest *req; diff --git a/hw/scsi.h b/hw/scsi.h index f1d8888..970e812 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -114,6 +114,7 @@ int scsi_req_parse(SCSIRequest *req, uint8_t *buf); void scsi_req_print(SCSIRequest *req); void scsi_req_data(SCSIRequest *req, int len); void scsi_req_complete(SCSIRequest *req); +void scsi_req_abort(SCSIRequest *req, int status); void scsi_device_purge_requests(SCSIDevice *sdev); #endif diff --git a/hw/spapr_vscsi.c b/hw/spapr_vscsi.c index e1fcba8..3553ac6 100644 --- a/hw/spapr_vscsi.c +++ b/hw/spapr_vscsi.c @@ -463,10 +463,8 @@ static void vscsi_send_request_sense(VSCSIState *s, vscsi_req *req) dprintf("VSCSI: Queued request sense tag 0x%x\n", req->qtag); if (n < 0) { fprintf(stderr, "VSCSI: REQUEST_SENSE wants write data !?!?!?\n"); - sdev->info->cancel_io(req->sreq); vscsi_makeup_sense(s, req, HARDWARE_ERROR, 0, 0); - vscsi_send_rsp(s, req, CHECK_CONDITION, 0, 0); - vscsi_put_req(s, req); + scsi_req_abort(req->sreq, CHECK_CONDITION); return; } else if (n == 0) { return; @@ -547,10 +545,8 @@ static void vscsi_command_complete(SCSIRequest *sreq, int reason, uint32_t arg) } if (rc < 0) { fprintf(stderr, "VSCSI: RDMA error rc=%d!\n", rc); - sdev->info->cancel_io(sreq); vscsi_makeup_sense(s, req, HARDWARE_ERROR, 0, 0); - vscsi_send_rsp(s, req, CHECK_CONDITION, 0, 0); - vscsi_put_req(s, req); + scsi_req_abort(req->sreq, CHECK_CONDITION); return; }