[PATCH v2 1/2] s390/virtio: remove the old KVM virtio headers

[PATCH v2 1/2] s390/virtio: remove the old KVM virtio headers

[Michael S. Tsirkin]

commit 7fb2b2d51 ("s390/virtio: remove the old KVM virtio transport")
dropped the transport support. We don't need to keep the header around.

Cc: Thomas Huth <thuth@redhat.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Halil Pasic <pasic@linux.vnet.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 arch/s390/include/uapi/asm/kvm_virtio.h | 65 ---------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 arch/s390/include/uapi/asm/kvm_virtio.h

diff --git a/arch/s390/include/uapi/asm/kvm_virtio.h b/arch/s390/include/uapi/asm/kvm_virtio.h
deleted file mode 100644
index 7328367..0000000
--- a/arch/s390/include/uapi/asm/kvm_virtio.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- * definition for virtio for kvm on s390
- *
- * Copyright IBM Corp. 2008
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2 only)
- * as published by the Free Software Foundation.
- *
- *    Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
- */
-
-#ifndef __KVM_S390_VIRTIO_H
-#define __KVM_S390_VIRTIO_H
-
-#include <linux/types.h>
-
-struct kvm_device_desc {
-	/* The device type: console, network, disk etc.  Type 0 terminates. */
-	__u8 type;
-	/* The number of virtqueues (first in config array) */
-	__u8 num_vq;
-	/*
-	 * The number of bytes of feature bits.  Multiply by 2: one for host
-	 * features and one for guest acknowledgements.
-	 */
-	__u8 feature_len;
-	/* The number of bytes of the config array after virtqueues. */
-	__u8 config_len;
-	/* A status byte, written by the Guest. */
-	__u8 status;
-	__u8 config[0];
-};
-
-/*
- * This is how we expect the device configuration field for a virtqueue
- * to be laid out in config space.
- */
-struct kvm_vqconfig {
-	/* The token returned with an interrupt. Set by the guest */
-	__u64 token;
-	/* The address of the virtio ring */
-	__u64 address;
-	/* The number of entries in the virtio_ring */
-	__u16 num;
-
-};
-
-#define KVM_S390_VIRTIO_NOTIFY		0
-#define KVM_S390_VIRTIO_RESET		1
-#define KVM_S390_VIRTIO_SET_STATUS	2
-
-/* The alignment to use between consumer and producer parts of vring.
- * This is pagesize for historical reasons. */
-#define KVM_S390_VIRTIO_RING_ALIGN	4096
-
-
-/* These values are supposed to be in ext_params on an interrupt */
-#define VIRTIO_PARAM_MASK		0xff
-#define VIRTIO_PARAM_VRING_INTERRUPT	0x0
-#define VIRTIO_PARAM_CONFIG_CHANGED	0x1
-#define VIRTIO_PARAM_DEV_ADD		0x2
-
-#endif
-- 
MST

[PATCH v2 2/2] s390/virtio: add BSD license to virtio-ccw

[Michael S. Tsirkin]

The original intent of the virtio header relicensing
from 2008 was to make sure anyone can implement compatible
devices/drivers. The virtio-ccw was omitted by mistake.

We have an ack from the only contributor as well as the
maintainer from IBM, so it's not too late to fix that.

