qemu-char: cleanup qmp_chardev_add

[qemu.git] / memory_mapping.c

diff --git a/memory_mapping.c b/memory_mapping.c
index 87a6ed5c8e198c2055dcfbdb15adbd2330735e8f..36d6b26046eef223125bcd2d76e6e360c96a8eb2 100644 (file)
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -13,8 +13,8 @@
 
 #include <glib.h>
 
 
 #include <glib.h>
 

+#include "qemu-common.h"

 #include "cpu.h"
 #include "cpu.h"

-#include "exec/cpu-all.h"

 #include "sysemu/memory_mapping.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 #include "sysemu/memory_mapping.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"


@@ -203,7 +203,8 @@ static void guest_phys_blocks_region_add(MemoryListener *listener,
     GuestPhysBlock *predecessor;
 
     /* we only care about RAM */
     GuestPhysBlock *predecessor;
 
     /* we only care about RAM */

-    if (!memory_region_is_ram(section->mr)) {
+    if (!memory_region_is_ram(section->mr) ||
+        memory_region_is_skip_dump(section->mr)) {

         return;
     }
 
         return;
     }