Re: [PATCH v2 1/2] s390/virtio: remove the old KVM virtio headers
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 ^~ compilation terminated. -- >> drivers/s390/virtio/kvm_virtio.c:27:10: fatal error: asm/kvm_virtio.h: No >> such file or directory #include ^~ compilation terminated. vim +63 arch/s390/kernel/setup.c ^1da177e4 Linus Torvalds2005-04-16 51 46b05d261 Michael Holzheu 2007-02-21 52 #include 1e3cab2f2 Heiko Carstens2012-03-30 53 #include ^1da177e4 Linus Torvalds2005-04-16 54 #include ^1da177e4 Linus Torvalds2005-04-16 55 #include ^1da177e4 Linus Torvalds2005-04-16 56 #include ^1da177e4 Linus Torvalds2005-04-16 57 #include ^1da177e4 Linus Torvalds2005-04-16 58 #include 0b642ede4 Peter Oberparleiter 2005-05-01 59 #include 0b642ede4 Peter Oberparleiter 2005-05-01 60 #include cc13ad621 Heiko Carstens2006-06-25 61 #include fe355b7f1 Hongjie Yang 2007-02-05 62 #include faeba830b Christian Borntraeger 2008-06-20 @63 #include 60a0c68df Michael Holzheu 2011-10-30 64 #include 4857d4bbe Michael Holzheu 2012-03-11 65 #include cd1834591 Heinz Graalfs 2012-06-11 66 #include bcfcbb6ba Martin Schwidefsky2014-08-11 67 #include 3a368f742 Philipp Hachtmann 2014-03-06 68 #include 8b646bd75 Martin Schwidefsky2012-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:: CC: Rusty Russell --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip
Re: [PATCH v2 1/2] s390/virtio: remove the old KVM virtio headers
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 ^~ compilation terminated. -- >> drivers/s390/virtio/kvm_virtio.c:27:10: fatal error: asm/kvm_virtio.h: No >> such file or directory #include ^~ compilation terminated. vim +63 arch/s390/kernel/setup.c ^1da177e4 Linus Torvalds2005-04-16 51 46b05d261 Michael Holzheu 2007-02-21 52 #include 1e3cab2f2 Heiko Carstens2012-03-30 53 #include ^1da177e4 Linus Torvalds2005-04-16 54 #include ^1da177e4 Linus Torvalds2005-04-16 55 #include ^1da177e4 Linus Torvalds2005-04-16 56 #include ^1da177e4 Linus Torvalds2005-04-16 57 #include ^1da177e4 Linus Torvalds2005-04-16 58 #include 0b642ede4 Peter Oberparleiter 2005-05-01 59 #include 0b642ede4 Peter Oberparleiter 2005-05-01 60 #include cc13ad621 Heiko Carstens2006-06-25 61 #include fe355b7f1 Hongjie Yang 2007-02-05 62 #include faeba830b Christian Borntraeger 2008-06-20 @63 #include 60a0c68df Michael Holzheu 2011-10-30 64 #include 4857d4bbe Michael Holzheu 2012-03-11 65 #include cd1834591 Heinz Graalfs 2012-06-11 66 #include bcfcbb6ba Martin Schwidefsky2014-08-11 67 #include 3a368f742 Philipp Hachtmann 2014-03-06 68 #include 8b646bd75 Martin Schwidefsky2012-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 :: CC: Rusty Russell --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip
Re: [PATCH v2 1/2] s390/virtio: remove the old KVM virtio headers
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> Cc: Cornelia Huck > Cc: Halil Pasic > Cc: Heiko Carstens > Cc: Martin Schwidefsky > Signed-off-by: Michael S. Tsirkin > --- > 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..000 > --- 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
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 > Cc: Cornelia Huck > Cc: Halil Pasic > Cc: Heiko Carstens > Cc: Martin Schwidefsky > Signed-off-by: Michael S. Tsirkin > --- > 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..000 > --- 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
[PATCH v2 1/2] s390/virtio: remove the old KVM virtio headers
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 HuthCc: Cornelia Huck Cc: Halil Pasic Cc: Heiko Carstens Cc: Martin Schwidefsky Signed-off-by: Michael S. Tsirkin --- 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..000 --- 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 - */ - -#ifndef __KVM_S390_VIRTIO_H -#define __KVM_S390_VIRTIO_H - -#include - -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_CHANGED0x1 -#define VIRTIO_PARAM_DEV_ADD 0x2 - -#endif -- MST
[PATCH v2 1/2] s390/virtio: remove the old KVM virtio headers
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 Cc: Cornelia Huck Cc: Halil Pasic Cc: Heiko Carstens Cc: Martin Schwidefsky Signed-off-by: Michael S. Tsirkin --- 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..000 --- 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 - */ - -#ifndef __KVM_S390_VIRTIO_H -#define __KVM_S390_VIRTIO_H - -#include - -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_CHANGED0x1 -#define VIRTIO_PARAM_DEV_ADD 0x2 - -#endif -- MST