Make it dual-licensed with GPLv2, as the whole kernel is GPL2.

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 arch/s390/include/uapi/asm/virtio-ccw.h | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h
index 967aad3..41c267e 100644
--- a/arch/s390/include/uapi/asm/virtio-ccw.h
+++ b/arch/s390/include/uapi/asm/virtio-ccw.h
@@ -1,14 +1,36 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note or BSD-3-Clause */
 /*
  * Definitions for virtio-ccw devices.
  *
  * Copyright IBM Corp. 2013
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2 only)
- * as published by the Free Software Foundation.
- *
  *  Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
+ *
+ * This header is BSD licensed so anyone can use the definitions to implement
+ * compatible drivers/servers.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of IBM nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 #ifndef __KVM_VIRTIO_CCW_H
 #define __KVM_VIRTIO_CCW_H
-- 
MST

Re: [PATCH v2 2/2] s390/virtio: add BSD license to virtio-ccw

[Cornelia Huck]

On Fri, 24 Nov 2017 07:21:09 +0200
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> The original intent of the virtio header relicensing
> from 2008 was to make sure anyone can implement compatible
> devices/drivers. The virtio-ccw was omitted by mistake.
> 
> We have an ack from the only contributor as well as the
> maintainer from IBM, so it's not too late to fix that.
> 
> Make it dual-licensed with GPLv2, as the whole kernel is GPL2.
> 
> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
> Acked-by: Cornelia Huck <cohuck@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  arch/s390/include/uapi/asm/virtio-ccw.h | 32 +++++++++++++++++++++++++++-----
>  1 file changed, 27 insertions(+), 5 deletions(-)

As noted by Thomas, patch 1 is not needed anymore. Who will merge this
one?

Re: [PATCH v2 2/2] s390/virtio: add BSD license to virtio-ccw

[Michael S. Tsirkin]

On Fri, Nov 24, 2017 at 10:09:54AM +0100, Cornelia Huck wrote:
> On Fri, 24 Nov 2017 07:21:09 +0200
> "Michael S. Tsirkin" <mst@redhat.com> wrote:
> 
> > The original intent of the virtio header relicensing
> > from 2008 was to make sure anyone can implement compatible
> > devices/drivers. The virtio-ccw was omitted by mistake.
> > 
> > We have an ack from the only contributor as well as the
> > maintainer from IBM, so it's not too late to fix that.
> > 
> > Make it dual-licensed with GPLv2, as the whole kernel is GPL2.
> > 
> > Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
> > Acked-by: Cornelia Huck <cohuck@redhat.com>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> >  arch/s390/include/uapi/asm/virtio-ccw.h | 32 +++++++++++++++++++++++++++-----
> >  1 file changed, 27 insertions(+), 5 deletions(-)
> 
> As noted by Thomas, patch 1 is not needed anymore. Who will merge this
> one?

Pls merge through the s390 tree.

Re: [PATCH v2 2/2] s390/virtio: add BSD license to virtio-ccw

[Heiko Carstens]

On Fri, Nov 24, 2017 at 07:21:09AM +0200, Michael S. Tsirkin wrote:
> The original intent of the virtio header relicensing
> from 2008 was to make sure anyone can implement compatible
> devices/drivers. The virtio-ccw was omitted by mistake.
> 
> We have an ack from the only contributor as well as the
> maintainer from IBM, so it's not too late to fix that.
> 
> Make it dual-licensed with GPLv2, as the whole kernel is GPL2.
> 
> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
> Acked-by: Cornelia Huck <cohuck@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  arch/s390/include/uapi/asm/virtio-ccw.h | 32 +++++++++++++++++++++++++++-----
>  1 file changed, 27 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h
> index 967aad3..41c267e 100644
> --- a/arch/s390/include/uapi/asm/virtio-ccw.h
> +++ b/arch/s390/include/uapi/asm/virtio-ccw.h
> @@ -1,14 +1,36 @@
> -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note or BSD-3-Clause */

Could you change this and use a correct SPDX License Expression format, please?

 SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)

>  /*
>   * Definitions for virtio-ccw devices.
>   *
>   * Copyright IBM Corp. 2013
>   *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License (version 2 only)
> - * as published by the Free Software Foundation.
> - *
>   *  Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
> + *
> + * This header is BSD licensed so anyone can use the definitions to implement
> + * compatible drivers/servers.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + * 3. Neither the name of IBM nor the names of its contributors
> + *    may be used to endorse or promote products derived from this software
> + *    without specific prior written permission.
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> + * SUCH DAMAGE.

Is there any reason to add the whole BSD 3 clause license text? I'd prefer
if it would be just the simple new SPDX-License-Identifier above.

Re: [PATCH v2 2/2] s390/virtio: add BSD license to virtio-ccw

[Michael S. Tsirkin]

On Fri, Nov 24, 2017 at 03:09:18PM +0100, Heiko Carstens wrote:
> On Fri, Nov 24, 2017 at 07:21:09AM +0200, Michael S. Tsirkin wrote:
> > The original intent of the virtio header relicensing
> > from 2008 was to make sure anyone can implement compatible
> > devices/drivers. The virtio-ccw was omitted by mistake.
> > 
> > We have an ack from the only contributor as well as the
> > maintainer from IBM, so it's not too late to fix that.
> > 
> > Make it dual-licensed with GPLv2, as the whole kernel is GPL2.
> > 
> > Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
> > Acked-by: Cornelia Huck <cohuck@redhat.com>
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> >  arch/s390/include/uapi/asm/virtio-ccw.h | 32 +++++++++++++++++++++++++++-----
> >  1 file changed, 27 insertions(+), 5 deletions(-)
> > 
> > diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h
> > index 967aad3..41c267e 100644
> > --- a/arch/s390/include/uapi/asm/virtio-ccw.h
> > +++ b/arch/s390/include/uapi/asm/virtio-ccw.h
> > @@ -1,14 +1,36 @@
> > -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note or BSD-3-Clause */
> 
> Could you change this and use a correct SPDX License Expression format, please?
> 
>  SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)

