Commit 5b5660ad authored by Fam Zheng's avatar Fam Zheng Committed by Paolo Bonzini
Browse files

memory: Drop FlatRange.romd_mode 



Its value is alway set to mr->romd_mode, so the removed comparisons are
fully superseded by "a->mr == b->mr".

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <1458900629-2334-3-git-send-email-famz@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b6135978

memory.c

+0 −4
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ struct FlatRange { 
    hwaddr offset_in_region;

    AddrRange addr;

    uint8_t dirty_log_mask;

    bool romd_mode;

    bool readonly;

};
@@ -252,7 +251,6 @@ static bool flatrange_equal(FlatRange *a, FlatRange *b) 
    return a->mr == b->mr

        && addrrange_equal(a->addr, b->addr)

        && a->offset_in_region == b->offset_in_region

        && a->romd_mode == b->romd_mode

        && a->readonly == b->readonly;

}
@@ -312,7 +310,6 @@ static bool can_merge(FlatRange *r1, FlatRange *r2) 
                                r1->addr.size),

                     int128_make64(r2->offset_in_region))

        && r1->dirty_log_mask == r2->dirty_log_mask

        && r1->romd_mode == r2->romd_mode

        && r1->readonly == r2->readonly;

}
@@ -666,7 +663,6 @@ static void render_memory_region(FlatView *view, 


    fr.mr = mr;

    fr.dirty_log_mask = memory_region_get_dirty_log_mask(mr);

    fr.romd_mode = mr->romd_mode;

    fr.readonly = readonly;



    /* Render the region itself into any gaps left by the current view. */