Merge remote-tracking branch 'remotes/rth/tags/tgt-openrisc-pull-request' into staging

[qemu.git] / memory_mapping.c

diff --git a/memory_mapping.c b/memory_mapping.c
index c8855de92b10c1db0302b3833bfd4bd80b58e9a8..775466f3a8187f3db84d4746c03d3b1de884e703 100644 (file)
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu/osdep.h"
-#include <glib.h>
+#include "qapi/error.h"
 
 #include "qemu-common.h"
 #include "cpu.h"
@@ -206,7 +206,7 @@ static void guest_phys_blocks_region_add(MemoryListener *listener,
 
     /* we only care about RAM */
     if (!memory_region_is_ram(section->mr) ||
-        memory_region_is_skip_dump(section->mr)) {
+        memory_region_is_ram_device(section->mr)) {
         return;
     }
 
@@ -256,7 +256,7 @@ static void guest_phys_blocks_region_add(MemoryListener *listener,
 
 #ifdef DEBUG_GUEST_PHYS_REGION_ADD
     fprintf(stderr, "%s: target_start=" TARGET_FMT_plx " target_end="
-            TARGET_FMT_plx ": %s (count: %u)\n", __FUNCTION__, target_start,
+            TARGET_FMT_plx ": %s (count: %u)\n", __func__, target_start,
             target_end, predecessor ? "joined" : "added", g->list->num);
 #endif
 }
@@ -337,6 +337,7 @@ void memory_mapping_filter(MemoryMappingList *list, int64_t begin,
         if (cur->phys_addr >= begin + length ||
             cur->phys_addr + cur->length <= begin) {
             QTAILQ_REMOVE(&list->head, cur, next);
+            g_free(cur);
             list->num--;
             continue;
         }