From patchwork Mon May 23 16:08:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 96983 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 45429B6FB4 for ; Tue, 24 May 2011 02:10:35 +1000 (EST) Received: from localhost ([::1]:56748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOXiC-0001lC-3L for incoming@patchwork.ozlabs.org; Mon, 23 May 2011 12:10:32 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOXhb-0001dy-GI for qemu-devel@nongnu.org; Mon, 23 May 2011 12:09:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOXha-0001H5-IN for qemu-devel@nongnu.org; Mon, 23 May 2011 12:09:55 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:50127) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOXha-0001DU-Dq for qemu-devel@nongnu.org; Mon, 23 May 2011 12:09:54 -0400 Received: by mail-pv0-f173.google.com with SMTP id 3so3215837pvg.4 for ; Mon, 23 May 2011 09:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=GJc8MFNjmBqjCyewAmamdjNkenm2enEQZ9aGoPFhkF4=; b=NK0E7D0bW5yatniGS2w7NXwAMvx0gCkNh3hfZcdDlqbQZHBtOxyPi3Hl4gwysxo4oJ 6pPyPbkzAM+NNvmVyM4869w50Zxe4kfIM7QuU7YS3P/BKHMrvL96/7TF9CAxahubALYI EAG6FYXCdctZwaGhlboxQC2cw3IqvnZta4A+o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=kelBkSF0cZU86jZjyNX+kQNSbcy+e8Ks8WKk+S9Ihhkv5tChmxEL8JijW5seeReHth ZG2NB6/B88i4ky+io33g4JOuExkkMuGfQ/7VHZguhGFVG7q6AsHH2ejkhGUKVUnwfnql OwMGrtMfDs5A7ucd0fIDeoRx5HBaSEC4LBHwU= Received: by 10.142.62.39 with SMTP id k39mr829132wfa.179.1306166994103; Mon, 23 May 2011 09:09:54 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id x12sm5946194wfd.6.2011.05.23.09.09.51 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 May 2011 09:09:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 23 May 2011 18:08:54 +0200 Message-Id: <1306166949-19698-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1306166949-19698-1-git-send-email-pbonzini@redhat.com> References: <1306166949-19698-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.83.173 Cc: hch@lst.de Subject: [Qemu-devel] [PATCH v4 09/24] 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 a3eb522..b4ba8cd 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 55a24eb..e915ef8 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 cf2ed73..678cd00 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; }