Commit d26a8cae authored by Avi Kivity's avatar Avi Kivity Committed by Anthony Liguori
Browse files

memory: fix rendering of a region obscured by another 



The memory core drops regions that are hidden by another region (for example,
during BAR sizing), but it doesn't do so correctly if the lower address of the
existing range is below the lower address of the new range.

Example (qemu-system-mips -M malta -kernel vmlinux-2.6.32-5-4kc-malta
         -append "console=ttyS0"  -nographic -vga cirrus):

Existing range: 10000000-107fffff
New range:      100a0000-100bffff

Correct behaviour: drop new range
Incorrect behaviour: add new range

Fix by taking this case into account (previously we only considered
equal lower boundaries).

Tested-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 233926fa

memory.c

+6 −6
Original line number Diff line number Diff line
@@ -539,13 +539,13 @@ static void render_memory_region(FlatView *view, 
            offset_in_region += int128_get64(now);

            int128_subfrom(&remain, now);

        }

        if (int128_eq(base, view->ranges[i].addr.start)) {

            now = int128_min(remain, view->ranges[i].addr.size);

        now = int128_sub(int128_min(int128_add(base, remain),

                                    addrrange_end(view->ranges[i].addr)),

                         base);

        int128_addto(&base, now);

        offset_in_region += int128_get64(now);

        int128_subfrom(&remain, now);

    }

    }

    if (int128_nz(remain)) {

        fr.mr = mr;

        fr.offset_in_region = offset_in_region;