because memory_region_update_pending is bool Signed-off-by: liguang <lig.f...@cn.fujitsu.com> --- memory.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/memory.c b/memory.c index 5cb8f4a..d99eecd 100644 --- a/memory.c +++ b/memory.c @@ -1114,7 +1114,7 @@ void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client) memory_region_transaction_begin(); mr->dirty_log_mask = (mr->dirty_log_mask & ~mask) | (log * mask); - memory_region_update_pending |= mr->enabled; + memory_region_update_pending = mr->enabled; memory_region_transaction_commit(); } @@ -1168,7 +1168,7 @@ void memory_region_set_readonly(MemoryRegion *mr, bool readonly) if (mr->readonly != readonly) { memory_region_transaction_begin(); mr->readonly = readonly; - memory_region_update_pending |= mr->enabled; + memory_region_update_pending = mr->enabled; memory_region_transaction_commit(); } } @@ -1178,7 +1178,7 @@ void memory_region_rom_device_set_romd(MemoryRegion *mr, bool romd_mode) if (mr->romd_mode != romd_mode) { memory_region_transaction_begin(); mr->romd_mode = romd_mode; - memory_region_update_pending |= mr->enabled; + memory_region_update_pending = mr->enabled; memory_region_transaction_commit(); } } @@ -1321,7 +1321,7 @@ void memory_region_add_eventfd(MemoryRegion *mr, memmove(&mr->ioeventfds[i+1], &mr->ioeventfds[i], sizeof(*mr->ioeventfds) * (mr->ioeventfd_nb-1 - i)); mr->ioeventfds[i] = mrfd; - memory_region_update_pending |= mr->enabled; + memory_region_update_pending = mr->enabled; memory_region_transaction_commit(); } @@ -1354,7 +1354,7 @@ void memory_region_del_eventfd(MemoryRegion *mr, --mr->ioeventfd_nb; mr->ioeventfds = g_realloc(mr->ioeventfds, sizeof(*mr->ioeventfds)*mr->ioeventfd_nb + 1); - memory_region_update_pending |= mr->enabled; + memory_region_update_pending = mr->enabled; memory_region_transaction_commit(); } @@ -1398,7 +1398,7 @@ static void memory_region_add_subregion_common(MemoryRegion *mr, } QTAILQ_INSERT_TAIL(&mr->subregions, subregion, subregions_link); done: - memory_region_update_pending |= mr->enabled && subregion->enabled; + memory_region_update_pending = mr->enabled && subregion->enabled; memory_region_transaction_commit(); } @@ -1429,7 +1429,7 @@ void memory_region_del_subregion(MemoryRegion *mr, assert(subregion->parent == mr); subregion->parent = NULL; QTAILQ_REMOVE(&mr->subregions, subregion, subregions_link); - memory_region_update_pending |= mr->enabled && subregion->enabled; + memory_region_update_pending = mr->enabled && subregion->enabled; memory_region_transaction_commit(); } @@ -1475,7 +1475,7 @@ void memory_region_set_alias_offset(MemoryRegion *mr, hwaddr offset) memory_region_transaction_begin(); mr->alias_offset = offset; - memory_region_update_pending |= mr->enabled; + memory_region_update_pending = mr->enabled; memory_region_transaction_commit(); } @@ -1634,7 +1634,7 @@ void address_space_init(AddressSpace *as, MemoryRegion *root) QTAILQ_INSERT_TAIL(&address_spaces, as, address_spaces_link); as->name = NULL; address_space_init_dispatch(as); - memory_region_update_pending |= root->enabled; + memory_region_update_pending = root->enabled; memory_region_transaction_commit(); } -- 1.7.2.5