From patchwork Thu May 26 10:56:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 97548 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 EEE64B6EE9 for ; Thu, 26 May 2011 21:00:36 +1000 (EST) Received: from localhost ([::1]:57360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPYIq-0001OY-Qy for incoming@patchwork.ozlabs.org; Thu, 26 May 2011 07:00:32 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPYFa-0002IA-9E for qemu-devel@nongnu.org; Thu, 26 May 2011 06:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QPYFZ-0003aQ-E8 for qemu-devel@nongnu.org; Thu, 26 May 2011 06:57:10 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:47990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPYFZ-0003Ru-9y for qemu-devel@nongnu.org; Thu, 26 May 2011 06:57:09 -0400 Received: by mail-wy0-f173.google.com with SMTP id 42so463044wyb.4 for ; Thu, 26 May 2011 03:57:08 -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=XcjfYR6tGW19z/FOOLSJ0weW7pVi6zr9lKeAlhCqjUY=; b=xVvTZzqx+I0ip6/fkOrvzZ91h9Pyiu/Tmzg1/B/gynLR+pLY6tCq1XsAzRePYevDJy SOoZbptvXmve655F+x+7iNePiwHVRxOKtaLHUKUbae6xkPi6+gPXbie6ni0oUNYLq6Hx gk/FR4cnuGqaLXTveUvu4YTOlKYWrgnRMJdf8= 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=lgjcyezY1oaPHz6g2x55cN/Cg6rAu7WkxuqmKbbuZxtlM7QIvgyq4IpZRcyGCXnSK3 ml3syiijZUlTG9zvfufNs7qBbrTaZI830wDQwU5gx2o7WwEIUTX2hr1GTvox4z1T2AnF nfGbMvoWuXkjBZKsF5DEFmB+fKpeRqH5QUmRM= Received: by 10.216.69.74 with SMTP id m52mr762301wed.33.1306407428895; Thu, 26 May 2011 03:57:08 -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.07 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 May 2011 03:57:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 26 May 2011 12:56:38 +0200 Message-Id: <1306407411-4290-13-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.173 Subject: [Qemu-devel] [PATCH v5 12/25] 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 Reviewed-by: Christoph Hellwig --- 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 c008e9c..229d24f 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -290,7 +290,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); @@ -307,8 +306,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; }