diff for duplicates of <87ob75kuyr.fsf@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 489e467..b5a136f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,8 +66,8 @@ ie, if host os __BIG_ENDIAN__ ? > > /* Load the instruction manually if it failed to do so in the > * exit path */ -> - if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) -> + if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) { +> - if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) +> + if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) { > kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false); > + if (kvmppc_need_byteswap(vcpu)) > + vcpu->arch.last_inst = swab32(vcpu->arch.last_inst); @@ -79,8 +79,8 @@ ie, if host os __BIG_ENDIAN__ ? > > /* Load the instruction manually if it failed to do so in the > * exit path */ -> - if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) -> + if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) { +> - if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) +> + if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) { > kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false); > + if (kvmppc_need_byteswap(vcpu)) > + vcpu->arch.last_inst = swab32(vcpu->arch.last_inst); @@ -94,7 +94,7 @@ ie, if host os __BIG_ENDIAN__ ? > +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c > @@ -547,6 +547,10 @@ static int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu, > ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false); -> if (ret != EMULATE_DONE || last_inst = KVM_INST_FETCH_FAILED) +> if (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED) > return RESUME_GUEST; > + > + if (kvmppc_need_byteswap(vcpu)) diff --git a/a/content_digest b/N1/content_digest index baea5e7..53cca30 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01380798224-27024-1-git-send-email-clg@fr.ibm.com\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Subject\0Re: [RFC PATCH] KVM: PPC: Book3S: MMIO emulation support for little endian guests\0" - "Date\0Fri, 04 Oct 2013 13:48:56 +0000\0" + "Date\0Fri, 04 Oct 2013 19:18:44 +0530\0" "To\0C\303\251dric Le Goater <clg@fr.ibm.com>" agraf@suse.de " paulus@samba.org\0" @@ -78,8 +78,8 @@ "> \n" "> \t/* Load the instruction manually if it failed to do so in the\n" "> \t * exit path */\n" - "> -\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n" - "> +\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) {\n" + "> -\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n" + "> +\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) {\n" "> \t\tkvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);\n" "> +\t\tif (kvmppc_need_byteswap(vcpu))\n" "> +\t\t\tvcpu->arch.last_inst = swab32(vcpu->arch.last_inst);\n" @@ -91,8 +91,8 @@ "> \n" "> \t/* Load the instruction manually if it failed to do so in the\n" "> \t * exit path */\n" - "> -\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n" - "> +\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) {\n" + "> -\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n" + "> +\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) {\n" "> \t\tkvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);\n" "> +\t\tif (kvmppc_need_byteswap(vcpu))\n" "> +\t\t\tvcpu->arch.last_inst = swab32(vcpu->arch.last_inst);\n" @@ -106,7 +106,7 @@ "> +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c\n" "> @@ -547,6 +547,10 @@ static int kvmppc_hv_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu,\n" "> \t\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n" - "> \t\tif (ret != EMULATE_DONE || last_inst = KVM_INST_FETCH_FAILED)\n" + "> \t\tif (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED)\n" "> \t\t\treturn RESUME_GUEST;\n" "> +\n" "> +\t\tif (kvmppc_need_byteswap(vcpu))\n" @@ -166,4 +166,4 @@ "\n" -aneesh -f95a6b66606724aeb3d9357e568e69557aab5e3e40302249628b66b7cc2c215b +30b31f60d37d83224ee9ebbb7d32aee7b9dd01fb13f7a479e539a126ca17ac41
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.