From 74962feee1dd9bf745c2898dcd5ce3b912f164d8 Mon Sep 17 00:00:00 2001
From: Fam Zheng <famz@redhat.com>
Date: Sat, 24 Feb 2018 02:56:39 -0500
Subject: [PATCH] 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
---
 qemu/memory.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/qemu/memory.c b/qemu/memory.c
index 5ea52222..b34cb36b 100644
--- a/qemu/memory.c
+++ b/qemu/memory.c
@@ -267,7 +267,6 @@ struct FlatRange {
     hwaddr offset_in_region;
     AddrRange addr;
     uint8_t dirty_log_mask;
-    bool romd_mode;
     bool readonly;
 };
 
@@ -291,7 +290,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;
 }
 
@@ -351,7 +349,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;
 }
 
@@ -635,7 +632,6 @@ static void render_memory_region(FlatView *view,
 
     fr.mr = mr;
     fr.dirty_log_mask = mr->dirty_log_mask;
-    fr.romd_mode = mr->romd_mode;
     fr.readonly = readonly;
 
     /* Render the region itself into any gaps left by the current view. */