From patchwork Tue May 3 16:50:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 93851 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 8C9DAB6EF7 for ; Wed, 4 May 2011 02:54:52 +1000 (EST) Received: from localhost ([::1]:57193 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHIs5-0002Aj-Se for incoming@patchwork.ozlabs.org; Tue, 03 May 2011 12:54:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHIoD-0004IA-Ph for qemu-devel@nongnu.org; Tue, 03 May 2011 12:50:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QHIoC-0000F1-NL for qemu-devel@nongnu.org; Tue, 03 May 2011 12:50:49 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:61623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHIoC-0000Ci-F8 for qemu-devel@nongnu.org; Tue, 03 May 2011 12:50:48 -0400 Received: by mail-wy0-f173.google.com with SMTP id 42so248862wyb.4 for ; Tue, 03 May 2011 09:50:48 -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=vnExzNuSR6n4/xCV8QkoQGbiCPqoAcpNyxCE1wurCMKB3BzvGwMZjgtyLBGoMaTRAD 7iuM+65+BzxrS8anWD3/FKkOYNOF6Mhldh1nng5+6/Ju1wFlx8n0NfNRnkGskj/QL6wY xmJgyboZjCGhGVy93MIwQQ9h8vZk1toHaQGss= 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=vHnzBPV6Y9+xGE+6xTwmki2H6TuIpTQo3FZjJXV0niYlKZLu7KrnDh/XFZzKJmOXug 6rr+05v91heN1St5q3qObnmJcTsayTXGSmxLPv2mOX5PYYSOsNoi4gWik/qTW+BxIb6q iUnudrKFN9BQPQM9293ibqnjFwg822Vsai7fI= Received: by 10.227.199.69 with SMTP id er5mr22117wbb.106.1304441447919; Tue, 03 May 2011 09:50:47 -0700 (PDT) Received: from localhost.localdomain (93-34-184-88.ip51.fastwebnet.it [93.34.184.88]) by mx.google.com with ESMTPS id bs4sm167243wbb.52.2011.05.03.09.50.47 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 May 2011 09:50:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 3 May 2011 18:50:23 +0200 Message-Id: <1304441432-27434-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304441432-27434-1-git-send-email-pbonzini@redhat.com> References: <1304441432-27434-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 11/20] 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; }