diff for duplicates of <20171204203538.8370-15-cdall@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 05ac512..2892d1e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,7 +31,7 @@ index 3a898712d6cd..4a039341dc29 100644 void __user *argp = (void __user *)arg; long r; -+ if (ioctl = KVM_INTERRUPT) { ++ if (ioctl == KVM_INTERRUPT) { + struct kvm_mips_interrupt irq; + + if (copy_from_user(&irq, argp, sizeof(irq))) @@ -53,7 +53,7 @@ index 3a898712d6cd..4a039341dc29 100644 if (copy_from_user(®, argp, sizeof(reg))) - return -EFAULT; + break; - if (ioctl = KVM_SET_ONE_REG) + if (ioctl == KVM_SET_ONE_REG) - return kvm_mips_set_reg(vcpu, ®); + r = kvm_mips_set_reg(vcpu, ®); else @@ -123,7 +123,7 @@ index c06bc9552438..6b5dd3a25fe8 100644 - switch (ioctl) { - case KVM_INTERRUPT: { -+ if (ioctl = KVM_INTERRUPT) { ++ if (ioctl == KVM_INTERRUPT) { struct kvm_interrupt irq; - r = -EFAULT; if (copy_from_user(&irq, argp, sizeof(irq))) @@ -295,7 +295,7 @@ index 9a3acbcf542c..8223c59be507 100644 - return -EFAULT; + break; + - if (ioctl = KVM_SET_ONE_REG) + if (ioctl == KVM_SET_ONE_REG) - return kvm_arm_set_reg(vcpu, ®); + r = kvm_arm_set_reg(vcpu, ®); else diff --git a/a/content_digest b/N1/content_digest index ba32870..41d370b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020171204203538.8370-1-cdall@kernel.org\0" "From\0Christoffer Dall <cdall@kernel.org>\0" "Subject\0[PATCH v3 14/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl\0" - "Date\0Mon, 04 Dec 2017 20:35:36 +0000\0" + "Date\0Mon, 4 Dec 2017 21:35:36 +0100\0" "To\0kvm@vger.kernel.org\0" "Cc\0linux-mips@linux-mips.org" Marc Zyngier <marc.zyngier@arm.com> @@ -49,7 +49,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" "+\n" "+\t\tif (copy_from_user(&irq, argp, sizeof(irq)))\n" @@ -71,7 +71,7 @@ " \t\tif (copy_from_user(®, argp, sizeof(reg)))\n" "-\t\t\treturn -EFAULT;\n" "+\t\t\tbreak;\n" - " \t\tif (ioctl = KVM_SET_ONE_REG)\n" + " \t\tif (ioctl == KVM_SET_ONE_REG)\n" "-\t\t\treturn kvm_mips_set_reg(vcpu, ®);\n" "+\t\t\tr = kvm_mips_set_reg(vcpu, ®);\n" " \t\telse\n" @@ -141,7 +141,7 @@ " \n" "-\tswitch (ioctl) {\n" "-\tcase KVM_INTERRUPT: {\n" - "+\tif (ioctl = KVM_INTERRUPT) {\n" + "+\tif (ioctl == KVM_INTERRUPT) {\n" " \t\tstruct kvm_interrupt irq;\n" "-\t\tr = -EFAULT;\n" " \t\tif (copy_from_user(&irq, argp, sizeof(irq)))\n" @@ -313,7 +313,7 @@ "-\t\t\treturn -EFAULT;\n" "+\t\t\tbreak;\n" "+\n" - " \t\tif (ioctl = KVM_SET_ONE_REG)\n" + " \t\tif (ioctl == KVM_SET_ONE_REG)\n" "-\t\t\treturn kvm_arm_set_reg(vcpu, ®);\n" "+\t\t\tr = kvm_arm_set_reg(vcpu, ®);\n" " \t\telse\n" @@ -402,4 +402,4 @@ "-- \n" 2.14.2 -f53345df7dd60f9595d16b027647b32ebc417654722b67752a16fd1a822edd1e +fe8c4cc9aac341d2bd315495787cb68d2d9dc0a2834dfc67e288470a1dbfd36d
diff --git a/a/1.txt b/N2/1.txt index 05ac512..2892d1e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -31,7 +31,7 @@ index 3a898712d6cd..4a039341dc29 100644 void __user *argp = (void __user *)arg; long r; -+ if (ioctl = KVM_INTERRUPT) { ++ if (ioctl == KVM_INTERRUPT) { + struct kvm_mips_interrupt irq; + + if (copy_from_user(&irq, argp, sizeof(irq))) @@ -53,7 +53,7 @@ index 3a898712d6cd..4a039341dc29 100644 if (copy_from_user(®, argp, sizeof(reg))) - return -EFAULT; + break; - if (ioctl = KVM_SET_ONE_REG) + if (ioctl == KVM_SET_ONE_REG) - return kvm_mips_set_reg(vcpu, ®); + r = kvm_mips_set_reg(vcpu, ®); else @@ -123,7 +123,7 @@ index c06bc9552438..6b5dd3a25fe8 100644 - switch (ioctl) { - case KVM_INTERRUPT: { -+ if (ioctl = KVM_INTERRUPT) { ++ if (ioctl == KVM_INTERRUPT) { struct kvm_interrupt irq; - r = -EFAULT; if (copy_from_user(&irq, argp, sizeof(irq))) @@ -295,7 +295,7 @@ index 9a3acbcf542c..8223c59be507 100644 - return -EFAULT; + break; + - if (ioctl = KVM_SET_ONE_REG) + if (ioctl == KVM_SET_ONE_REG) - return kvm_arm_set_reg(vcpu, ®); + r = kvm_arm_set_reg(vcpu, ®); else diff --git a/a/content_digest b/N2/content_digest index ba32870..f4d4b6f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,19 +1,22 @@ "ref\020171204203538.8370-1-cdall@kernel.org\0" "From\0Christoffer Dall <cdall@kernel.org>\0" "Subject\0[PATCH v3 14/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl\0" - "Date\0Mon, 04 Dec 2017 20:35:36 +0000\0" + "Date\0Mon, 4 Dec 2017 21:35:36 +0100\0" "To\0kvm@vger.kernel.org\0" - "Cc\0linux-mips@linux-mips.org" + "Cc\0Andrew Jones <drjones@redhat.com>" + Christoffer Dall <christoffer.dall@linaro.org> + Paolo Bonzini <pbonzini@redhat.com> + " Radim Kr\304\215m\303\241\305\231 <rkrcmar@redhat.com>" Marc Zyngier <marc.zyngier@arm.com> + kvmarm@lists.cs.columbia.edu + linux-arm-kernel@lists.infradead.org James Hogan <jhogan@kernel.org> - Cornelia Huck <cohuck@redhat.com> - kvm-ppc@vger.kernel.org + linux-mips@linux-mips.org Paul Mackerras <paulus@ozlabs.org> + kvm-ppc@vger.kernel.org Christian Borntraeger <borntraeger@de.ibm.com> - linux-arm-kernel@lists.infradead.org - Paolo Bonzini <pbonzini@redhat.com> - linux-s390@vger.kernel.org - " kvmarm@lists.cs.columbia.edu\0" + Cornelia Huck <cohuck@redhat.com> + " linux-s390@vger.kernel.org\0" "\00:1\0" "b\0" "From: Christoffer Dall <christoffer.dall@linaro.org>\n" @@ -49,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" "+\n" "+\t\tif (copy_from_user(&irq, argp, sizeof(irq)))\n" @@ -71,7 +74,7 @@ " \t\tif (copy_from_user(®, argp, sizeof(reg)))\n" "-\t\t\treturn -EFAULT;\n" "+\t\t\tbreak;\n" - " \t\tif (ioctl = KVM_SET_ONE_REG)\n" + " \t\tif (ioctl == KVM_SET_ONE_REG)\n" "-\t\t\treturn kvm_mips_set_reg(vcpu, ®);\n" "+\t\t\tr = kvm_mips_set_reg(vcpu, ®);\n" " \t\telse\n" @@ -141,7 +144,7 @@ " \n" "-\tswitch (ioctl) {\n" "-\tcase KVM_INTERRUPT: {\n" - "+\tif (ioctl = KVM_INTERRUPT) {\n" + "+\tif (ioctl == KVM_INTERRUPT) {\n" " \t\tstruct kvm_interrupt irq;\n" "-\t\tr = -EFAULT;\n" " \t\tif (copy_from_user(&irq, argp, sizeof(irq)))\n" @@ -313,7 +316,7 @@ "-\t\t\treturn -EFAULT;\n" "+\t\t\tbreak;\n" "+\n" - " \t\tif (ioctl = KVM_SET_ONE_REG)\n" + " \t\tif (ioctl == KVM_SET_ONE_REG)\n" "-\t\t\treturn kvm_arm_set_reg(vcpu, ®);\n" "+\t\t\tr = kvm_arm_set_reg(vcpu, ®);\n" " \t\telse\n" @@ -402,4 +405,4 @@ "-- \n" 2.14.2 -f53345df7dd60f9595d16b027647b32ebc417654722b67752a16fd1a822edd1e +376d7a020a001cd85c4c6942c4cb3de5ae8acce45cc18212da7164dc735a98d9
diff --git a/a/1.txt b/N3/1.txt index 05ac512..2892d1e 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -31,7 +31,7 @@ index 3a898712d6cd..4a039341dc29 100644 void __user *argp = (void __user *)arg; long r; -+ if (ioctl = KVM_INTERRUPT) { ++ if (ioctl == KVM_INTERRUPT) { + struct kvm_mips_interrupt irq; + + if (copy_from_user(&irq, argp, sizeof(irq))) @@ -53,7 +53,7 @@ index 3a898712d6cd..4a039341dc29 100644 if (copy_from_user(®, argp, sizeof(reg))) - return -EFAULT; + break; - if (ioctl = KVM_SET_ONE_REG) + if (ioctl == KVM_SET_ONE_REG) - return kvm_mips_set_reg(vcpu, ®); + r = kvm_mips_set_reg(vcpu, ®); else @@ -123,7 +123,7 @@ index c06bc9552438..6b5dd3a25fe8 100644 - switch (ioctl) { - case KVM_INTERRUPT: { -+ if (ioctl = KVM_INTERRUPT) { ++ if (ioctl == KVM_INTERRUPT) { struct kvm_interrupt irq; - r = -EFAULT; if (copy_from_user(&irq, argp, sizeof(irq))) @@ -295,7 +295,7 @@ index 9a3acbcf542c..8223c59be507 100644 - return -EFAULT; + break; + - if (ioctl = KVM_SET_ONE_REG) + if (ioctl == KVM_SET_ONE_REG) - return kvm_arm_set_reg(vcpu, ®); + r = kvm_arm_set_reg(vcpu, ®); else diff --git a/a/content_digest b/N3/content_digest index ba32870..da3554c 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,19 +1,8 @@ "ref\020171204203538.8370-1-cdall@kernel.org\0" - "From\0Christoffer Dall <cdall@kernel.org>\0" + "From\0cdall@kernel.org (Christoffer Dall)\0" "Subject\0[PATCH v3 14/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl\0" - "Date\0Mon, 04 Dec 2017 20:35:36 +0000\0" - "To\0kvm@vger.kernel.org\0" - "Cc\0linux-mips@linux-mips.org" - Marc Zyngier <marc.zyngier@arm.com> - James Hogan <jhogan@kernel.org> - Cornelia Huck <cohuck@redhat.com> - kvm-ppc@vger.kernel.org - Paul Mackerras <paulus@ozlabs.org> - Christian Borntraeger <borntraeger@de.ibm.com> - linux-arm-kernel@lists.infradead.org - Paolo Bonzini <pbonzini@redhat.com> - linux-s390@vger.kernel.org - " kvmarm@lists.cs.columbia.edu\0" + "Date\0Mon, 4 Dec 2017 21:35:36 +0100\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Christoffer Dall <christoffer.dall@linaro.org>\n" @@ -49,7 +38,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" "+\n" "+\t\tif (copy_from_user(&irq, argp, sizeof(irq)))\n" @@ -71,7 +60,7 @@ " \t\tif (copy_from_user(®, argp, sizeof(reg)))\n" "-\t\t\treturn -EFAULT;\n" "+\t\t\tbreak;\n" - " \t\tif (ioctl = KVM_SET_ONE_REG)\n" + " \t\tif (ioctl == KVM_SET_ONE_REG)\n" "-\t\t\treturn kvm_mips_set_reg(vcpu, ®);\n" "+\t\t\tr = kvm_mips_set_reg(vcpu, ®);\n" " \t\telse\n" @@ -141,7 +130,7 @@ " \n" "-\tswitch (ioctl) {\n" "-\tcase KVM_INTERRUPT: {\n" - "+\tif (ioctl = KVM_INTERRUPT) {\n" + "+\tif (ioctl == KVM_INTERRUPT) {\n" " \t\tstruct kvm_interrupt irq;\n" "-\t\tr = -EFAULT;\n" " \t\tif (copy_from_user(&irq, argp, sizeof(irq)))\n" @@ -313,7 +302,7 @@ "-\t\t\treturn -EFAULT;\n" "+\t\t\tbreak;\n" "+\n" - " \t\tif (ioctl = KVM_SET_ONE_REG)\n" + " \t\tif (ioctl == KVM_SET_ONE_REG)\n" "-\t\t\treturn kvm_arm_set_reg(vcpu, ®);\n" "+\t\t\tr = kvm_arm_set_reg(vcpu, ®);\n" " \t\telse\n" @@ -402,4 +391,4 @@ "-- \n" 2.14.2 -f53345df7dd60f9595d16b027647b32ebc417654722b67752a16fd1a822edd1e +0de1a9630a801521c6dbad8c6e464c14b7e1e5cd6c6b449d3ea7ef562133f20f
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.