Will do, should be consistent with rest of the kernel.

But I note that WITH has higher precedence than OR.
And I followed a dual license example from
https://wiki.spdx.org/view/SPDX_FAQ
if lower-case or isn't allowed, maybe that should be fixed.


> >  /*
> >   * Definitions for virtio-ccw devices.
> >   *
> >   * Copyright IBM Corp. 2013
> >   *
> > - * This program is free software; you can redistribute it and/or modify
> > - * it under the terms of the GNU General Public License (version 2 only)
> > - * as published by the Free Software Foundation.
> > - *
> >   *  Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
> > + *
> > + * This header is BSD licensed so anyone can use the definitions to implement
> > + * compatible drivers/servers.
> > + *
> > + * Redistribution and use in source and binary forms, with or without
> > + * modification, are permitted provided that the following conditions
> > + * are met:
> > + * 1. Redistributions of source code must retain the above copyright
> > + *    notice, this list of conditions and the following disclaimer.
> > + * 2. Redistributions in binary form must reproduce the above copyright
> > + *    notice, this list of conditions and the following disclaimer in the
> > + *    documentation and/or other materials provided with the distribution.
> > + * 3. Neither the name of IBM nor the names of its contributors
> > + *    may be used to endorse or promote products derived from this software
> > + *    without specific prior written permission.
> > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
> > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> > + * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
> > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> > + * SUCH DAMAGE.
> 
> Is there any reason to add the whole BSD 3 clause license text? I'd prefer
> if it would be just the simple new SPDX-License-Identifier above.

Re: [PATCH v2 2/2] s390/virtio: add BSD license to virtio-ccw

[Heiko Carstens]

On Fri, Nov 24, 2017 at 06:21:11PM +0200, Michael S. Tsirkin wrote:
> On Fri, Nov 24, 2017 at 03:09:18PM +0100, Heiko Carstens wrote:
> > On Fri, Nov 24, 2017 at 07:21:09AM +0200, Michael S. Tsirkin wrote:
> > > The original intent of the virtio header relicensing
> > > from 2008 was to make sure anyone can implement compatible
> > > devices/drivers. The virtio-ccw was omitted by mistake.
> > > 
> > > We have an ack from the only contributor as well as the
> > > maintainer from IBM, so it's not too late to fix that.
> > > 
> > > Make it dual-licensed with GPLv2, as the whole kernel is GPL2.
> > > 
> > > Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
> > > Acked-by: Cornelia Huck <cohuck@redhat.com>
> > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > > ---
> > >  arch/s390/include/uapi/asm/virtio-ccw.h | 32 +++++++++++++++++++++++++++-----
> > >  1 file changed, 27 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/arch/s390/include/uapi/asm/virtio-ccw.h b/arch/s390/include/uapi/asm/virtio-ccw.h
> > > index 967aad3..41c267e 100644
> > > --- a/arch/s390/include/uapi/asm/virtio-ccw.h
> > > +++ b/arch/s390/include/uapi/asm/virtio-ccw.h
> > > @@ -1,14 +1,36 @@
> > > -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> > > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note or BSD-3-Clause */
> > 
> > Could you change this and use a correct SPDX License Expression format, please?
> > 
> >  SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
> 
> Will do, should be consistent with rest of the kernel.
> 
> But I note that WITH has higher precedence than OR.
> And I followed a dual license example from
> https://wiki.spdx.org/view/SPDX_FAQ
> if lower-case or isn't allowed, maybe that should be fixed.

According to https://spdx.org/spdx-specification-21-web-version Appendix IV
and V it looks like that doesn't seem to be allowed.

Please also consider my previous comment below, which you may have missed.

