OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Merge remote-tracking branch 'qemu-kvm-tmp/memory/core' into staging

Browse Source
This commit is contained in:
Anthony Liguori 2011-09-15 13:33:03 -05:00
commit ef4f97cba2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
memory.c
View File

@ -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)