memory: Add back change from upstream

This commit is contained in:
Matt Borgerson 2020-02-17 23:51:00 -07:00
parent 76707bcc99
commit f1892f13fa
1 changed files with 9 additions and 0 deletions

View File

@ -2002,12 +2002,21 @@ int memory_region_iommu_num_indexes(IOMMUMemoryRegion *iommu_mr)
void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client)
{
uint8_t mask = 1 << client;
uint8_t old_logging;
if (mr->alias) {
memory_region_set_log(mr->alias, log, client);
return;
}
assert((client == DIRTY_MEMORY_VGA) \
|| (client == DIRTY_MEMORY_NV2A));
old_logging = mr->vga_logging_count;
mr->vga_logging_count += log ? 1 : -1;
if (!!old_logging == !!mr->vga_logging_count) {
return;
}
memory_region_transaction_begin();
mr->dirty_log_mask = (mr->dirty_log_mask & ~mask) | (log * mask);
memory_region_update_pending |= mr->enabled;