> > > + *
> > > + * This header is BSD licensed so anyone can use the definitions to implement
> > > + * compatible drivers/servers.
> > > + *
> > > + * Redistribution and use in source and binary forms, with or without
> > > + * modification, are permitted provided that the following conditions
> > > + * are met:
> > > + * 1. Redistributions of source code must retain the above copyright
> > > + *    notice, this list of conditions and the following disclaimer.
> > > + * 2. Redistributions in binary form must reproduce the above copyright
> > > + *    notice, this list of conditions and the following disclaimer in the
> > > + *    documentation and/or other materials provided with the distribution.
> > > + * 3. Neither the name of IBM nor the names of its contributors
> > > + *    may be used to endorse or promote products derived from this software
> > > + *    without specific prior written permission.
> > > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND
> > > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> > > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> > > + * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE
> > > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> > > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> > > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> > > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> > > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> > > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> > > + * SUCH DAMAGE.
> > 
> > Is there any reason to add the whole BSD 3 clause license text? I'd prefer
> > if it would be just the simple new SPDX-License-Identifier above.

Re: [PATCH v2 2/2] s390/virtio: add BSD license to virtio-ccw

[Michael S. Tsirkin]

On Fri, Nov 24, 2017 at 05:53:01PM +0100, Heiko Carstens wrote:
> > > Is there any reason to add the whole BSD 3 clause license text? I'd prefer
> > > if it would be just the simple new SPDX-License-Identifier above.

I added  it for consistency with other virtio headers.
-- 
MST

Re: [PATCH v2 2/2] s390/virtio: add BSD license to virtio-ccw

[Heiko Carstens]

On Fri, Nov 24, 2017 at 07:02:41PM +0200, Michael S. Tsirkin wrote:
> On Fri, Nov 24, 2017 at 05:53:01PM +0100, Heiko Carstens wrote:
> > > > Is there any reason to add the whole BSD 3 clause license text? I'd prefer
> > > > if it would be just the simple new SPDX-License-Identifier above.
> 
> I added  it for consistency with other virtio headers.

Well, one of the points of the SPDX tags is to avoid the countless
duplication of license texts. Adding a license text is easy, removing it
again later is not as easy. Therefore I would prefer to avoid the
duplication here again.

Cornelia, Christian, any opinion here?

Thanks.

Re: [PATCH v2 2/2] s390/virtio: add BSD license to virtio-ccw

[Christian Borntraeger]

On 11/24/2017 06:18 PM, Heiko Carstens wrote:
> On Fri, Nov 24, 2017 at 07:02:41PM +0200, Michael S. Tsirkin wrote:
>> On Fri, Nov 24, 2017 at 05:53:01PM +0100, Heiko Carstens wrote:
>>>>> Is there any reason to add the whole BSD 3 clause license text? I'd prefer
>>>>> if it would be just the simple new SPDX-License-Identifier above.
>>
>> I added  it for consistency with other virtio headers.
> 
> Well, one of the points of the SPDX tags is to avoid the countless
> duplication of license texts. Adding a license text is easy, removing it
> again later is not as easy. Therefore I would prefer to avoid the
> duplication here again.
> 
> Cornelia, Christian, any opinion here?

I would prefer to not have the full licence text and only have the SPDX string
if that is allowed by the licence.

Re: [PATCH v2 2/2] s390/virtio: add BSD license to virtio-ccw

[Cornelia Huck]

On Mon, 27 Nov 2017 09:15:14 +0100
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> On 11/24/2017 06:18 PM, Heiko Carstens wrote:
> > On Fri, Nov 24, 2017 at 07:02:41PM +0200, Michael S. Tsirkin wrote:  
> >> On Fri, Nov 24, 2017 at 05:53:01PM +0100, Heiko Carstens wrote:  
> >>>>> Is there any reason to add the whole BSD 3 clause license text? I'd prefer
> >>>>> if it would be just the simple new SPDX-License-Identifier above.  
> >>
> >> I added  it for consistency with other virtio headers.  
> > 
> > Well, one of the points of the SPDX tags is to avoid the countless
> > duplication of license texts. Adding a license text is easy, removing it
> > again later is not as easy. Therefore I would prefer to avoid the
> > duplication here again.
> > 
> > Cornelia, Christian, any opinion here?  
> 
> I would prefer to not have the full licence text and only have the SPDX string
> if that is allowed by the licence.
> 

