diff for duplicates of <5252C3F5.4010908@fr.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 6f530c7..3ed5bd9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -65,8 +65,8 @@ On 10/04/2013 02:50 PM, Alexander Graf wrote: >> >> /* 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); @@ -86,8 +86,8 @@ It calls kvmppc_get_last_inst() and then again kvmppc_ld(). Is that actually use >> >> /* 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); @@ -101,7 +101,7 @@ It calls kvmppc_get_last_inst() and then again kvmppc_ld(). Is that actually use >> +++ 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 b3f184c..20c14d3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0FC50A719-232F-4A62-81B6-70FF1F7D088E@suse.de\0" "From\0Cedric Le Goater <clg@fr.ibm.com>\0" "Subject\0Re: [RFC PATCH] KVM: PPC: Book3S: MMIO emulation support for little endian guests\0" - "Date\0Mon, 07 Oct 2013 14:23:49 +0000\0" + "Date\0Mon, 07 Oct 2013 16:23:49 +0200\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0paulus@samba.org" kvm-ppc@vger.kernel.org @@ -76,8 +76,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" @@ -97,8 +97,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" @@ -112,7 +112,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" @@ -221,4 +221,4 @@ "\n" C. -bb05d6edd45c58978b426929cf7a7d9108a1bbbd4ad7307678e37149964bd4a8 +228793c6086874ffc1d8ae60f13d07a353078c8c769142bf8df55edd8d49874f
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.