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".

Backports commit 5b5660adf1fdb61db14ec681b10463b8cba633f1 from qemu
This commit is contained in:
Fam Zheng 2018-02-24 02:56:39 -05:00 committed by Lioncash
parent fb8135cd0d
commit 74962feee1
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -267,7 +267,6 @@ struct FlatRange {
hwaddr offset_in_region; hwaddr offset_in_region;
AddrRange addr; AddrRange addr;
uint8_t dirty_log_mask; uint8_t dirty_log_mask;
bool romd_mode;
bool readonly; bool readonly;
}; };
@ -291,7 +290,6 @@ static bool flatrange_equal(FlatRange *a, FlatRange *b)
return a->mr == b->mr return a->mr == b->mr
&& addrrange_equal(a->addr, b->addr) && addrrange_equal(a->addr, b->addr)
&& a->offset_in_region == b->offset_in_region && a->offset_in_region == b->offset_in_region
&& a->romd_mode == b->romd_mode
&& a->readonly == b->readonly; && a->readonly == b->readonly;
} }
@ -351,7 +349,6 @@ static bool can_merge(FlatRange *r1, FlatRange *r2)
r1->addr.size), r1->addr.size),
int128_make64(r2->offset_in_region)) int128_make64(r2->offset_in_region))
&& r1->dirty_log_mask == r2->dirty_log_mask && r1->dirty_log_mask == r2->dirty_log_mask
&& r1->romd_mode == r2->romd_mode
&& r1->readonly == r2->readonly; && r1->readonly == r2->readonly;
} }
@ -635,7 +632,6 @@ static void render_memory_region(FlatView *view,
fr.mr = mr; fr.mr = mr;
fr.dirty_log_mask = mr->dirty_log_mask; fr.dirty_log_mask = mr->dirty_log_mask;
fr.romd_mode = mr->romd_mode;
fr.readonly = readonly; fr.readonly = readonly;
/* Render the region itself into any gaps left by the current view. */ /* Render the region itself into any gaps left by the current view. */