diff for duplicates of <4EDD94A4.2080003@ozlabs.org> diff --git a/a/1.txt b/N1/1.txt index 21c8625..0eae4d8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -383,7 +383,7 @@ index 0000000..79422ff + die_perror("KVM_GET_VCPU_MMAP_SIZE ioctl"); + + vcpu->kvm_run = mmap(NULL, mmap_size, PROT_RW, MAP_SHARED, vcpu->vcpu_fd, 0); -+ if (vcpu->kvm_run = MAP_FAILED) ++ if (vcpu->kvm_run == MAP_FAILED) + die("unable to mmap vcpu fd"); + + ioctl(vcpu->vcpu_fd, KVM_ENABLE_CAP, &papr_cap); @@ -407,7 +407,7 @@ index 0000000..79422ff +{ + struct kvm_regs *r = &vcpu->regs; + -+ if (vcpu->cpu_id = 0) { ++ if (vcpu->cpu_id == 0) { + r->pc = KERNEL_START_ADDR; + r->gpr[3] = vcpu->kvm->fdt_gra; + r->gpr[5] = 0; @@ -491,7 +491,7 @@ index 0000000..79422ff + dprintf(debug_fd, " GPRs:\n "); + for (r = 0; r < 32; r++) { + dprintf(debug_fd, "%016lx ", regs.gpr[r]); -+ if ((r & 3) = 3) ++ if ((r & 3) == 3) + dprintf(debug_fd, "\n "); + } + dprintf(debug_fd, "\n"); @@ -623,7 +623,7 @@ index 0000000..036bfc0 + /* QEMU seems to work around this returning EINTR... Let's do + * that too. */ + r = statfs(htlbfs_path, &sfs); -+ } while (r && errno = EINTR); ++ } while (r && errno == EINTR); + + if (r) + die("Can't stat %s\n", htlbfs_path); @@ -634,7 +634,7 @@ index 0000000..036bfc0 + + snprintf(mpath, PATH_MAX, "%s/kvmtoolXXXXXX", htlbfs_path); + -+ if (sfs.f_bsize = 0 || (unsigned long)sfs.f_bsize > kvm->ram_size) { ++ if (sfs.f_bsize == 0 || (unsigned long)sfs.f_bsize > kvm->ram_size) { + die("Can't use hugetlbfs pagesize %ld for mem size %ld\n", + sfs.f_bsize, kvm->ram_size); + } @@ -650,7 +650,7 @@ index 0000000..036bfc0 + /* What other flags? Is it required that we prealloc? */ + kvm->ram_start = mmap(NULL, kvm->ram_size, PROT_RW, MAP_PRIVATE, fd, 0); + -+ if (kvm->ram_start = MAP_FAILED) ++ if (kvm->ram_start == MAP_FAILED) + die("Couldn't map %ld bytes for RAM (%d)\n", kvm->ram_size, errno); +} + @@ -673,7 +673,7 @@ index 0000000..036bfc0 + madvise(kvm->ram_start, kvm->ram_size, MADV_MERGEABLE); + + 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."); +} + diff --git a/a/content_digest b/N1/content_digest index 4ff72c9..aa78ffe 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 1/8] kvm tools: Add initial SPAPR PPC64 architecture support\0" - "Date\0Tue, 06 Dec 2011 04:05:56 +0000\0" + "Date\0Tue, 06 Dec 2011 15:05:56 +1100\0" "To\0kvm@vger.kernel.org" " kvm-ppc@vger.kernel.org\0" "\00:1\0" @@ -391,7 +391,7 @@ "+\t\tdie_perror(\"KVM_GET_VCPU_MMAP_SIZE ioctl\");\n" "+\n" "+\tvcpu->kvm_run = mmap(NULL, mmap_size, PROT_RW, MAP_SHARED, vcpu->vcpu_fd, 0);\n" - "+\tif (vcpu->kvm_run = MAP_FAILED)\n" + "+\tif (vcpu->kvm_run == MAP_FAILED)\n" "+\t\tdie(\"unable to mmap vcpu fd\");\n" "+\n" "+\tioctl(vcpu->vcpu_fd, KVM_ENABLE_CAP, &papr_cap);\n" @@ -415,7 +415,7 @@ "+{\n" "+\tstruct kvm_regs *r = &vcpu->regs;\n" "+\n" - "+\tif (vcpu->cpu_id = 0) {\n" + "+\tif (vcpu->cpu_id == 0) {\n" "+\t\tr->pc = KERNEL_START_ADDR;\n" "+\t\tr->gpr[3] = vcpu->kvm->fdt_gra;\n" "+\t\tr->gpr[5] = 0;\n" @@ -499,7 +499,7 @@ "+\tdprintf(debug_fd, \" GPRs:\\n \");\n" "+\tfor (r = 0; r < 32; r++) {\n" "+\t\tdprintf(debug_fd, \"%016lx \", regs.gpr[r]);\n" - "+\t\tif ((r & 3) = 3)\n" + "+\t\tif ((r & 3) == 3)\n" "+\t\t\tdprintf(debug_fd, \"\\n \");\n" "+\t}\n" "+\tdprintf(debug_fd, \"\\n\");\n" @@ -631,7 +631,7 @@ "+\t\t/* QEMU seems to work around this returning EINTR... Let's do\n" "+\t\t * that too. */\n" "+\t\tr = statfs(htlbfs_path, &sfs);\n" - "+\t} while (r && errno = EINTR);\n" + "+\t} while (r && errno == EINTR);\n" "+\n" "+\tif (r)\n" "+\t\tdie(\"Can't stat %s\\n\", htlbfs_path);\n" @@ -642,7 +642,7 @@ "+\n" "+\tsnprintf(mpath, PATH_MAX, \"%s/kvmtoolXXXXXX\", htlbfs_path);\n" "+\n" - "+\tif (sfs.f_bsize = 0 || (unsigned long)sfs.f_bsize > kvm->ram_size) {\n" + "+\tif (sfs.f_bsize == 0 || (unsigned long)sfs.f_bsize > kvm->ram_size) {\n" "+\t\tdie(\"Can't use hugetlbfs pagesize %ld for mem size %ld\\n\",\n" "+\t\t sfs.f_bsize, kvm->ram_size);\n" "+\t}\n" @@ -658,7 +658,7 @@ "+\t/* What other flags? Is it required that we prealloc? */\n" "+\tkvm->ram_start = mmap(NULL, kvm->ram_size, PROT_RW, MAP_PRIVATE, fd, 0);\n" "+\n" - "+\tif (kvm->ram_start = MAP_FAILED)\n" + "+\tif (kvm->ram_start == MAP_FAILED)\n" "+\t\tdie(\"Couldn't map %ld bytes for RAM (%d)\\n\", kvm->ram_size, errno);\n" "+}\n" "+\n" @@ -681,7 +681,7 @@ "+\tmadvise(kvm->ram_start, kvm->ram_size, MADV_MERGEABLE);\n" "+\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" "+\n" @@ -766,4 +766,4 @@ "+\tsetup_fdt(kvm);\n" +} -4bd7412d3a11dd8c51ce3b17643e308cfd018d515521ec9ebf30e7af24a465b0 +7db893b968fcb5bdc0c86c9c18eacffd6fb5a75d0b6e697ac3e8e8ea18d8bd7e
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.