From patchwork Wed Aug 3 08:49:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 108079 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 97F73B71E5 for ; Wed, 3 Aug 2011 19:48:48 +1000 (EST) Received: from localhost ([::1]:54430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QoX9k-00087V-6E for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 04:50:24 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QoX94-00063o-1a for qemu-devel@nongnu.org; Wed, 03 Aug 2011 04:49:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QoX91-0003jz-Lw for qemu-devel@nongnu.org; Wed, 03 Aug 2011 04:49:41 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:64312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QoX91-0003iJ-EG for qemu-devel@nongnu.org; Wed, 03 Aug 2011 04:49:39 -0400 Received: by mail-ww0-f53.google.com with SMTP id 26so527790wwf.10 for ; Wed, 03 Aug 2011 01:49:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=m4uKrUL3HuOCVEXsPqZQr7b/uhX6pEGr+yGdfOec/5c=; b=UpJxKIYZss6rUTManthixseWSEc4z2fODwF6gVxAP2AyPXAwFSBOH+1nyxT+p5+4d4 6oVZyMZ7gBGJNcL+3R2qMn1xhMGmJrfsMinMDyv4wy7w/Ojtzi/Q5ohTIKXWRIiYKurS kzr2b7S/ntogwdRSjEqM++zDp55csXWgkdnrs= Received: by 10.216.170.149 with SMTP id p21mr429555wel.51.1312361378810; Wed, 03 Aug 2011 01:49:38 -0700 (PDT) Received: from localhost.localdomain (93-34-199-31.ip51.fastwebnet.it [93.34.199.31]) by mx.google.com with ESMTPS id ff6sm485877wbb.66.2011.08.03.01.49.38 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Aug 2011 01:49:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 10:49:18 +0200 Message-Id: <1312361359-15445-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1312361359-15445-1-git-send-email-pbonzini@redhat.com> References: <1312361359-15445-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 15/16] scsi: report unit attention on reset 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-bus.c | 3 ++- hw/scsi-disk.c | 4 ++-- hw/scsi-generic.c | 4 ++-- hw/scsi.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index a5bb517..f6fb4f0 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1089,7 +1089,7 @@ void scsi_req_abort(SCSIRequest *req, int status) scsi_req_complete(req, status); } -void scsi_device_purge_requests(SCSIDevice *sdev) +void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense) { SCSIRequest *req; @@ -1097,6 +1097,7 @@ void scsi_device_purge_requests(SCSIDevice *sdev) req = QTAILQ_FIRST(&sdev->requests); scsi_req_cancel(req); } + sdev->unit_attention = sense; } static char *scsibus_get_fw_dev_path(DeviceState *dev) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 5f21d68..655fcda 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1098,7 +1098,7 @@ static void scsi_disk_reset(DeviceState *dev) SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev.qdev, dev); uint64_t nb_sectors; - scsi_device_purge_requests(&s->qdev); + scsi_device_purge_requests(&s->qdev, SENSE_CODE(RESET)); bdrv_get_geometry(s->bs, &nb_sectors); nb_sectors /= s->cluster_size; @@ -1112,7 +1112,7 @@ static void scsi_destroy(SCSIDevice *dev) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); - scsi_device_purge_requests(&s->qdev); + scsi_device_purge_requests(&s->qdev, SENSE_CODE(NO_SENSE)); blockdev_mark_auto_del(s->qdev.conf.bs); } diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index c122ad3..e8053da 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -381,14 +381,14 @@ static void scsi_generic_reset(DeviceState *dev) { SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev.qdev, dev); - scsi_device_purge_requests(&s->qdev); + scsi_device_purge_requests(&s->qdev, SENSE_CODE(RESET)); } static void scsi_destroy(SCSIDevice *d) { SCSIGenericState *s = DO_UPCAST(SCSIGenericState, qdev, d); - scsi_device_purge_requests(&s->qdev); + scsi_device_purge_requests(&s->qdev, SENSE_CODE(NO_SENSE)); blockdev_mark_auto_del(s->qdev.conf.bs); } diff --git a/hw/scsi.h b/hw/scsi.h index 09c3606..98fd689 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -187,7 +187,7 @@ uint8_t *scsi_req_get_buf(SCSIRequest *req); int scsi_req_get_sense(SCSIRequest *req, uint8_t *buf, int len); void scsi_req_abort(SCSIRequest *req, int status); void scsi_req_cancel(SCSIRequest *req); -void scsi_device_purge_requests(SCSIDevice *sdev); +void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense); int scsi_device_get_sense(SCSIDevice *dev, uint8_t *buf, int len, bool fixed); #endif