diff for duplicates of <4EDD8DED.3070908@ozlabs.org> diff --git a/a/1.txt b/N1/1.txt index 3808fed..7fb121b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -159,12 +159,13 @@ index bb5f6b0..243886e 100644 +ifeq (,$(ARCH_INCLUDE)) + UNSUPP_ERR = @echo "This architecture is not supported in kvmtool." && exit 1 +else -+ UNSUPP_ERR +endif ++ UNSUPP_ERR = ++endif + +DEPS := $(patsubst %.o,%.d,$(OBJS)) +OBJS += $(OTHEROBJS) + - DEFINES += -D_FILE_OFFSET_BITSd + DEFINES += -D_FILE_OFFSET_BITS=64 DEFINES += -D_GNU_SOURCE DEFINES += -DKVMTOOLS_VERSION='"$(KVMTOOLS_VERSION)"' +DEFINES += -DBUILD_ARCH='"$(ARCH)"' @@ -615,7 +616,7 @@ index 0ad6f3b..5aba3bb 100644 - 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"); - - coalesced_offset = ioctl(kvm->sys_fd, KVM_CHECK_EXTENSION, KVM_CAP_COALESCED_MMIO); @@ -853,7 +854,7 @@ index 0ad6f3b..5aba3bb 100644 - - c = *ip; - -- if (ip = guest_flat_to_host(vcpu->kvm, ip_to_flat(vcpu, vcpu->regs.rip))) +- if (ip == guest_flat_to_host(vcpu->kvm, ip_to_flat(vcpu, vcpu->regs.rip))) - dprintf(debug_fd, " <%02x>", c); - else - dprintf(debug_fd, " %02x", c); @@ -1125,7 +1126,7 @@ index 252bd18..7ce1640 100644 - mprotect(kvm->ram_start + KVM_32BIT_GAP_START, KVM_32BIT_GAP_SIZE, PROT_NONE); - } - } -- if (kvm->ram_start = MAP_FAILED) +- if (kvm->ram_start == MAP_FAILED) - die("out of memory"); - - madvise(kvm->ram_start, kvm->ram_size, MADV_MERGEABLE); @@ -1708,7 +1709,7 @@ index 0000000..b26b208 + 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"); + + coalesced_offset = ioctl(kvm->sys_fd, KVM_CHECK_EXTENSION, KVM_CAP_COALESCED_MMIO); @@ -1940,7 +1941,7 @@ index 0000000..b26b208 + + c = *ip; + -+ if (ip = guest_flat_to_host(vcpu->kvm, ip_to_flat(vcpu, vcpu->regs.rip))) ++ if (ip == guest_flat_to_host(vcpu->kvm, ip_to_flat(vcpu, vcpu->regs.rip))) + dprintf(debug_fd, " <%02x>", c); + else + dprintf(debug_fd, " %02x", c); @@ -2145,7 +2146,7 @@ index 0000000..ac6c91e + mprotect(kvm->ram_start + KVM_32BIT_GAP_START, KVM_32BIT_GAP_SIZE, PROT_NONE); + } + } -+ if (kvm->ram_start = MAP_FAILED) ++ if (kvm->ram_start == MAP_FAILED) + die("out of memory"); + + madvise(kvm->ram_start, kvm->ram_size, MADV_MERGEABLE); diff --git a/a/content_digest b/N1/content_digest index 65e3e51..f420c77 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0cover.1323141075.git.matt@ozlabs.org\0" "From\0Matt Evans <matt@ozlabs.org>\0" "Subject\0[PATCH 01/28] kvm tools: Split x86 arch-specific bits into x86/\0" - "Date\0Tue, 06 Dec 2011 03:37:17 +0000\0" + "Date\0Tue, 06 Dec 2011 14:37:17 +1100\0" "To\0kvm@vger.kernel.org" " kvm-ppc@vger.kernel.org\0" "\00:1\0" @@ -167,12 +167,13 @@ "+ifeq (,$(ARCH_INCLUDE))\n" "+\tUNSUPP_ERR = @echo \"This architecture is not supported in kvmtool.\" && exit 1\n" "+else\n" - "+\tUNSUPP_ERR +endif\n" + "+\tUNSUPP_ERR =\n" + "+endif\n" "+\n" "+DEPS\t:= $(patsubst %.o,%.d,$(OBJS))\n" "+OBJS\t+= $(OTHEROBJS)\n" "+\n" - " DEFINES\t+= -D_FILE_OFFSET_BITSd\n" + " DEFINES\t+= -D_FILE_OFFSET_BITS=64\n" " DEFINES\t+= -D_GNU_SOURCE\n" " DEFINES\t+= -DKVMTOOLS_VERSION='\"$(KVMTOOLS_VERSION)\"'\n" "+DEFINES\t+= -DBUILD_ARCH='\"$(ARCH)\"'\n" @@ -623,7 +624,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" "-\tcoalesced_offset = ioctl(kvm->sys_fd, KVM_CHECK_EXTENSION, KVM_CAP_COALESCED_MMIO);\n" @@ -861,7 +862,7 @@ "-\n" "-\t\tc = *ip;\n" "-\n" - "-\t\tif (ip = guest_flat_to_host(vcpu->kvm, ip_to_flat(vcpu, vcpu->regs.rip)))\n" + "-\t\tif (ip == guest_flat_to_host(vcpu->kvm, ip_to_flat(vcpu, vcpu->regs.rip)))\n" "-\t\t\tdprintf(debug_fd, \" <%02x>\", c);\n" "-\t\telse\n" "-\t\t\tdprintf(debug_fd, \" %02x\", c);\n" @@ -1133,7 +1134,7 @@ "-\t\t\tmprotect(kvm->ram_start + KVM_32BIT_GAP_START, KVM_32BIT_GAP_SIZE, PROT_NONE);\n" "-\t\t}\n" "-\t}\n" - "-\tif (kvm->ram_start = MAP_FAILED)\n" + "-\tif (kvm->ram_start == MAP_FAILED)\n" "-\t\tdie(\"out of memory\");\n" "-\n" "-\tmadvise(kvm->ram_start, kvm->ram_size, MADV_MERGEABLE);\n" @@ -1716,7 +1717,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" "+\tcoalesced_offset = ioctl(kvm->sys_fd, KVM_CHECK_EXTENSION, KVM_CAP_COALESCED_MMIO);\n" @@ -1948,7 +1949,7 @@ "+\n" "+\t\tc = *ip;\n" "+\n" - "+\t\tif (ip = guest_flat_to_host(vcpu->kvm, ip_to_flat(vcpu, vcpu->regs.rip)))\n" + "+\t\tif (ip == guest_flat_to_host(vcpu->kvm, ip_to_flat(vcpu, vcpu->regs.rip)))\n" "+\t\t\tdprintf(debug_fd, \" <%02x>\", c);\n" "+\t\telse\n" "+\t\t\tdprintf(debug_fd, \" %02x\", c);\n" @@ -2153,7 +2154,7 @@ "+\t\t\tmprotect(kvm->ram_start + KVM_32BIT_GAP_START, KVM_32BIT_GAP_SIZE, PROT_NONE);\n" "+\t\t}\n" "+\t}\n" - "+\tif (kvm->ram_start = MAP_FAILED)\n" + "+\tif (kvm->ram_start == MAP_FAILED)\n" "+\t\tdie(\"out of memory\");\n" "+\n" "+\tmadvise(kvm->ram_start, kvm->ram_size, MADV_MERGEABLE);\n" @@ -2341,4 +2342,4 @@ "rename from tools/kvm/mptable.c\n" rename to tools/kvm/x86/mptable.c -68901ee6089759bf560700daf1742bf42ddfd55d22d524c1988a373c469ba9ad +b004a57ada5c3343cf12186eac3a2455a770be5fbdad03b6f66f8eefaef17258
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.