Works for me.

Re: [PATCH v2 1/2] s390/virtio: remove the old KVM virtio headers

[Thomas Huth]

On 24.11.2017 06:21, Michael S. Tsirkin wrote:
> commit 7fb2b2d51 ("s390/virtio: remove the old KVM virtio transport")
> dropped the transport support. We don't need to keep the header around.
> 
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Halil Pasic <pasic@linux.vnet.ibm.com>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  arch/s390/include/uapi/asm/kvm_virtio.h | 65 ---------------------------------
>  1 file changed, 65 deletions(-)
>  delete mode 100644 arch/s390/include/uapi/asm/kvm_virtio.h
> 
> diff --git a/arch/s390/include/uapi/asm/kvm_virtio.h b/arch/s390/include/uapi/asm/kvm_virtio.h
> deleted file mode 100644
> index 7328367..0000000
> --- a/arch/s390/include/uapi/asm/kvm_virtio.h
> +++ /dev/null

This seems to be already upstream? See:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a401917bc3e2d251ce521

 Thomas

Re: [PATCH v2 1/2] s390/virtio: remove the old KVM virtio headers

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 2993 bytes --]

Hi Michael,

I love your patch! Yet something to improve:

[auto build test ERROR on v4.14]
[cannot apply to s390/features linus/master kvms390/next next-20171124]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Michael-S-Tsirkin/s390-virtio-remove-the-old-KVM-virtio-headers/20171126-050658
config: s390-default_defconfig (attached as .config)
compiler: s390x-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=s390 

All errors (new ones prefixed by >>):

>> arch/s390/kernel/setup.c:63:10: fatal error: asm/kvm_virtio.h: No such file or directory
    #include <asm/kvm_virtio.h>
             ^~~~~~~~~~~~~~~~~~
   compilation terminated.
--
>> drivers/s390/virtio/kvm_virtio.c:27:10: fatal error: asm/kvm_virtio.h: No such file or directory
    #include <asm/kvm_virtio.h>
             ^~~~~~~~~~~~~~~~~~
   compilation terminated.

vim +63 arch/s390/kernel/setup.c

^1da177e4 Linus Torvalds        2005-04-16  51  
46b05d261 Michael Holzheu       2007-02-21  52  #include <asm/ipl.h>
1e3cab2f2 Heiko Carstens        2012-03-30  53  #include <asm/facility.h>
^1da177e4 Linus Torvalds        2005-04-16  54  #include <asm/smp.h>
^1da177e4 Linus Torvalds        2005-04-16  55  #include <asm/mmu_context.h>
^1da177e4 Linus Torvalds        2005-04-16  56  #include <asm/cpcmd.h>
^1da177e4 Linus Torvalds        2005-04-16  57  #include <asm/lowcore.h>
^1da177e4 Linus Torvalds        2005-04-16  58  #include <asm/irq.h>
0b642ede4 Peter Oberparleiter   2005-05-01  59  #include <asm/page.h>
0b642ede4 Peter Oberparleiter   2005-05-01  60  #include <asm/ptrace.h>
cc13ad621 Heiko Carstens        2006-06-25  61  #include <asm/sections.h>
fe355b7f1 Hongjie Yang          2007-02-05  62  #include <asm/ebcdic.h>
faeba830b Christian Borntraeger 2008-06-20 @63  #include <asm/kvm_virtio.h>
60a0c68df Michael Holzheu       2011-10-30  64  #include <asm/diag.h>
4857d4bbe Michael Holzheu       2012-03-11  65  #include <asm/os_info.h>
cd1834591 Heinz Graalfs         2012-06-11  66  #include <asm/sclp.h>
bcfcbb6ba Martin Schwidefsky    2014-08-11  67  #include <asm/sysinfo.h>
3a368f742 Philipp Hachtmann     2014-03-06  68  #include <asm/numa.h>
8b646bd75 Martin Schwidefsky    2012-03-11  69  #include "entry.h"
c1821c2e9 Gerald Schaefer       2007-02-05  70  

:::::: The code at line 63 was first introduced by commit
:::::: faeba830b086bc9e58748869054e994cb09693cd s390: use virtio_console for KVM on s390

:::::: TO: Christian Borntraeger <borntraeger@de.ibm.com>
:::::: CC: Rusty Russell <rusty@rustcorp.com.au>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 17442 bytes --]