diff for duplicates of <4EDD94B9.3090206@ozlabs.org> diff --git a/a/1.txt b/N1/1.txt index bfc250e..a29dea4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -67,7 +67,7 @@ index d792bee..2f0a921 100644 #include <sys/types.h> @@ -153,6 +155,10 @@ void kvm__arch_init(struct kvm *kvm, const char *kvm_dev, const char *hugetlbfs_ cap_ppc_rma = ioctl(kvm->sys_fd, KVM_CHECK_EXTENSION, KVM_CAP_PPC_RMA); - if (cap_ppc_rma = 2) + if (cap_ppc_rma == 2) die("Need contiguous RMA allocation on this hardware, which is not yet supported."); + + /* Do these before FDT setup, IRQ setup, etc. */ @@ -533,7 +533,7 @@ index 0000000..825efb9 + spapr_hcall_fn *slot; + + if (opcode <= MAX_HCALL_OPCODE) { -+ assert((opcode & 0x3) = 0); ++ assert((opcode & 0x3) == 0); + + slot = &papr_hypercall_table[opcode / 4]; + } else { @@ -543,7 +543,7 @@ index 0000000..825efb9 + slot = &kvmppc_hypercall_table[opcode - KVMPPC_HCALL_BASE]; + } + -+ assert(!(*slot) || (fn = *slot)); ++ assert(!(*slot) || (fn == *slot)); + *slot = fn; +} + @@ -551,7 +551,7 @@ index 0000000..825efb9 + target_ulong *args) +{ + if ((opcode <= MAX_HCALL_OPCODE) -+ && ((opcode & 0x3) = 0)) { ++ && ((opcode & 0x3) == 0)) { + spapr_hcall_fn fn = papr_hypercall_table[opcode / 4]; + + if (fn) { @@ -763,7 +763,7 @@ index 0000000..4e9c2e3 + * but assumes the token value is 0xa (which it is on some real + * machines) without looking it up in the device tree. This + * special case makes this work */ -+ if (token = 0xa) { ++ if (token == 0xa) { + rtas_display_character(vcpu, 0xa, nargs, args, nret, rets); + return H_SUCCESS; + } diff --git a/a/content_digest b/N1/content_digest index 0966a2c..b8bdbc5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0cover.1323143103.git.matt@ozlabs.org\0" "From\0Matt Evans <matt@ozlabs.org>\0" "Subject\0[PATCH 3/8] kvm tools: Add SPAPR PPC64 hcall & rtascall structure\0" - "Date\0Tue, 06 Dec 2011 04:06:17 +0000\0" + "Date\0Tue, 06 Dec 2011 15:06:17 +1100\0" "To\0kvm@vger.kernel.org" " kvm-ppc@vger.kernel.org\0" "\00:1\0" @@ -75,7 +75,7 @@ " #include <sys/types.h>\n" "@@ -153,6 +155,10 @@ void kvm__arch_init(struct kvm *kvm, const char *kvm_dev, const char *hugetlbfs_\n" " \tcap_ppc_rma = ioctl(kvm->sys_fd, KVM_CHECK_EXTENSION, KVM_CAP_PPC_RMA);\n" - " \tif (cap_ppc_rma = 2)\n" + " \tif (cap_ppc_rma == 2)\n" " \t\tdie(\"Need contiguous RMA allocation on this hardware, which is not yet supported.\");\n" "+\n" "+\t/* Do these before FDT setup, IRQ setup, etc. */\n" @@ -541,7 +541,7 @@ "+\tspapr_hcall_fn *slot;\n" "+\n" "+\tif (opcode <= MAX_HCALL_OPCODE) {\n" - "+\t\tassert((opcode & 0x3) = 0);\n" + "+\t\tassert((opcode & 0x3) == 0);\n" "+\n" "+\t\tslot = &papr_hypercall_table[opcode / 4];\n" "+\t} else {\n" @@ -551,7 +551,7 @@ "+\t\tslot = &kvmppc_hypercall_table[opcode - KVMPPC_HCALL_BASE];\n" "+\t}\n" "+\n" - "+\tassert(!(*slot) || (fn = *slot));\n" + "+\tassert(!(*slot) || (fn == *slot));\n" "+\t*slot = fn;\n" "+}\n" "+\n" @@ -559,7 +559,7 @@ "+\t\t\t target_ulong *args)\n" "+{\n" "+\tif ((opcode <= MAX_HCALL_OPCODE)\n" - "+\t && ((opcode & 0x3) = 0)) {\n" + "+\t && ((opcode & 0x3) == 0)) {\n" "+\t\tspapr_hcall_fn fn = papr_hypercall_table[opcode / 4];\n" "+\n" "+\t\tif (fn) {\n" @@ -771,7 +771,7 @@ "+\t * but assumes the token value is 0xa (which it is on some real\n" "+\t * machines) without looking it up in the device tree. This\n" "+\t * special case makes this work */\n" - "+\tif (token = 0xa) {\n" + "+\tif (token == 0xa) {\n" "+\t\trtas_display_character(vcpu, 0xa, nargs, args, nret, rets);\n" "+\t\treturn H_SUCCESS;\n" "+\t}\n" @@ -835,4 +835,4 @@ "+#endif\n" +} -5a4419f0d853804b763c65e172794f3b55f76c9ba4d55ed424ca39bc201f7b08 +30148c2ce5c0d2dbcbd777f4910ad1682c157533605ef2be78c3cc0df68aa94b
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.