From 134ab69ffdfb7e45a0be385595036d0427928306 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Fri, 23 Aug 2019 06:14:28 +0100 Subject: [PATCH 1/5] memory: Refactor memory_region_clear_coalescing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Peter Xu Message-id: <20190823061431.31759-2-peterx@redhat.com> Patchwork-id: 90134 O-Subject: [RHEL-AV-8.1 qemu-kvm PATCH 1/4] memory: Refactor memory_region_clear_coalescing Bugzilla: 1743142 RH-Acked-by: Paolo Bonzini RH-Acked-by: Auger Eric RH-Acked-by: Philippe Mathieu-Daudé Removing the update variable and quit earlier if the memory region has no coalesced range. This prepares for the next patch. Fixes: 3ac7d43a6fbb5d4a3 Signed-off-by: Peter Xu Message-Id: <20190820141328.10009-4-peterx@redhat.com> Signed-off-by: Paolo Bonzini (cherry picked from commit 9c1aa1c235c770d84462d482460a96e957e95b9c) Signed-off-by: Peter Xu Signed-off-by: Danilo C. L. de Paula --- memory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/memory.c b/memory.c index 5d8c9a9..9f40742 100644 --- a/memory.c +++ b/memory.c @@ -2276,7 +2276,10 @@ void memory_region_add_coalescing(MemoryRegion *mr, void memory_region_clear_coalescing(MemoryRegion *mr) { CoalescedMemoryRange *cmr; - bool updated = false; + + if (QTAILQ_EMPTY(&mr->coalesced)) { + return; + } qemu_flush_coalesced_mmio_buffer(); mr->flush_coalesced_mmio = false; @@ -2285,12 +2288,9 @@ void memory_region_clear_coalescing(MemoryRegion *mr) cmr = QTAILQ_FIRST(&mr->coalesced); QTAILQ_REMOVE(&mr->coalesced, cmr, link); g_free(cmr); - updated = true; } - if (updated) { - memory_region_update_coalesced_range(mr); - } + memory_region_update_coalesced_range(mr); } void memory_region_set_flush_coalesced(MemoryRegion *mr) -- 1.8.3.1