diff for duplicates of <1340085385.28143.2.camel@pasglop> diff --git a/a/1.txt b/N1/1.txt index 90fca75..cada284 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -231,7 +231,7 @@ index 0ab7630..829e180 100644 + info->flags |= KVM_PPC_1T_SEGMENTS; + } + -+ if (env->mmu_model = POWERPC_MMU_2_06) { ++ if (env->mmu_model == POWERPC_MMU_2_06) { + info->slb_size = 32; + } else { + info->slb_size = 64; @@ -245,7 +245,7 @@ index 0ab7630..829e180 100644 + i++; + + /* 64K on MMU 2.06 */ -+ if (env->mmu_model = POWERPC_MMU_2_06) { ++ if (env->mmu_model == POWERPC_MMU_2_06) { + info->sps[i].page_shift = 16; + info->sps[i].slb_enc = 0x110; + info->sps[i].enc[0].page_shift = 16; @@ -267,7 +267,7 @@ index 0ab7630..829e180 100644 + + if (kvm_check_extension(env->kvm_state, KVM_CAP_PPC_GET_SMMU_INFO)) { + ret = kvm_vm_ioctl(env->kvm_state, KVM_PPC_GET_SMMU_INFO, info); -+ if (ret = 0) { ++ if (ret == 0) { + return; + } + } @@ -287,7 +287,7 @@ index 0ab7630..829e180 100644 + + do { + ret = statfs(mem_path, &fs); -+ } while (ret != 0 && errno = EINTR); ++ } while (ret != 0 && errno == EINTR); + + if (ret != 0) { + fprintf(stderr, "Couldn't statfs() memory path: %s\n", diff --git a/a/content_digest b/N1/content_digest index b64be01..e5171d3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,6 @@ - "ref\01335505900.4578.9.camel@pasglop\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0[PATCH 1/2] ppc64: Rudimentary Support for extra page sizes on server CPUs\0" - "Date\0Tue, 19 Jun 2012 05:56:25 +0000\0" + "Date\0Tue, 19 Jun 2012 15:56:25 +1000\0" "To\0qemu-devel@nongnu.org <qemu-devel@nongnu.org>\0" "Cc\0kvm@vger.kernel.org" kvm-ppc@vger.kernel.org @@ -241,7 +240,7 @@ "+ info->flags |= KVM_PPC_1T_SEGMENTS;\n" "+ }\n" "+\n" - "+ if (env->mmu_model = POWERPC_MMU_2_06) {\n" + "+ if (env->mmu_model == POWERPC_MMU_2_06) {\n" "+ info->slb_size = 32;\n" "+ } else {\n" "+ info->slb_size = 64;\n" @@ -255,7 +254,7 @@ "+ i++;\n" "+\n" "+ /* 64K on MMU 2.06 */\n" - "+ if (env->mmu_model = POWERPC_MMU_2_06) {\n" + "+ if (env->mmu_model == POWERPC_MMU_2_06) {\n" "+ info->sps[i].page_shift = 16;\n" "+ info->sps[i].slb_enc = 0x110;\n" "+ info->sps[i].enc[0].page_shift = 16;\n" @@ -277,7 +276,7 @@ "+\n" "+ if (kvm_check_extension(env->kvm_state, KVM_CAP_PPC_GET_SMMU_INFO)) {\n" "+ ret = kvm_vm_ioctl(env->kvm_state, KVM_PPC_GET_SMMU_INFO, info);\n" - "+ if (ret = 0) {\n" + "+ if (ret == 0) {\n" "+ return;\n" "+ }\n" "+ }\n" @@ -297,7 +296,7 @@ "+\n" "+ do {\n" "+ ret = statfs(mem_path, &fs);\n" - "+ } while (ret != 0 && errno = EINTR);\n" + "+ } while (ret != 0 && errno == EINTR);\n" "+\n" "+ if (ret != 0) {\n" "+ fprintf(stderr, \"Couldn't statfs() memory path: %s\\n\",\n" @@ -448,4 +447,4 @@ " if (kvmppc_fixup_cpu(env) != 0) {\n" " fprintf(stderr, \"Unable to virtualize selected CPU with KVM\\n\");" -d2af1363db887c8575f714bfaa0bf27198678f79d57825d6d88c3cdf2ed9ba4d +ad38c216b8f8c63840fb61cd5f540c095f44eff697bb0dc4dc30eed10a686f7e
diff --git a/a/1.txt b/N2/1.txt index 90fca75..cada284 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -231,7 +231,7 @@ index 0ab7630..829e180 100644 + info->flags |= KVM_PPC_1T_SEGMENTS; + } + -+ if (env->mmu_model = POWERPC_MMU_2_06) { ++ if (env->mmu_model == POWERPC_MMU_2_06) { + info->slb_size = 32; + } else { + info->slb_size = 64; @@ -245,7 +245,7 @@ index 0ab7630..829e180 100644 + i++; + + /* 64K on MMU 2.06 */ -+ if (env->mmu_model = POWERPC_MMU_2_06) { ++ if (env->mmu_model == POWERPC_MMU_2_06) { + info->sps[i].page_shift = 16; + info->sps[i].slb_enc = 0x110; + info->sps[i].enc[0].page_shift = 16; @@ -267,7 +267,7 @@ index 0ab7630..829e180 100644 + + if (kvm_check_extension(env->kvm_state, KVM_CAP_PPC_GET_SMMU_INFO)) { + ret = kvm_vm_ioctl(env->kvm_state, KVM_PPC_GET_SMMU_INFO, info); -+ if (ret = 0) { ++ if (ret == 0) { + return; + } + } @@ -287,7 +287,7 @@ index 0ab7630..829e180 100644 + + do { + ret = statfs(mem_path, &fs); -+ } while (ret != 0 && errno = EINTR); ++ } while (ret != 0 && errno == EINTR); + + if (ret != 0) { + fprintf(stderr, "Couldn't statfs() memory path: %s\n", diff --git a/a/content_digest b/N2/content_digest index b64be01..6c0bf64 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,6 @@ - "ref\01335505900.4578.9.camel@pasglop\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" - "Subject\0[PATCH 1/2] ppc64: Rudimentary Support for extra page sizes on server CPUs\0" - "Date\0Tue, 19 Jun 2012 05:56:25 +0000\0" + "Subject\0[Qemu-devel] [PATCH 1/2] ppc64: Rudimentary Support for extra page sizes on server CPUs\0" + "Date\0Tue, 19 Jun 2012 15:56:25 +1000\0" "To\0qemu-devel@nongnu.org <qemu-devel@nongnu.org>\0" "Cc\0kvm@vger.kernel.org" kvm-ppc@vger.kernel.org @@ -241,7 +240,7 @@ "+ info->flags |= KVM_PPC_1T_SEGMENTS;\n" "+ }\n" "+\n" - "+ if (env->mmu_model = POWERPC_MMU_2_06) {\n" + "+ if (env->mmu_model == POWERPC_MMU_2_06) {\n" "+ info->slb_size = 32;\n" "+ } else {\n" "+ info->slb_size = 64;\n" @@ -255,7 +254,7 @@ "+ i++;\n" "+\n" "+ /* 64K on MMU 2.06 */\n" - "+ if (env->mmu_model = POWERPC_MMU_2_06) {\n" + "+ if (env->mmu_model == POWERPC_MMU_2_06) {\n" "+ info->sps[i].page_shift = 16;\n" "+ info->sps[i].slb_enc = 0x110;\n" "+ info->sps[i].enc[0].page_shift = 16;\n" @@ -277,7 +276,7 @@ "+\n" "+ if (kvm_check_extension(env->kvm_state, KVM_CAP_PPC_GET_SMMU_INFO)) {\n" "+ ret = kvm_vm_ioctl(env->kvm_state, KVM_PPC_GET_SMMU_INFO, info);\n" - "+ if (ret = 0) {\n" + "+ if (ret == 0) {\n" "+ return;\n" "+ }\n" "+ }\n" @@ -297,7 +296,7 @@ "+\n" "+ do {\n" "+ ret = statfs(mem_path, &fs);\n" - "+ } while (ret != 0 && errno = EINTR);\n" + "+ } while (ret != 0 && errno == EINTR);\n" "+\n" "+ if (ret != 0) {\n" "+ fprintf(stderr, \"Couldn't statfs() memory path: %s\\n\",\n" @@ -448,4 +447,4 @@ " if (kvmppc_fixup_cpu(env) != 0) {\n" " fprintf(stderr, \"Unable to virtualize selected CPU with KVM\\n\");" -d2af1363db887c8575f714bfaa0bf27198678f79d57825d6d88c3cdf2ed9ba4d +78a37053e92413cc8a6e0daa2d82c300279f88338f2ea8ae0368dcbd96ad1ed2
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.