From patchwork Mon May 16 12:16:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 95717 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 2ADA9B6EF1 for ; Mon, 16 May 2011 22:19:03 +1000 (EST) Received: from localhost ([::1]:44809 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLwlI-00066e-2m for incoming@patchwork.ozlabs.org; Mon, 16 May 2011 08:19:00 -0400 Received: from eggs.gnu.org ([140.186.70.92]:45416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLwjo-00043E-49 for qemu-devel@nongnu.org; Mon, 16 May 2011 08:17:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QLwjn-0000Eo-5D for qemu-devel@nongnu.org; Mon, 16 May 2011 08:17:28 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:57141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLwjn-00007r-19 for qemu-devel@nongnu.org; Mon, 16 May 2011 08:17:27 -0400 Received: by mail-ww0-f53.google.com with SMTP id 40so4444155wwj.10 for ; Mon, 16 May 2011 05:17:26 -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=eT5zHpVcywxHvj9rM+tPO+P8jmaqmbAd2fmEkCjIQv8=; b=r9QZ8SQA6Yk/ygUYacddypLBwWXz5SGBBvamFyKbuU6bBY2HjuLG+xckvJGChgsLP7 AIwl4Z33o3XXSu0oLf+XOKs0L7XLSSD+c4u9kospqHJGIWCk70FSY7Cd6xiM4ELnfD4p GrDEOYCwiGSdGq0Immjd77yVXPO4XtP6GGqx8= 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=dUUxIAuNfQxsZ0rP0XZ8me+vz/RF5r12kxY3Y6YuT5b6fwQ50OW3vn7Yd72mP2BkQ5 44GSOzsexAmk0vWxHAvIGVt2CgGIrjCSBvfDf/Gw1ZZdLICZa4F4BHT8dLEjPvaj54rw WAoNrPWuuErJ0hGgTsD6W/QVOHOfHHxBeMS+I= Received: by 10.216.82.6 with SMTP id n6mr2272780wee.27.1305548244373; Mon, 16 May 2011 05:17:24 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id b20sm3105997wbb.67.2011.05.16.05.17.23 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 May 2011 05:17:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 16 May 2011 14:16:27 +0200 Message-Id: <1305548197-16196-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1305548197-16196-1-git-send-email-pbonzini@redhat.com> References: <1305548197-16196-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 v2 11/21] scsi: use scsi_req_complete 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 Signed-off-by: Paolo Bonzini --- hw/scsi-generic.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 5bfbb8a..e1f8a8a 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -288,7 +288,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd) { SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, req->dev); SCSIGenericReq *r = DO_UPCAST(SCSIGenericReq, req, req); - SCSIBus *bus; int ret; scsi_req_enqueue(req); @@ -305,8 +304,8 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *cmd) s->sensebuf[6] = 0x00; s->senselen = 7; s->driver_status = SG_ERR_DRIVER_SENSE; - bus = scsi_bus_from_device(&s->qdev); - bus->ops.complete(req, SCSI_REASON_DONE, CHECK_CONDITION); + r->req.status = CHECK_CONDITION; + scsi_req_complete(&r->req); return 0; }