From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony Liguori Subject: Re: [Qemu-devel] [PATCH 1.0] virtio-blk: pass full status to the guest Date: Wed, 02 Nov 2011 07:56:17 -0500 Message-ID: <4EB13DF1.60400@codemonkey.ws> References: <1320236380-26180-1-git-send-email-pbonzini@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, mst@redhat.com To: Paolo Bonzini Return-path: Received: from mail-yw0-f46.google.com ([209.85.213.46]:53117 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752375Ab1KBM4V (ORCPT ); Wed, 2 Nov 2011 08:56:21 -0400 Received: by ywf7 with SMTP id 7so91388ywf.19 for ; Wed, 02 Nov 2011 05:56:20 -0700 (PDT) In-Reply-To: <1320236380-26180-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 11/02/2011 07:19 AM, Paolo Bonzini wrote: > When SCSI passthrough is being used by the guest with virtio-blk, the > guest is not able to detect disk failures. This is because the status > field is expected by the guest driver to include also the msg_status, > host_status and driver_status fields, but the device is only passing > down the SCSI status. > > The patch fixes this, and also makes sure that the guest always sees a > CHECK_CONDITION status when there is valid sense data. > --- Applied. Thanks. Regards, Anthony Liguori > Sorry for missing the -rc deadline, testing this requires > Fibre Channel stuff so I needed someone to do it for me. :) > > hw/virtio-blk.c | 16 +++++++++++++++- > 1 files changed, 15 insertions(+), 1 deletions(-) > > diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c > index 179747a..8beaa20 100644 > --- a/hw/virtio-blk.c > +++ b/hw/virtio-blk.c > @@ -16,6 +16,7 @@ > #include "trace.h" > #include "blockdev.h" > #include "virtio-blk.h" > +#include "scsi-defs.h" > #ifdef __linux__ > # include > #endif > @@ -231,7 +232,20 @@ static void virtio_blk_handle_scsi(VirtIOBlockReq *req) > status = VIRTIO_BLK_S_OK; > } > > - stl_p(&req->scsi->errors, hdr.status); > + /* > + * From SCSI-Generic-HOWTO: "Some lower level drivers (e.g. ide-scsi) > + * clear the masked_status field [hence status gets cleared too, see > + * block/scsi_ioctl.c] even when a CHECK_CONDITION or COMMAND_TERMINATED > + * status has occurred. However they do set DRIVER_SENSE in driver_status > + * field. Also a (sb_len_wr> 0) indicates there is a sense buffer. > + */ > + if (hdr.status == 0&& hdr.sb_len_wr> 0) { > + hdr.status = CHECK_CONDITION; > + } > + > + stl_p(&req->scsi->errors, > + hdr.status | (hdr.msg_status<< 8) | > + (hdr.host_status<< 16) | (hdr.driver_status<< 24)); > stl_p(&req->scsi->residual, hdr.resid); > stl_p(&req->scsi->sense_len, hdr.sb_len_wr); > stl_p(&req->scsi->data_len, hdr.dxfer_len);