* [PATCH] uapi/virtio_scsi: allow overriding CDB/SENSE size
@ 2015-03-11 13:19 Michael S. Tsirkin
2015-03-11 13:31 ` Paolo Bonzini
2015-03-12 11:06 ` Michael S. Tsirkin
0 siblings, 2 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2015-03-11 13:19 UTC (permalink / raw)
To: linux-kernel; +Cc: Paolo Bonzini, Rusty Russell, virtualization, qemu-devel
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 <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
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 <linux/virtio_types.h>
-#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 {
--
MST
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] uapi/virtio_scsi: allow overriding CDB/SENSE size
2015-03-11 13:19 [PATCH] uapi/virtio_scsi: allow overriding CDB/SENSE size Michael S. Tsirkin
@ 2015-03-11 13:31 ` Paolo Bonzini
2015-03-11 13:49 ` Michael S. Tsirkin
2015-03-12 11:06 ` Michael S. Tsirkin
1 sibling, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2015-03-11 13:31 UTC (permalink / raw)
To: Michael S. Tsirkin, linux-kernel; +Cc: qemu-devel, virtualization
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 <pbonzini@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
QEMU will then use a zero-element array instead of a flexible array
member. That's okay.
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
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 <linux/virtio_types.h>
>
> -#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 {
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] uapi/virtio_scsi: allow overriding CDB/SENSE size
2015-03-11 13:31 ` Paolo Bonzini
@ 2015-03-11 13:49 ` Michael S. Tsirkin
0 siblings, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2015-03-11 13:49 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: linux-kernel, qemu-devel, virtualization
On Wed, Mar 11, 2015 at 02:31:51PM +0100, Paolo Bonzini wrote:
>
>
> 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 <pbonzini@redhat.com>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> QEMU will then use a zero-element array instead of a flexible array
> member. That's okay.
Or a flex array member: just do
#define VIRTIO_SCSI_CDB_SIZE
#define VIRTIO_SCSI_SENSE_SIZE
before including this header.
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>
> 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 <linux/virtio_types.h>
> >
> > -#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 {
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] uapi/virtio_scsi: allow overriding CDB/SENSE size
2015-03-11 13:19 [PATCH] uapi/virtio_scsi: allow overriding CDB/SENSE size Michael S. Tsirkin
2015-03-11 13:31 ` Paolo Bonzini
@ 2015-03-12 11:06 ` Michael S. Tsirkin
2015-03-13 1:29 ` Rusty Russell
1 sibling, 1 reply; 5+ messages in thread
From: Michael S. Tsirkin @ 2015-03-12 11:06 UTC (permalink / raw)
To: linux-kernel; +Cc: Paolo Bonzini, Rusty Russell, virtualization, qemu-devel
On Wed, Mar 11, 2015 at 02:19:03PM +0100, 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 <pbonzini@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
Rusty, pls note, if possible I'd like this one
merged for 4.0 because it's important for QEMU
(which now imports linux headers).
> 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 <linux/virtio_types.h>
>
> -#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 {
> --
> MST
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] uapi/virtio_scsi: allow overriding CDB/SENSE size
2015-03-12 11:06 ` Michael S. Tsirkin
@ 2015-03-13 1:29 ` Rusty Russell
0 siblings, 0 replies; 5+ messages in thread
From: Rusty Russell @ 2015-03-13 1:29 UTC (permalink / raw)
To: Michael S. Tsirkin, linux-kernel
Cc: Paolo Bonzini, virtualization, qemu-devel
"Michael S. Tsirkin" <mst@redhat.com> writes:
> On Wed, Mar 11, 2015 at 02:19:03PM +0100, 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 <pbonzini@redhat.com>
>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>> ---
>
> Rusty, pls note, if possible I'd like this one
> merged for 4.0 because it's important for QEMU
> (which now imports linux headers).
OK, applied.
Thanks,
Rusty.
>
>
>> 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 <linux/virtio_types.h>
>>
>> -#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 {
>> --
>> MST
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-03-13 1:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-11 13:19 [PATCH] uapi/virtio_scsi: allow overriding CDB/SENSE size Michael S. Tsirkin
2015-03-11 13:31 ` Paolo Bonzini
2015-03-11 13:49 ` Michael S. Tsirkin
2015-03-12 11:06 ` Michael S. Tsirkin
2015-03-13 1:29 ` Rusty Russell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).