diff for duplicates of <1323158866.3882.2.camel@lappy> diff --git a/a/1.txt b/N1/1.txt index 34cba25..dad9bfb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -164,12 +164,13 @@ On Tue, 2011-12-06 at 14:37 +1100, Matt Evans wrote: > +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)"' @@ -620,7 +621,7 @@ On Tue, 2011-12-06 at 14:37 +1100, Matt Evans wrote: > - 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); @@ -858,7 +859,7 @@ On Tue, 2011-12-06 at 14:37 +1100, Matt Evans wrote: > - > - 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); @@ -1130,7 +1131,7 @@ On Tue, 2011-12-06 at 14:37 +1100, Matt Evans wrote: > - 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); @@ -1713,7 +1714,7 @@ On Tue, 2011-12-06 at 14:37 +1100, Matt Evans wrote: > + 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); @@ -1945,7 +1946,7 @@ On Tue, 2011-12-06 at 14:37 +1100, Matt Evans wrote: > + > + 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); @@ -2150,7 +2151,7 @@ On Tue, 2011-12-06 at 14:37 +1100, Matt Evans wrote: > + 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 d75602b..8649312 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\04EDD8DED.3070908@ozlabs.org\0" "From\0Sasha Levin <levinsasha928@gmail.com>\0" "Subject\0Re: [PATCH 01/28] kvm tools: Split x86 arch-specific bits into x86/\0" - "Date\0Tue, 06 Dec 2011 08:07:46 +0000\0" + "Date\0Tue, 06 Dec 2011 10:07:46 +0200\0" "To\0Matt Evans <matt@ozlabs.org>\0" "Cc\0kvm@vger.kernel.org" " kvm-ppc@vger.kernel.org\0" @@ -174,12 +174,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" @@ -630,7 +631,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" @@ -868,7 +869,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" @@ -1140,7 +1141,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" @@ -1723,7 +1724,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" @@ -1955,7 +1956,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" @@ -2160,7 +2161,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" @@ -2356,4 +2357,4 @@ "\n" Sasha. -a3bea199672cd071f4dc8cd6ad1db42e0897df743a9bed70f5d481612b4e0f74 +866d9a9714780c588558f77398f25e4fa3efd66aa9c68918b1ff3ab1d8e3593b
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.