diff for duplicates of <1367825157-27231-3-git-send-email-aik@ozlabs.ru>
diff --git a/a/content_digest b/N1/content_digest
index 6e14e02..bb0f517 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,15 +14,14 @@
"To\0linuxppc-dev\@lists.ozlabs.org\0"
]
[
- "Cc\0Alexey Kardashevskiy <aik\@ozlabs.ru>",
- " David Gibson <david\@gibson.dropbear.id.au>",
- " Benjamin Herrenschmidt <benh\@kernel.crashing.org>",
+ "Cc\0kvm\@vger.kernel.org",
+ " Alexey Kardashevskiy <aik\@ozlabs.ru>",
" Alexander Graf <agraf\@suse.de>",
+ " kvm-ppc\@vger.kernel.org",
+ " Alex Williamson <alex.williamson\@redhat.com>",
" Paul Mackerras <paulus\@samba.org>",
" Joerg Roedel <joerg.roedel\@amd.com>",
- " Alex Williamson <alex.williamson\@redhat.com>",
- " kvm\@vger.kernel.org",
- " kvm-ppc\@vger.kernel.org\0"
+ " David Gibson <david\@gibson.dropbear.id.au>\0"
]
[
"\0000:1\0"
@@ -642,4 +641,4 @@
"1.7.10.4"
]
-974c5db54c6401a2aa93ecc14ff347e81f01b3fe7f091fbdbb936e40d876d0d9
+4ccfa64b7ce6731345ed9a94c723fc3572c3fd16568753153a3f9be4cedcbfb8
diff --git a/a/1.txt b/N2/1.txt
index f9ca2f5..d323a34 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -165,7 +165,7 @@ index 72ffc89..643ac1e 100644
+ return H_TOO_HARD;
+
+ tces = get_virt_address(vcpu, tce_list);
-+ if (tces == ERROR_ADDR)
++ if (tces = ERROR_ADDR)
+ return H_TOO_HARD;
+
+ /* Emulated IO */
@@ -183,7 +183,7 @@ index 72ffc89..643ac1e 100644
+ ioba + (i << IOMMU_PAGE_SHIFT), tce))
+ break;
+ }
-+ if (i == npages)
++ if (i = npages)
+ return H_SUCCESS;
+
+ /* Failed, do cleanup */
@@ -250,7 +250,7 @@ index 30c2f3b..55fdf7a 100644
+ struct kvmppc_spapr_tce_table *tt;
+
+ list_for_each_entry(tt, &vcpu->kvm->arch.spapr_tce_tables, list) {
-+ if (tt->liobn == liobn)
++ if (tt->liobn = liobn)
+ return tt;
+ }
+
@@ -370,7 +370,7 @@ index 30c2f3b..55fdf7a 100644
- /* liobn, ioba, tce); */
-
- list_for_each_entry(stt, &kvm->arch.spapr_tce_tables, list) {
-- if (stt->liobn == liobn) {
+- if (stt->liobn = liobn) {
- unsigned long idx = ioba >> SPAPR_TCE_SHIFT;
- struct page *page;
- u64 *tbl;
@@ -417,7 +417,7 @@ index 30c2f3b..55fdf7a 100644
+ return H_TOO_HARD;
+
+ tces = get_real_address(vcpu, tce_list, false, NULL, NULL);
-+ if (tces == ERROR_ADDR)
++ if (tces = ERROR_ADDR)
+ return H_TOO_HARD;
+
+ /* Emulated IO */
@@ -435,7 +435,7 @@ index 30c2f3b..55fdf7a 100644
+ ioba + (i << IOMMU_PAGE_SHIFT), tce))
+ break;
}
-+ if (i == npages)
++ if (i = npages)
+ return H_SUCCESS;
+
+ /* Failed, do cleanup */
@@ -485,7 +485,7 @@ index e5afdcb..6eb6f44 100644
+ ret = kvmppc_virtmode_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4),
+ kvmppc_get_gpr(vcpu, 5),
+ kvmppc_get_gpr(vcpu, 6));
-+ if (ret == H_TOO_HARD)
++ if (ret = H_TOO_HARD)
+ return RESUME_HOST;
+ break;
+ case H_PUT_TCE_INDIRECT:
@@ -493,7 +493,7 @@ index e5afdcb..6eb6f44 100644
+ kvmppc_get_gpr(vcpu, 5),
+ kvmppc_get_gpr(vcpu, 6),
+ kvmppc_get_gpr(vcpu, 7));
-+ if (ret == H_TOO_HARD)
++ if (ret = H_TOO_HARD)
+ return RESUME_HOST;
+ break;
+ case H_STUFF_TCE:
@@ -501,7 +501,7 @@ index e5afdcb..6eb6f44 100644
+ kvmppc_get_gpr(vcpu, 5),
+ kvmppc_get_gpr(vcpu, 6),
+ kvmppc_get_gpr(vcpu, 7));
-+ if (ret == H_TOO_HARD)
++ if (ret = H_TOO_HARD)
+ return RESUME_HOST;
+ break;
default:
@@ -534,7 +534,7 @@ index 8352cac..603e4f2 100644
- rc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce);
+ rc = kvmppc_virtmode_h_put_tce(vcpu, liobn, ioba, tce);
-+ if (rc == H_TOO_HARD)
++ if (rc = H_TOO_HARD)
+ return EMULATE_FAIL;
+ kvmppc_set_gpr(vcpu, 3, rc);
+ return EMULATE_DONE;
@@ -550,7 +550,7 @@ index 8352cac..603e4f2 100644
+
+ rc = kvmppc_virtmode_h_put_tce_indirect(vcpu, liobn, ioba,
+ tce, npages);
-+ if (rc == H_TOO_HARD)
++ if (rc = H_TOO_HARD)
+ return EMULATE_FAIL;
+ kvmppc_set_gpr(vcpu, 3, rc);
+ return EMULATE_DONE;
@@ -565,7 +565,7 @@ index 8352cac..603e4f2 100644
+ long rc;
+
+ rc = kvmppc_virtmode_h_stuff_tce(vcpu, liobn, ioba, tce_value, npages);
- if (rc == H_TOO_HARD)
+ if (rc = H_TOO_HARD)
return EMULATE_FAIL;
kvmppc_set_gpr(vcpu, 3, rc);
@@ -249,6 +280,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)
diff --git a/a/content_digest b/N2/content_digest
index 6e14e02..2b2e12a 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 2/6] KVM: PPC: Add support for multiple-TCE hcalls\0"
]
[
- "Date\0Mon, 6 May 2013 17:25:53 +1000\0"
+ "Date\0Mon, 06 May 2013 07:25:53 +0000\0"
]
[
"To\0linuxppc-dev\@lists.ozlabs.org\0"
@@ -198,7 +198,7 @@
"+\t\treturn H_TOO_HARD;\n",
"+\n",
"+\ttces = get_virt_address(vcpu, tce_list);\n",
- "+\tif (tces == ERROR_ADDR)\n",
+ "+\tif (tces = ERROR_ADDR)\n",
"+\t\treturn H_TOO_HARD;\n",
"+\n",
"+\t/* Emulated IO */\n",
@@ -216,7 +216,7 @@
"+\t\t\t\tioba + (i << IOMMU_PAGE_SHIFT),\ttce))\n",
"+\t\t\tbreak;\n",
"+\t}\n",
- "+\tif (i == npages)\n",
+ "+\tif (i = npages)\n",
"+\t\treturn H_SUCCESS;\n",
"+\n",
"+\t/* Failed, do cleanup */\n",
@@ -283,7 +283,7 @@
"+\tstruct kvmppc_spapr_tce_table *tt;\n",
"+\n",
"+\tlist_for_each_entry(tt, &vcpu->kvm->arch.spapr_tce_tables, list) {\n",
- "+\t\tif (tt->liobn == liobn)\n",
+ "+\t\tif (tt->liobn = liobn)\n",
"+\t\t\treturn tt;\n",
"+\t}\n",
"+\n",
@@ -403,7 +403,7 @@
"-\t/* \t liobn, ioba, tce); */\n",
"-\n",
"-\tlist_for_each_entry(stt, &kvm->arch.spapr_tce_tables, list) {\n",
- "-\t\tif (stt->liobn == liobn) {\n",
+ "-\t\tif (stt->liobn = liobn) {\n",
"-\t\t\tunsigned long idx = ioba >> SPAPR_TCE_SHIFT;\n",
"-\t\t\tstruct page *page;\n",
"-\t\t\tu64 *tbl;\n",
@@ -450,7 +450,7 @@
"+\t\treturn H_TOO_HARD;\n",
"+\n",
"+\ttces = get_real_address(vcpu, tce_list, false, NULL, NULL);\n",
- "+\tif (tces == ERROR_ADDR)\n",
+ "+\tif (tces = ERROR_ADDR)\n",
"+\t\treturn H_TOO_HARD;\n",
"+\n",
"+\t/* Emulated IO */\n",
@@ -468,7 +468,7 @@
"+\t\t\t\tioba + (i << IOMMU_PAGE_SHIFT), tce))\n",
"+\t\t\tbreak;\n",
" \t}\n",
- "+\tif (i == npages)\n",
+ "+\tif (i = npages)\n",
"+\t\treturn H_SUCCESS;\n",
"+\n",
"+\t/* Failed, do cleanup */\n",
@@ -518,7 +518,7 @@
"+\t\tret = kvmppc_virtmode_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4),\n",
"+\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n",
"+\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6));\n",
- "+\t\tif (ret == H_TOO_HARD)\n",
+ "+\t\tif (ret = H_TOO_HARD)\n",
"+\t\t\treturn RESUME_HOST;\n",
"+\t\tbreak;\n",
"+\tcase H_PUT_TCE_INDIRECT:\n",
@@ -526,7 +526,7 @@
"+\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n",
"+\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n",
"+\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 7));\n",
- "+\t\tif (ret == H_TOO_HARD)\n",
+ "+\t\tif (ret = H_TOO_HARD)\n",
"+\t\t\treturn RESUME_HOST;\n",
"+\t\tbreak;\n",
"+\tcase H_STUFF_TCE:\n",
@@ -534,7 +534,7 @@
"+\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n",
"+\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n",
"+\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 7));\n",
- "+\t\tif (ret == H_TOO_HARD)\n",
+ "+\t\tif (ret = H_TOO_HARD)\n",
"+\t\t\treturn RESUME_HOST;\n",
"+\t\tbreak;\n",
" \tdefault:\n",
@@ -567,7 +567,7 @@
" \n",
"-\trc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce);\n",
"+\trc = kvmppc_virtmode_h_put_tce(vcpu, liobn, ioba, tce);\n",
- "+\tif (rc == H_TOO_HARD)\n",
+ "+\tif (rc = H_TOO_HARD)\n",
"+\t\treturn EMULATE_FAIL;\n",
"+\tkvmppc_set_gpr(vcpu, 3, rc);\n",
"+\treturn EMULATE_DONE;\n",
@@ -583,7 +583,7 @@
"+\n",
"+\trc = kvmppc_virtmode_h_put_tce_indirect(vcpu, liobn, ioba,\n",
"+\t\t\ttce, npages);\n",
- "+\tif (rc == H_TOO_HARD)\n",
+ "+\tif (rc = H_TOO_HARD)\n",
"+\t\treturn EMULATE_FAIL;\n",
"+\tkvmppc_set_gpr(vcpu, 3, rc);\n",
"+\treturn EMULATE_DONE;\n",
@@ -598,7 +598,7 @@
"+\tlong rc;\n",
"+\n",
"+\trc = kvmppc_virtmode_h_stuff_tce(vcpu, liobn, ioba, tce_value, npages);\n",
- " \tif (rc == H_TOO_HARD)\n",
+ " \tif (rc = H_TOO_HARD)\n",
" \t\treturn EMULATE_FAIL;\n",
" \tkvmppc_set_gpr(vcpu, 3, rc);\n",
"\@\@ -249,6 +280,10 \@\@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)\n",
@@ -642,4 +642,4 @@
"1.7.10.4"
]
-974c5db54c6401a2aa93ecc14ff347e81f01b3fe7f091fbdbb936e40d876d0d9
+534e82358b51bbeb4cc88c3f6371e07113288f2ef63853cb71e34160973a98ca
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.