diff for duplicates of <53D63E39.9000903@suse.de> diff --git a/a/1.txt b/N1/1.txt index 8918152..8b47591 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -100,7 +100,7 @@ On 19.07.14 12:14, Paul Mackerras wrote: > +++ b/arch/powerpc/kvm/book3s_paired_singles.c > @@ -200,7 +200,7 @@ static int kvmppc_emulate_fpr_load(struct kvm_run *run, struct kvm_vcpu *vcpu, > goto done_load; -> } else if (r = EMULATE_DO_MMIO) { +> } else if (r == EMULATE_DO_MMIO) { > emulated = kvmppc_handle_load(run, vcpu, KVM_MMIO_REG_FPR | rs, > - len, 1); > + len, 1, 0); @@ -109,13 +109,13 @@ On 19.07.14 12:14, Paul Mackerras wrote: > > @@ -291,12 +291,12 @@ static int kvmppc_emulate_psq_load(struct kvm_run *run, struct kvm_vcpu *vcpu, > goto done_load; -> } else if ((r = EMULATE_DO_MMIO) && w) { +> } else if ((r == EMULATE_DO_MMIO) && w) { > emulated = kvmppc_handle_load(run, vcpu, KVM_MMIO_REG_FPR | rs, > - 4, 1); > + 4, 1, 0); > vcpu->arch.qpr[rs] = tmp[1]; > goto done_load; -> } else if (r = EMULATE_DO_MMIO) { +> } else if (r == EMULATE_DO_MMIO) { > emulated = kvmppc_handle_load(run, vcpu, KVM_MMIO_REG_FQPR | rs, > - 8, 1); > + 8, 1, 0); diff --git a/a/content_digest b/N1/content_digest index f3ab31e..5f94506 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01405764872-8744-5-git-send-email-paulus@samba.org\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [RFC PATCH 4/5] KVM: PPC: Use analyse_instr() in kvmppc_emulate_instruction()\0" - "Date\0Mon, 28 Jul 2014 12:12:41 +0000\0" + "Date\0Mon, 28 Jul 2014 14:12:41 +0200\0" "To\0Paul Mackerras <paulus@samba.org>" " kvm-ppc@vger.kernel.org\0" "Cc\0kvm@vger.kernel.org\0" @@ -110,7 +110,7 @@ "> +++ b/arch/powerpc/kvm/book3s_paired_singles.c\n" "> @@ -200,7 +200,7 @@ static int kvmppc_emulate_fpr_load(struct kvm_run *run, struct kvm_vcpu *vcpu,\n" "> \t\tgoto done_load;\n" - "> \t} else if (r = EMULATE_DO_MMIO) {\n" + "> \t} else if (r == EMULATE_DO_MMIO) {\n" "> \t\temulated = kvmppc_handle_load(run, vcpu, KVM_MMIO_REG_FPR | rs,\n" "> -\t\t\t\t\t len, 1);\n" "> +\t\t\t\t\t len, 1, 0);\n" @@ -119,13 +119,13 @@ "> \n" "> @@ -291,12 +291,12 @@ static int kvmppc_emulate_psq_load(struct kvm_run *run, struct kvm_vcpu *vcpu,\n" "> \t\tgoto done_load;\n" - "> \t} else if ((r = EMULATE_DO_MMIO) && w) {\n" + "> \t} else if ((r == EMULATE_DO_MMIO) && w) {\n" "> \t\temulated = kvmppc_handle_load(run, vcpu, KVM_MMIO_REG_FPR | rs,\n" "> -\t\t\t\t\t 4, 1);\n" "> +\t\t\t\t\t 4, 1, 0);\n" "> \t\tvcpu->arch.qpr[rs] = tmp[1];\n" "> \t\tgoto done_load;\n" - "> \t} else if (r = EMULATE_DO_MMIO) {\n" + "> \t} else if (r == EMULATE_DO_MMIO) {\n" "> \t\temulated = kvmppc_handle_load(run, vcpu, KVM_MMIO_REG_FQPR | rs,\n" "> -\t\t\t\t\t 8, 1);\n" "> +\t\t\t\t\t 8, 1, 0);\n" @@ -195,4 +195,4 @@ "> +#endif\n" > -c8e872463cbbadfb61835c744277d619b1141f8b472210294bd5ae2a617bcf78 +506c982485842950d7e5856fbe5c216c56e8cbc32e53c80cb17d4edd510602d7
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.