From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVgjy-00022r-8Q for qemu-devel@nongnu.org; Wed, 11 Mar 2015 09:32:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVgjt-0001WH-84 for qemu-devel@nongnu.org; Wed, 11 Mar 2015 09:32:02 -0400 Received: from mail-we0-x234.google.com ([2a00:1450:400c:c03::234]:44671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVgjt-0001WB-0o for qemu-devel@nongnu.org; Wed, 11 Mar 2015 09:31:57 -0400 Received: by wesp10 with SMTP id p10so9196761wes.11 for ; Wed, 11 Mar 2015 06:31:56 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <550043C7.3030301@redhat.com> Date: Wed, 11 Mar 2015 14:31:51 +0100 From: Paolo Bonzini MIME-Version: 1.0 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 Subject: Re: [Qemu-devel] [PATCH] uapi/virtio_scsi: allow overriding CDB/SENSE size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" , linux-kernel@vger.kernel.org Cc: qemu-devel@nongnu.org, virtualization@lists.linux-foundation.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 { >