diff for duplicates of <ZAgsq9h1CCzouQuV@cleo> diff --git a/a/1.txt b/N1/1.txt index 3c472ca..01a91e0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -89,7 +89,7 @@ index 30aaaa7ce537..5f2033c76b58 100644 ret = kvmppc_load_last_inst(vcpu, type, &vcpu->arch.last_inst); /* Write fetch_failed unswapped if the fetch failed */ -- if (ret = EMULATE_DONE) +- if (ret == EMULATE_DONE) - fetched_inst = kvmppc_need_byteswap(vcpu) ? - swab32(vcpu->arch.last_inst) : - vcpu->arch.last_inst; @@ -147,11 +147,11 @@ index 6d525285dbe8..2bb2d8dadb17 100644 int r; + u32 iw; - if (type = INST_SC) + if (type == INST_SC) pc -= 4; - r = kvmppc_ld(vcpu, &pc, sizeof(u32), inst, false); -- if (r = EMULATE_DONE) +- if (r == EMULATE_DONE) - return r; - else + r = kvmppc_ld(vcpu, &pc, sizeof(u32), &iw, false); diff --git a/a/content_digest b/N1/content_digest index 3ad80fe..e505079 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,12 @@ "ref\0ZAgsR04beDcARCiw@cleo\0" "From\0Paul Mackerras <paulus@ozlabs.org>\0" "Subject\0[PATCH 2/3] powerpc/kvm: Fetch prefixed instructions from the guest\0" - "Date\0Wed, 08 Mar 2023 06:35:23 +0000\0" + "Date\0Wed, 8 Mar 2023 17:35:23 +1100\0" "To\0linuxppc-dev@ozlabs.org" " kvm@vger.kernel.org\0" "Cc\0Michael Neuling <mikey@neuling.org>" - Nick Piggin <npiggin@gmail.com> - " kvm-ppc@vger.kernel.org\0" + kvm-ppc@vger.kernel.org + " Nick Piggin <npiggin@gmail.com>\0" "\00:1\0" "b\0" "In order to handle emulation of prefixed instructions in the guest,\n" @@ -100,7 +100,7 @@ " \t\tret = kvmppc_load_last_inst(vcpu, type, &vcpu->arch.last_inst);\n" " \n" " \t/* Write fetch_failed unswapped if the fetch failed */\n" - "-\tif (ret = EMULATE_DONE)\n" + "-\tif (ret == EMULATE_DONE)\n" "-\t\tfetched_inst = kvmppc_need_byteswap(vcpu) ?\n" "-\t\t\t\tswab32(vcpu->arch.last_inst) :\n" "-\t\t\t\tvcpu->arch.last_inst;\n" @@ -158,11 +158,11 @@ " \tint r;\n" "+\tu32 iw;\n" " \n" - " \tif (type = INST_SC)\n" + " \tif (type == INST_SC)\n" " \t\tpc -= 4;\n" " \n" "-\tr = kvmppc_ld(vcpu, &pc, sizeof(u32), inst, false);\n" - "-\tif (r = EMULATE_DONE)\n" + "-\tif (r == EMULATE_DONE)\n" "-\t\treturn r;\n" "-\telse\n" "+\tr = kvmppc_ld(vcpu, &pc, sizeof(u32), &iw, false);\n" @@ -344,4 +344,4 @@ "-- \n" 2.37.3 -47b5d38b9b7f51c8d13d9a2f7993a693b3a9add63e33b69a9990e5e8efa76a15 +6b257c6a060dd1360beabd659c2e3f83ddd86e1e2767bcf655f9167e70e399f4
diff --git a/a/1.txt b/N2/1.txt index 3c472ca..01a91e0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -89,7 +89,7 @@ index 30aaaa7ce537..5f2033c76b58 100644 ret = kvmppc_load_last_inst(vcpu, type, &vcpu->arch.last_inst); /* Write fetch_failed unswapped if the fetch failed */ -- if (ret = EMULATE_DONE) +- if (ret == EMULATE_DONE) - fetched_inst = kvmppc_need_byteswap(vcpu) ? - swab32(vcpu->arch.last_inst) : - vcpu->arch.last_inst; @@ -147,11 +147,11 @@ index 6d525285dbe8..2bb2d8dadb17 100644 int r; + u32 iw; - if (type = INST_SC) + if (type == INST_SC) pc -= 4; - r = kvmppc_ld(vcpu, &pc, sizeof(u32), inst, false); -- if (r = EMULATE_DONE) +- if (r == EMULATE_DONE) - return r; - else + r = kvmppc_ld(vcpu, &pc, sizeof(u32), &iw, false); diff --git a/a/content_digest b/N2/content_digest index 3ad80fe..3d8bafb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\0ZAgsR04beDcARCiw@cleo\0" "From\0Paul Mackerras <paulus@ozlabs.org>\0" "Subject\0[PATCH 2/3] powerpc/kvm: Fetch prefixed instructions from the guest\0" - "Date\0Wed, 08 Mar 2023 06:35:23 +0000\0" + "Date\0Wed, 8 Mar 2023 17:35:23 +1100\0" "To\0linuxppc-dev@ozlabs.org" " kvm@vger.kernel.org\0" "Cc\0Michael Neuling <mikey@neuling.org>" @@ -100,7 +100,7 @@ " \t\tret = kvmppc_load_last_inst(vcpu, type, &vcpu->arch.last_inst);\n" " \n" " \t/* Write fetch_failed unswapped if the fetch failed */\n" - "-\tif (ret = EMULATE_DONE)\n" + "-\tif (ret == EMULATE_DONE)\n" "-\t\tfetched_inst = kvmppc_need_byteswap(vcpu) ?\n" "-\t\t\t\tswab32(vcpu->arch.last_inst) :\n" "-\t\t\t\tvcpu->arch.last_inst;\n" @@ -158,11 +158,11 @@ " \tint r;\n" "+\tu32 iw;\n" " \n" - " \tif (type = INST_SC)\n" + " \tif (type == INST_SC)\n" " \t\tpc -= 4;\n" " \n" "-\tr = kvmppc_ld(vcpu, &pc, sizeof(u32), inst, false);\n" - "-\tif (r = EMULATE_DONE)\n" + "-\tif (r == EMULATE_DONE)\n" "-\t\treturn r;\n" "-\telse\n" "+\tr = kvmppc_ld(vcpu, &pc, sizeof(u32), &iw, false);\n" @@ -344,4 +344,4 @@ "-- \n" 2.37.3 -47b5d38b9b7f51c8d13d9a2f7993a693b3a9add63e33b69a9990e5e8efa76a15 +29b8fb2d8e3e2d8b70cb6ee376ba0237cd612240b6c1b5ed7a01da9c688a0818
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.