diff for duplicates of <5252C48B.7040906@fr.ibm.com> diff --git a/a/1.txt b/N1/1.txt index e1de49b..5dfa808 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -70,8 +70,8 @@ more complexity. >> >> /* 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); @@ -83,8 +83,8 @@ more complexity. >> >> /* 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); @@ -98,7 +98,7 @@ more complexity. >> +++ 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 c570f6f..e52cb00 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\087ob75kuyr.fsf@linux.vnet.ibm.com\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:26:19 +0000\0" + "Date\0Mon, 07 Oct 2013 16:26:19 +0200\0" "To\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Cc\0agraf@suse.de" paulus@samba.org @@ -82,8 +82,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" @@ -95,8 +95,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" @@ -110,7 +110,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" @@ -174,4 +174,4 @@ "\n" C. -def82014054d46cb2336c087c238839e4c8ab78af43792d59dee6054c98dd898 +8bd506bf7ca878bd4761e4f28ef9f064c3d2a8758d08cee9eb63f72edab339c6
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.