diff for duplicates of <20171204203538.8370-4-cdall@kernel.org> diff --git a/a/1.txt b/N1/1.txt index f8d0bf3..6dfcaf8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ index 6b6c53c42ac9..c06bc9552438 100644 if (!vcpu->mmio_is_write) @@ -1423,7 +1425,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) r = kvmppc_emulate_mmio_vsx_loadstore(vcpu, run); - if (r = RESUME_HOST) { + if (r == RESUME_HOST) { vcpu->mmio_needed = 1; - return r; + goto out; @@ -138,7 +138,7 @@ index a6524ff27de4..1f448b208686 100644 - return ret; + goto out; - if (run->exit_reason = KVM_EXIT_MMIO) { + if (run->exit_reason == KVM_EXIT_MMIO) { ret = kvm_handle_mmio_return(vcpu, vcpu->run); if (ret) - return ret; diff --git a/a/content_digest b/N1/content_digest index fd44b8c..1385cd5 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 03/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_run\0" - "Date\0Mon, 04 Dec 2017 20:35:25 +0000\0" + "Date\0Mon, 4 Dec 2017 21:35:25 +0100\0" "To\0kvm@vger.kernel.org\0" "Cc\0linux-mips@linux-mips.org" Marc Zyngier <marc.zyngier@arm.com> @@ -67,7 +67,7 @@ " \t\tif (!vcpu->mmio_is_write)\n" "@@ -1423,7 +1425,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)\n" " \t\t\tr = kvmppc_emulate_mmio_vsx_loadstore(vcpu, run);\n" - " \t\t\tif (r = RESUME_HOST) {\n" + " \t\t\tif (r == RESUME_HOST) {\n" " \t\t\t\tvcpu->mmio_needed = 1;\n" "-\t\t\t\treturn r;\n" "+\t\t\t\tgoto out;\n" @@ -156,7 +156,7 @@ "-\t\treturn ret;\n" "+\t\tgoto out;\n" " \n" - " \tif (run->exit_reason = KVM_EXIT_MMIO) {\n" + " \tif (run->exit_reason == KVM_EXIT_MMIO) {\n" " \t\tret = kvm_handle_mmio_return(vcpu, vcpu->run);\n" " \t\tif (ret)\n" "-\t\t\treturn ret;\n" @@ -205,4 +205,4 @@ "-- \n" 2.14.2 -812e4c017a44cb32f1ededdf831d35507db740bc149468e7215b1df59ee7e7e5 +b46ab41537a25c7c80eb29efde5c1d9ed7b8c6915d4795340fd13f4554ed1ebf
diff --git a/a/1.txt b/N2/1.txt index f8d0bf3..6dfcaf8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -49,7 +49,7 @@ index 6b6c53c42ac9..c06bc9552438 100644 if (!vcpu->mmio_is_write) @@ -1423,7 +1425,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) r = kvmppc_emulate_mmio_vsx_loadstore(vcpu, run); - if (r = RESUME_HOST) { + if (r == RESUME_HOST) { vcpu->mmio_needed = 1; - return r; + goto out; @@ -138,7 +138,7 @@ index a6524ff27de4..1f448b208686 100644 - return ret; + goto out; - if (run->exit_reason = KVM_EXIT_MMIO) { + if (run->exit_reason == KVM_EXIT_MMIO) { ret = kvm_handle_mmio_return(vcpu, vcpu->run); if (ret) - return ret; diff --git a/a/content_digest b/N2/content_digest index fd44b8c..990cd68 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 03/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_run\0" - "Date\0Mon, 04 Dec 2017 20:35:25 +0000\0" + "Date\0Mon, 4 Dec 2017 21:35:25 +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" @@ -67,7 +70,7 @@ " \t\tif (!vcpu->mmio_is_write)\n" "@@ -1423,7 +1425,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)\n" " \t\t\tr = kvmppc_emulate_mmio_vsx_loadstore(vcpu, run);\n" - " \t\t\tif (r = RESUME_HOST) {\n" + " \t\t\tif (r == RESUME_HOST) {\n" " \t\t\t\tvcpu->mmio_needed = 1;\n" "-\t\t\t\treturn r;\n" "+\t\t\t\tgoto out;\n" @@ -156,7 +159,7 @@ "-\t\treturn ret;\n" "+\t\tgoto out;\n" " \n" - " \tif (run->exit_reason = KVM_EXIT_MMIO) {\n" + " \tif (run->exit_reason == KVM_EXIT_MMIO) {\n" " \t\tret = kvm_handle_mmio_return(vcpu, vcpu->run);\n" " \t\tif (ret)\n" "-\t\t\treturn ret;\n" @@ -205,4 +208,4 @@ "-- \n" 2.14.2 -812e4c017a44cb32f1ededdf831d35507db740bc149468e7215b1df59ee7e7e5 +3b832854106325bf2d9ad862926e67ea5a7fb86e7e697c5b321ae2d26605b9d5
diff --git a/a/1.txt b/N3/1.txt index f8d0bf3..6dfcaf8 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -49,7 +49,7 @@ index 6b6c53c42ac9..c06bc9552438 100644 if (!vcpu->mmio_is_write) @@ -1423,7 +1425,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) r = kvmppc_emulate_mmio_vsx_loadstore(vcpu, run); - if (r = RESUME_HOST) { + if (r == RESUME_HOST) { vcpu->mmio_needed = 1; - return r; + goto out; @@ -138,7 +138,7 @@ index a6524ff27de4..1f448b208686 100644 - return ret; + goto out; - if (run->exit_reason = KVM_EXIT_MMIO) { + if (run->exit_reason == KVM_EXIT_MMIO) { ret = kvm_handle_mmio_return(vcpu, vcpu->run); if (ret) - return ret; diff --git a/a/content_digest b/N3/content_digest index fd44b8c..37e6338 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 03/16] KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_run\0" - "Date\0Mon, 04 Dec 2017 20:35:25 +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:25 +0100\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "From: Christoffer Dall <christoffer.dall@linaro.org>\n" @@ -67,7 +56,7 @@ " \t\tif (!vcpu->mmio_is_write)\n" "@@ -1423,7 +1425,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)\n" " \t\t\tr = kvmppc_emulate_mmio_vsx_loadstore(vcpu, run);\n" - " \t\t\tif (r = RESUME_HOST) {\n" + " \t\t\tif (r == RESUME_HOST) {\n" " \t\t\t\tvcpu->mmio_needed = 1;\n" "-\t\t\t\treturn r;\n" "+\t\t\t\tgoto out;\n" @@ -156,7 +145,7 @@ "-\t\treturn ret;\n" "+\t\tgoto out;\n" " \n" - " \tif (run->exit_reason = KVM_EXIT_MMIO) {\n" + " \tif (run->exit_reason == KVM_EXIT_MMIO) {\n" " \t\tret = kvm_handle_mmio_return(vcpu, vcpu->run);\n" " \t\tif (ret)\n" "-\t\t\treturn ret;\n" @@ -205,4 +194,4 @@ "-- \n" 2.14.2 -812e4c017a44cb32f1ededdf831d35507db740bc149468e7215b1df59ee7e7e5 +23eb16234e893fd2b8d53e5bf94cf7eb9ba6794443b920df3cc104f581d1b735
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.