diff for duplicates of <20171204203538.8370-10-cdall@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 1e5a7a1..eeaffe8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -52,12 +52,12 @@ index 9bf62c336aa5..8e67428af01b 100644 /* INITs are latched while in SMM */ if ((is_smm(vcpu) || vcpu->arch.smi_pending) && - (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED || - mp_state->mp_state = KVM_MP_STATE_INIT_RECEIVED)) + (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED || + mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED)) - return -EINVAL; + goto out; - if (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED) { + if (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED) { vcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED; @@ -7472,7 +7476,11 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, } else diff --git a/a/content_digest b/N1/content_digest index 02841f9..c86671f 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 09/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_mpstate\0" - "Date\0Mon, 04 Dec 2017 20:35:31 +0000\0" + "Date\0Mon, 4 Dec 2017 21:35:31 +0100\0" "To\0kvm@vger.kernel.org\0" "Cc\0linux-mips@linux-mips.org" Marc Zyngier <marc.zyngier@arm.com> @@ -70,12 +70,12 @@ " \n" " \t/* INITs are latched while in SMM */\n" " \tif ((is_smm(vcpu) || vcpu->arch.smi_pending) &&\n" - " \t (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED ||\n" - " \t mp_state->mp_state = KVM_MP_STATE_INIT_RECEIVED))\n" + " \t (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED ||\n" + " \t mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED))\n" "-\t\treturn -EINVAL;\n" "+\t\tgoto out;\n" " \n" - " \tif (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED) {\n" + " \tif (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED) {\n" " \t\tvcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED;\n" "@@ -7472,7 +7476,11 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,\n" " \t} else\n" @@ -136,4 +136,4 @@ "-- \n" 2.14.2 -8c86629754b0de98bf88b3910a2d65853e3b1df56430fa7b1e49c726b5d1d81f +ee4d1611a270a29b863ca7de0f8a39a04d7411196c8e417b035f6598541c990c
diff --git a/a/1.txt b/N2/1.txt index 1e5a7a1..eeaffe8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -52,12 +52,12 @@ index 9bf62c336aa5..8e67428af01b 100644 /* INITs are latched while in SMM */ if ((is_smm(vcpu) || vcpu->arch.smi_pending) && - (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED || - mp_state->mp_state = KVM_MP_STATE_INIT_RECEIVED)) + (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED || + mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED)) - return -EINVAL; + goto out; - if (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED) { + if (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED) { vcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED; @@ -7472,7 +7476,11 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, } else diff --git a/a/content_digest b/N2/content_digest index 02841f9..89085cf 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 09/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_mpstate\0" - "Date\0Mon, 04 Dec 2017 20:35:31 +0000\0" + "Date\0Mon, 4 Dec 2017 21:35:31 +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" @@ -70,12 +73,12 @@ " \n" " \t/* INITs are latched while in SMM */\n" " \tif ((is_smm(vcpu) || vcpu->arch.smi_pending) &&\n" - " \t (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED ||\n" - " \t mp_state->mp_state = KVM_MP_STATE_INIT_RECEIVED))\n" + " \t (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED ||\n" + " \t mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED))\n" "-\t\treturn -EINVAL;\n" "+\t\tgoto out;\n" " \n" - " \tif (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED) {\n" + " \tif (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED) {\n" " \t\tvcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED;\n" "@@ -7472,7 +7476,11 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,\n" " \t} else\n" @@ -136,4 +139,4 @@ "-- \n" 2.14.2 -8c86629754b0de98bf88b3910a2d65853e3b1df56430fa7b1e49c726b5d1d81f +e0d021938802a03d8ea36bd95f380038e78793d2c874730c640ab080c43ee7ed
diff --git a/a/1.txt b/N3/1.txt index 1e5a7a1..eeaffe8 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -52,12 +52,12 @@ index 9bf62c336aa5..8e67428af01b 100644 /* INITs are latched while in SMM */ if ((is_smm(vcpu) || vcpu->arch.smi_pending) && - (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED || - mp_state->mp_state = KVM_MP_STATE_INIT_RECEIVED)) + (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED || + mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED)) - return -EINVAL; + goto out; - if (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED) { + if (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED) { vcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED; @@ -7472,7 +7476,11 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, } else diff --git a/a/content_digest b/N3/content_digest index 02841f9..838d39e 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 09/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_mpstate\0" - "Date\0Mon, 04 Dec 2017 20:35:31 +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:31 +0100\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Christoffer Dall <christoffer.dall@linaro.org>\n" @@ -70,12 +59,12 @@ " \n" " \t/* INITs are latched while in SMM */\n" " \tif ((is_smm(vcpu) || vcpu->arch.smi_pending) &&\n" - " \t (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED ||\n" - " \t mp_state->mp_state = KVM_MP_STATE_INIT_RECEIVED))\n" + " \t (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED ||\n" + " \t mp_state->mp_state == KVM_MP_STATE_INIT_RECEIVED))\n" "-\t\treturn -EINVAL;\n" "+\t\tgoto out;\n" " \n" - " \tif (mp_state->mp_state = KVM_MP_STATE_SIPI_RECEIVED) {\n" + " \tif (mp_state->mp_state == KVM_MP_STATE_SIPI_RECEIVED) {\n" " \t\tvcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED;\n" "@@ -7472,7 +7476,11 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,\n" " \t} else\n" @@ -136,4 +125,4 @@ "-- \n" 2.14.2 -8c86629754b0de98bf88b3910a2d65853e3b1df56430fa7b1e49c726b5d1d81f +26cc6462088f6c6474c41c64aabcf630e753ead6a50baa0151c9e9b0c6dbc690
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.