diff for duplicates of <20171212182509.GO910@cbox> diff --git a/a/1.txt b/N1/1.txt index 452ee45..f0481ca 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -38,7 +38,7 @@ On Tue, Dec 12, 2017 at 06:31:55PM +0100, Paolo Bonzini wrote: > void __user *argp = (void __user *)arg; > - long r; > -> if (ioctl = KVM_INTERRUPT) { +> if (ioctl == KVM_INTERRUPT) { > struct kvm_mips_interrupt irq; > @@ -921,6 +920,16 @@ long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, > return kvm_vcpu_ioctl_interrupt(vcpu, &irq); @@ -74,7 +74,7 @@ On Tue, Dec 12, 2017 at 06:31:55PM +0100, Paolo Bonzini wrote: > void __user *argp = (void __user *)arg; > - long r; > -> if (ioctl = KVM_INTERRUPT) { +> if (ioctl == KVM_INTERRUPT) { > struct kvm_interrupt irq; > @@ -1620,6 +1619,15 @@ long kvm_arch_vcpu_ioctl(struct file *filp, > return -EFAULT; @@ -153,7 +153,7 @@ On Tue, Dec 12, 2017 at 06:31:55PM +0100, Paolo Bonzini wrote: > - * so vcpu_load() would break it. > + * so mutex_lock() would break it. > */ -> - if (ioctl = KVM_S390_INTERRUPT || ioctl = KVM_S390_IRQ || ioctl = KVM_INTERRUPT) +> - if (ioctl == KVM_S390_INTERRUPT || ioctl == KVM_S390_IRQ || ioctl == KVM_INTERRUPT) > - return kvm_arch_vcpu_ioctl(filp, ioctl, arg); > + r = kvm_arch_vcpu_async_ioctl(filp, ioctl, arg); > + if (r != -ENOIOCTLCMD) diff --git a/a/content_digest b/N1/content_digest index 98bd8db..c7ec78c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01513099915-107126-1-git-send-email-pbonzini@redhat.com\0" "From\0Christoffer Dall <christoffer.dall@linaro.org>\0" "Subject\0Re: [PATCH] KVM: introduce kvm_arch_vcpu_async_ioctl\0" - "Date\0Tue, 12 Dec 2017 18:25:09 +0000\0" + "Date\0Tue, 12 Dec 2017 19:25:09 +0100\0" "To\0Paolo Bonzini <pbonzini@redhat.com>\0" "Cc\0linux-kernel@vger.kernel.org" kvm@vger.kernel.org @@ -52,7 +52,7 @@ "> \tvoid __user *argp = (void __user *)arg;\n" "> -\tlong r;\n" "> \n" - "> \tif (ioctl = KVM_INTERRUPT) {\n" + "> \tif (ioctl == KVM_INTERRUPT) {\n" "> \t\tstruct kvm_mips_interrupt irq;\n" "> @@ -921,6 +920,16 @@ long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl,\n" "> \t\treturn kvm_vcpu_ioctl_interrupt(vcpu, &irq);\n" @@ -88,7 +88,7 @@ "> \tvoid __user *argp = (void __user *)arg;\n" "> -\tlong r;\n" "> \n" - "> \tif (ioctl = KVM_INTERRUPT) {\n" + "> \tif (ioctl == KVM_INTERRUPT) {\n" "> \t\tstruct kvm_interrupt irq;\n" "> @@ -1620,6 +1619,15 @@ long kvm_arch_vcpu_ioctl(struct file *filp,\n" "> \t\t\treturn -EFAULT;\n" @@ -167,7 +167,7 @@ "> -\t * so vcpu_load() would break it.\n" "> +\t * so mutex_lock() would break it.\n" "> \t */\n" - "> -\tif (ioctl = KVM_S390_INTERRUPT || ioctl = KVM_S390_IRQ || ioctl = KVM_INTERRUPT)\n" + "> -\tif (ioctl == KVM_S390_INTERRUPT || ioctl == KVM_S390_IRQ || ioctl == KVM_INTERRUPT)\n" "> -\t\treturn kvm_arch_vcpu_ioctl(filp, ioctl, arg);\n" "> +\tr = kvm_arch_vcpu_async_ioctl(filp, ioctl, arg);\n" "> +\tif (r != -ENOIOCTLCMD)\n" @@ -190,4 +190,4 @@ "Thanks,\n" -Christoffer -83f3106abea71b3c6bf94b279bda2a93f1fda066a2e28f33379aac391dd185aa +c325795bbe79a202a57d604c1c9eadd04a486c2c0b3584f8f58b6767ae7e10b6
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.