From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754103AbbCKNcB (ORCPT ); Wed, 11 Mar 2015 09:32:01 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:44704 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752794AbbCKNb5 (ORCPT ); Wed, 11 Mar 2015 09:31:57 -0400 Message-ID: <550043C7.3030301@redhat.com> Date: Wed, 11 Mar 2015 14:31:51 +0100 From: Paolo Bonzini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: "Michael S. Tsirkin" , linux-kernel@vger.kernel.org CC: qemu-devel@nongnu.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH] uapi/virtio_scsi: allow overriding CDB/SENSE size References: <20150311141903-mutt-send-email-mst@redhat.com> In-Reply-To: <20150311141903-mutt-send-email-mst@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/03/2015 14:19, Michael S. Tsirkin wrote: > QEMU wants to use virtio scsi structures with > a different VIRTIO_SCSI_CDB_SIZE/VIRTIO_SCSI_SENSE_SIZE, > let's add ifdefs to allow overriding them. > > Keep the old defines under new names: > VIRTIO_SCSI_CDB_DEFAULT_SIZE/VIRTIO_SCSI_SENSE_DEFAULT_SIZE, > since that's what these values really are: > defaults for cdb/sense size fields. > > Suggested-by: Paolo Bonzini > Signed-off-by: Michael S. Tsirkin QEMU will then use a zero-element array instead of a flexible array member. That's okay. Acked-by: Paolo Bonzini Paolo > --- > include/uapi/linux/virtio_scsi.h | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/include/uapi/linux/virtio_scsi.h b/include/uapi/linux/virtio_scsi.h > index 42b9370..cc18ef8 100644 > --- a/include/uapi/linux/virtio_scsi.h > +++ b/include/uapi/linux/virtio_scsi.h > @@ -29,8 +29,16 @@ > > #include > > -#define VIRTIO_SCSI_CDB_SIZE 32 > -#define VIRTIO_SCSI_SENSE_SIZE 96 > +/* Default values of the CDB and sense data size configuration fields */ > +#define VIRTIO_SCSI_CDB_DEFAULT_SIZE 32 > +#define VIRTIO_SCSI_SENSE_DEFAULT_SIZE 96 > + > +#ifndef VIRTIO_SCSI_CDB_SIZE > +#define VIRTIO_SCSI_CDB_SIZE VIRTIO_SCSI_CDB_DEFAULT_SIZE > +#endif > +#ifndef VIRTIO_SCSI_SENSE_SIZE > +#define VIRTIO_SCSI_SENSE_SIZE VIRTIO_SCSI_SENSE_DEFAULT_SIZE > +#endif > > /* SCSI command request, followed by data-out */ > struct virtio_scsi_cmd_req { >