s390x/pci: let pci devices start in configured mode

[mirror_qemu.git] / memory_mapping.c

diff --git a/memory_mapping.c b/memory_mapping.c
index 04db3ac7faf2caaec260959e7950400a993226d0..a5d38552a6f1026cb24555a4d4ae0d46421f3165 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"
@@ -178,6 +178,7 @@ void guest_phys_blocks_free(GuestPhysBlockList *list)
 
     QTAILQ_FOREACH_SAFE(p, &list->head, next, q) {
         QTAILQ_REMOVE(&list->head, p, next);
+        memory_region_unref(p->mr);
         g_free(p);
     }
     list->num = 0;
@@ -205,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;
     }
 
@@ -241,6 +242,8 @@ static void guest_phys_blocks_region_add(MemoryListener *listener,
         block->target_start = target_start;
         block->target_end   = target_end;
         block->host_addr    = host_addr;
+        block->mr           = section->mr;
+        memory_region_ref(section->mr);
 
         QTAILQ_INSERT_TAIL(&g->list->head, block, next);
         ++g->list->num;
@@ -334,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;
         }