diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-07-14 13:56:53 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-07-24 13:57:45 +0200 |
| commit | deb809edb85334c8e90530e1071b98f4da25ebaa (patch) | |
| tree | 22dae854f70525d72bd6689e3640d8fc64a0220e | |
| parent | fb4309695905de889d318caec8eb13d3b2c118d5 (diff) | |
| download | focaccia-qemu-deb809edb85334c8e90530e1071b98f4da25ebaa.tar.gz focaccia-qemu-deb809edb85334c8e90530e1071b98f4da25ebaa.zip | |
memory: count number of active VGA logging clients
For a board that has multiple framebuffer devices, both of them might want to use DIRTY_MEMORY_VGA on the same memory region. The lack of reference counting in memory_region_set_log makes this very awkward to implement. Suggested-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | include/exec/memory.h | 1 | ||||
| -rw-r--r-- | memory.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/exec/memory.h b/include/exec/memory.h index 139471500f..94d20eae05 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -180,6 +180,7 @@ struct MemoryRegion { bool warning_printed; /* For reservations */ bool flush_coalesced_mmio; bool global_locking; + uint8_t vga_logging_count; MemoryRegion *alias; hwaddr alias_offset; int32_t priority; diff --git a/memory.c b/memory.c index 0acebb1f22..5e5f32540e 100644 --- a/memory.c +++ b/memory.c @@ -1433,8 +1433,15 @@ void memory_region_notify_iommu(MemoryRegion *mr, void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client) { uint8_t mask = 1 << client; + uint8_t old_logging; assert(client == DIRTY_MEMORY_VGA); + 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; |