From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cornelia Huck Subject: Re: [PATCH v7 42/46] virtio_scsi: v1.0 support Date: Mon, 1 Dec 2014 13:50:01 +0100 Message-ID: <20141201135001.142bd29a.cornelia.huck@de.ibm.com> References: <1417359787-10138-1-git-send-email-mst@redhat.com> <1417359787-10138-43-git-send-email-mst@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1417359787-10138-43-git-send-email-mst@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: "Michael S. Tsirkin" Cc: thuth@linux.vnet.ibm.com, linux-scsi@vger.kernel.org, rusty@au1.ibm.com, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, dahi@linux.vnet.ibm.com, "James E.J. Bottomley" , pbonzini@redhat.com, David Miller List-Id: linux-scsi@vger.kernel.org On Sun, 30 Nov 2014 17:12:47 +0200 "Michael S. Tsirkin" wrote: > Note: for consistency, and to avoid sparse errors, > convert all fields, even those no longer in use > for virtio v1.0. > > Signed-off-by: Michael S. Tsirkin > Acked-by: Paolo Bonzini > --- > include/linux/virtio_scsi.h | 32 +++++++++++++++------------- > drivers/scsi/virtio_scsi.c | 51 ++++++++++++++++++++++++++++----------------- > 2 files changed, 49 insertions(+), 34 deletions(-) > > @@ -196,10 +196,13 @@ static void virtscsi_complete_cmd(struct virtio_scsi *vscsi, void *buf) > break; > } > > - WARN_ON(resp->sense_len > VIRTIO_SCSI_SENSE_SIZE); > + WARN_ON(virtio32_to_cpu(vscsi->vdev, resp->sense_len) > > + VIRTIO_SCSI_SENSE_SIZE); Introduce a local variable for this? Might make this statement and the min_t statement below easier to read. > if (sc->sense_buffer) { > memcpy(sc->sense_buffer, resp->sense, > - min_t(u32, resp->sense_len, VIRTIO_SCSI_SENSE_SIZE)); > + min_t(u32, > + virtio32_to_cpu(vscsi->vdev, resp->sense_len), > + VIRTIO_SCSI_SENSE_SIZE)); > if (resp->sense_len) > set_driver_byte(sc, DRIVER_SENSE); > } Otherwise looks good to me.