Re: [kvm:queue 47/61] arch/s390/kvm/kvm-s390.c:3728:6: error: redefinition of 'kvm_arch_vcpu_async_ioctl'

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is missing from the patch:

diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig
index 70691c08e1ed..cca7e065a075 100644
--- a/virt/kvm/Kconfig
+++ b/virt/kvm/Kconfig
@@ -51,3 +51,6 @@ config KVM_COMPAT
 
 config HAVE_KVM_IRQ_BYPASS
        bool
+
+config HAVE_KVM_VCPU_ASYNC_IOCTL
+       bool

Paolo

----- Original Message -----
> From: "kbuild test robot" <fengguang.wu@xxxxxxxxx>
> To: "Paolo Bonzini" <pbonzini@xxxxxxxxxx>
> Cc: kbuild-all@xxxxxx, kvm@xxxxxxxxxxxxxxx, "Robert Hu" <robert.hu@xxxxxxxxx>, "Farrah Chen" <farrah.chen@xxxxxxxxx>,
> "Christoffer Dall" <christoffer.dall@xxxxxxxxxx>, "Cornelia Huck" <cohuck@xxxxxxxxxx>
> Sent: Wednesday, December 13, 2017 2:16:58 PM
> Subject: [kvm:queue 47/61] arch/s390/kvm/kvm-s390.c:3728:6: error: redefinition of 'kvm_arch_vcpu_async_ioctl'
> 
> tree:   https://git.kernel.org/pub/scm/virt/kvm/kvm.git queue
> head:   19b22110fcf48c888b556c7ae97511d225f39777
> commit: bcd8c2d624c37d36e2d33fef9766d701c0ea77f3 [47/61] KVM: introduce
> kvm_arch_vcpu_async_ioctl
> config: s390-allmodconfig (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
>         git checkout bcd8c2d624c37d36e2d33fef9766d701c0ea77f3
>         # save the attached .config to linux build tree
>         make.cross ARCH=s390
> 
> All errors (new ones prefixed by >>):
> 
> >> arch/s390/kvm/kvm-s390.c:3728:6: error: redefinition of
> >> 'kvm_arch_vcpu_async_ioctl'
>     long kvm_arch_vcpu_async_ioctl(struct file *filp,
>          ^~~~~~~~~~~~~~~~~~~~~~~~~
>    In file included from arch/s390/kvm/kvm-s390.c:20:0:
>    include/linux/kvm_host.h:1267:20: note: previous definition of
>    'kvm_arch_vcpu_async_ioctl' was here
>     static inline long kvm_arch_vcpu_async_ioctl(struct file *filp,
>                        ^~~~~~~~~~~~~~~~~~~~~~~~~
> 
> vim +/kvm_arch_vcpu_async_ioctl +3728 arch/s390/kvm/kvm-s390.c
> 
>   3727
> > 3728	long kvm_arch_vcpu_async_ioctl(struct file *filp,
>   3729				       unsigned int ioctl, unsigned long arg)
>   3730	{
>   3731		struct kvm_vcpu *vcpu = filp->private_data;
>   3732		void __user *argp = (void __user *)arg;
>   3733
>   3734		switch (ioctl) {
>   3735		case KVM_S390_IRQ: {
>   3736			struct kvm_s390_irq s390irq;
>   3737
>   3738			if (copy_from_user(&s390irq, argp, sizeof(s390irq)))
>   3739				return -EFAULT;
>   3740			return kvm_s390_inject_vcpu(vcpu, &s390irq);
>   3741		}
>   3742		case KVM_S390_INTERRUPT: {
>   3743			struct kvm_s390_interrupt s390int;
>   3744			struct kvm_s390_irq s390irq;
>   3745
>   3746			if (copy_from_user(&s390int, argp, sizeof(s390int)))
>   3747				return -EFAULT;
>   3748			if (s390int_to_s390irq(&s390int, &s390irq))
>   3749				return -EINVAL;
>   3750			return kvm_s390_inject_vcpu(vcpu, &s390irq);
>   3751		}
>   3752		}
>   3753		return -ENOIOCTLCMD;
>   3754	}
>   3755
> 
> ---
> 0-DAY kernel test infrastructure                Open Source Technology Center
> https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
> 



[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux