diff options
| author | Anthony Liguori | 2011-09-15 20:33:03 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-09-15 20:33:03 +0200 |
| commit | ef4f97cba2a354656b00eb8659bf61ab2321fa4e (patch) | |
| tree | 2d1f7cbfbfa77cb67396dc348c724c644bf5ca2c | |
| parent | Merge remote-tracking branch 'aneesh/for-upstream-4' into staging (diff) | |
| parent | Fix subtle integer overflow bug in memory API (diff) | |
| download | qemu-ef4f97cba2a354656b00eb8659bf61ab2321fa4e.tar.gz qemu-ef4f97cba2a354656b00eb8659bf61ab2321fa4e.tar.xz qemu-ef4f97cba2a354656b00eb8659bf61ab2321fa4e.zip | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/core' into staging
| -rw-r--r-- | memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -55,8 +55,8 @@ static AddrRange addrrange_shift(AddrRange range, int64_t delta) static bool addrrange_intersects(AddrRange r1, AddrRange r2) { - return (r1.start >= r2.start && r1.start < r2.start + r2.size) - || (r2.start >= r1.start && r2.start < r1.start + r1.size); + return (r1.start >= r2.start && (r1.start - r2.start) < r2.size) + || (r2.start >= r1.start && (r2.start - r1.start) < r1.size); } static AddrRange addrrange_intersection(AddrRange r1, AddrRange r2) |