diff --git a/qemu/aarch64.h b/qemu/aarch64.h
index 6ae76f31..c56b7aeb 100644
--- a/qemu/aarch64.h
+++ b/qemu/aarch64.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_aarch64
 #define memory_region_init_io memory_region_init_io_aarch64
 #define memory_region_init_ram memory_region_init_ram_aarch64
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_aarch64
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_aarch64
 #define memory_region_init_reservation memory_region_init_reservation_aarch64
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_aarch64
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_aarch64
 #define memory_region_is_logging memory_region_is_logging_aarch64
 #define memory_region_is_mapped memory_region_is_mapped_aarch64
-#define memory_region_is_skip_dump memory_region_is_skip_dump_aarch64
+#define memory_region_is_ram_device memory_region_is_ram_device_aarch64
 #define memory_region_is_unassigned memory_region_is_unassigned_aarch64
 #define memory_region_name memory_region_name_aarch64
 #define memory_region_need_escape memory_region_need_escape_aarch64
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_aarch64
 #define memory_region_set_readonly memory_region_set_readonly_aarch64
 #define memory_region_set_size memory_region_set_size_aarch64
-#define memory_region_set_skip_dump memory_region_set_skip_dump_aarch64
 #define memory_region_size memory_region_size_aarch64
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_aarch64
 #define memory_region_to_address_space memory_region_to_address_space_aarch64
diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h
index 86e0459d..7fbae051 100644
--- a/qemu/aarch64eb.h
+++ b/qemu/aarch64eb.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_aarch64eb
 #define memory_region_init_io memory_region_init_io_aarch64eb
 #define memory_region_init_ram memory_region_init_ram_aarch64eb
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_aarch64eb
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_aarch64eb
 #define memory_region_init_reservation memory_region_init_reservation_aarch64eb
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_aarch64eb
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_aarch64eb
 #define memory_region_is_logging memory_region_is_logging_aarch64eb
 #define memory_region_is_mapped memory_region_is_mapped_aarch64eb
-#define memory_region_is_skip_dump memory_region_is_skip_dump_aarch64eb
+#define memory_region_is_ram_device memory_region_is_ram_device_aarch64eb
 #define memory_region_is_unassigned memory_region_is_unassigned_aarch64eb
 #define memory_region_name memory_region_name_aarch64eb
 #define memory_region_need_escape memory_region_need_escape_aarch64eb
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_aarch64eb
 #define memory_region_set_readonly memory_region_set_readonly_aarch64eb
 #define memory_region_set_size memory_region_set_size_aarch64eb
-#define memory_region_set_skip_dump memory_region_set_skip_dump_aarch64eb
 #define memory_region_size memory_region_size_aarch64eb
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_aarch64eb
 #define memory_region_to_address_space memory_region_to_address_space_aarch64eb
diff --git a/qemu/arm.h b/qemu/arm.h
index afdc9258..26612074 100644
--- a/qemu/arm.h
+++ b/qemu/arm.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_arm
 #define memory_region_init_io memory_region_init_io_arm
 #define memory_region_init_ram memory_region_init_ram_arm
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_arm
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_arm
 #define memory_region_init_reservation memory_region_init_reservation_arm
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_arm
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_arm
 #define memory_region_is_logging memory_region_is_logging_arm
 #define memory_region_is_mapped memory_region_is_mapped_arm
-#define memory_region_is_skip_dump memory_region_is_skip_dump_arm
+#define memory_region_is_ram_device memory_region_is_ram_device_arm
 #define memory_region_is_unassigned memory_region_is_unassigned_arm
 #define memory_region_name memory_region_name_arm
 #define memory_region_need_escape memory_region_need_escape_arm
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_arm
 #define memory_region_set_readonly memory_region_set_readonly_arm
 #define memory_region_set_size memory_region_set_size_arm
-#define memory_region_set_skip_dump memory_region_set_skip_dump_arm
 #define memory_region_size memory_region_size_arm
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_arm
 #define memory_region_to_address_space memory_region_to_address_space_arm
diff --git a/qemu/armeb.h b/qemu/armeb.h
index 678d94de..01c17f69 100644
--- a/qemu/armeb.h
+++ b/qemu/armeb.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_armeb
 #define memory_region_init_io memory_region_init_io_armeb
 #define memory_region_init_ram memory_region_init_ram_armeb
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_armeb
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_armeb
 #define memory_region_init_reservation memory_region_init_reservation_armeb
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_armeb
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_armeb
 #define memory_region_is_logging memory_region_is_logging_armeb
 #define memory_region_is_mapped memory_region_is_mapped_armeb
-#define memory_region_is_skip_dump memory_region_is_skip_dump_armeb
+#define memory_region_is_ram_device memory_region_is_ram_device_armeb
 #define memory_region_is_unassigned memory_region_is_unassigned_armeb
 #define memory_region_name memory_region_name_armeb
 #define memory_region_need_escape memory_region_need_escape_armeb
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_armeb
 #define memory_region_set_readonly memory_region_set_readonly_armeb
 #define memory_region_set_size memory_region_set_size_armeb
-#define memory_region_set_skip_dump memory_region_set_skip_dump_armeb
 #define memory_region_size memory_region_size_armeb
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_armeb
 #define memory_region_to_address_space memory_region_to_address_space_armeb
diff --git a/qemu/header_gen.py b/qemu/header_gen.py
index 6f4416f9..61273a3a 100644
--- a/qemu/header_gen.py
+++ b/qemu/header_gen.py
@@ -2086,6 +2086,7 @@ symbols = (
     'memory_region_init_alias',
     'memory_region_init_io',
     'memory_region_init_ram',
+    'memory_region_init_ram_device_ptr',
     'memory_region_init_ram_ptr',
     'memory_region_init_reservation',
     'memory_region_init_resizeable_ram',
@@ -2093,7 +2094,7 @@ symbols = (
     'memory_region_initfn',
     'memory_region_is_logging',
     'memory_region_is_mapped',
-    'memory_region_is_skip_dump',
+    'memory_region_is_ram_device',
     'memory_region_is_unassigned',
     'memory_region_name',
     'memory_region_need_escape',
@@ -2112,7 +2113,6 @@ symbols = (
     'memory_region_set_global_locking',
     'memory_region_set_readonly',
     'memory_region_set_size',
-    'memory_region_set_skip_dump',
     'memory_region_size',
     'memory_region_test_and_clear_dirty',
     'memory_region_to_address_space',
diff --git a/qemu/include/exec/memory.h b/qemu/include/exec/memory.h
index cfbb8b21..bab1270a 100644
--- a/qemu/include/exec/memory.h
+++ b/qemu/include/exec/memory.h
@@ -178,7 +178,7 @@ struct MemoryRegion {
     void (*destructor)(MemoryRegion *mr);
     uint64_t align;
     bool terminates;
-    bool skip_dump;
+    bool ram_device;
     bool enabled;
     bool warning_printed; /* For reservations */
     MemoryRegion *alias;
@@ -372,6 +372,31 @@ void memory_region_init_ram_ptr(struct uc_struct *uc,
                                 uint64_t size,
                                 void *ptr);
 
+/**
+ * memory_region_init_ram_device_ptr:  Initialize RAM device memory region from
+ *                                     a user-provided pointer.
+ *
+ * A RAM device represents a mapping to a physical device, such as to a PCI
+ * MMIO BAR of an vfio-pci assigned device.  The memory region may be mapped
+ * into the VM address space and access to the region will modify memory
+ * directly.  However, the memory region should not be included in a memory
+ * dump (device may not be enabled/mapped at the time of the dump), and
+ * operations incompatible with manipulating MMIO should be avoided.  Replaces
+ * skip_dump flag.
+ *
+ * @mr: the #MemoryRegion to be initialized.
+ * @owner: the object that tracks the region's reference count
+ * @name: the name of the region.
+ * @size: size of the region.
+ * @ptr: memory to be mapped; must contain at least @size bytes.
+ */
+void memory_region_init_ram_device_ptr(struct uc_struct *uc,
+                                       MemoryRegion *mr,
+                                       struct Object *owner,
+                                       const char *name,
+                                       uint64_t size,
+                                       void *ptr);
+
 /**
  * memory_region_init_alias: Initialize a memory region that aliases all or a
  *                           part of another memory region.
@@ -520,22 +545,13 @@ static inline bool memory_region_is_ram(MemoryRegion *mr)
 }
 
 /**
- * memory_region_is_skip_dump: check whether a memory region should not be
- *                             dumped
+ * memory_region_is_ram_device: check whether a memory region is a ram device
  *
- * Returns %true is a memory region should not be dumped(e.g. VFIO BAR MMAP).
+ * Returns %true is a memory region is a device backed ram region
  *
  * @mr: the memory region being queried
  */
-bool memory_region_is_skip_dump(MemoryRegion *mr);
-
-/**
- * memory_region_set_skip_dump: Set skip_dump flag, dump will ignore this memory
- *                              region
- *
- * @mr: the memory region being queried
- */
-void memory_region_set_skip_dump(MemoryRegion *mr);
+bool memory_region_is_ram_device(MemoryRegion *mr);
 
 /**
  * memory_region_is_romd: check whether a memory region is in ROMD mode
diff --git a/qemu/m68k.h b/qemu/m68k.h
index a41bbf88..9def456c 100644
--- a/qemu/m68k.h
+++ b/qemu/m68k.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_m68k
 #define memory_region_init_io memory_region_init_io_m68k
 #define memory_region_init_ram memory_region_init_ram_m68k
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_m68k
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_m68k
 #define memory_region_init_reservation memory_region_init_reservation_m68k
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_m68k
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_m68k
 #define memory_region_is_logging memory_region_is_logging_m68k
 #define memory_region_is_mapped memory_region_is_mapped_m68k
-#define memory_region_is_skip_dump memory_region_is_skip_dump_m68k
+#define memory_region_is_ram_device memory_region_is_ram_device_m68k
 #define memory_region_is_unassigned memory_region_is_unassigned_m68k
 #define memory_region_name memory_region_name_m68k
 #define memory_region_need_escape memory_region_need_escape_m68k
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_m68k
 #define memory_region_set_readonly memory_region_set_readonly_m68k
 #define memory_region_set_size memory_region_set_size_m68k
-#define memory_region_set_skip_dump memory_region_set_skip_dump_m68k
 #define memory_region_size memory_region_size_m68k
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_m68k
 #define memory_region_to_address_space memory_region_to_address_space_m68k
diff --git a/qemu/memory.c b/qemu/memory.c
index 88a8b84b..69504074 100644
--- a/qemu/memory.c
+++ b/qemu/memory.c
@@ -1212,9 +1212,15 @@ void memory_region_init_rom(struct uc_struct *uc,
     mr->dirty_log_mask = tcg_enabled(uc) ? (1 << DIRTY_MEMORY_CODE) : 0;
 }
 
-void memory_region_set_skip_dump(MemoryRegion *mr)
+void memory_region_init_ram_device_ptr(struct uc_struct *uc,
+                                       MemoryRegion *mr,
+                                       Object *owner,
+                                       const char *name,
+                                       uint64_t size,
+                                       void *ptr)
 {
-    mr->skip_dump = true;
+    memory_region_init_ram_ptr(uc, mr, owner, name, size, ptr);
+    mr->ram_device = true;
 }
 
 void memory_region_init_alias(struct uc_struct *uc, MemoryRegion *mr,
@@ -1294,9 +1300,9 @@ const char *memory_region_name(const MemoryRegion *mr)
     return mr->name;
 }
 
-bool memory_region_is_skip_dump(MemoryRegion *mr)
+bool memory_region_is_ram_device(MemoryRegion *mr)
 {
-    return mr->skip_dump;
+    return mr->ram_device;
 }
 
 uint8_t memory_region_get_dirty_log_mask(MemoryRegion *mr)
diff --git a/qemu/mips.h b/qemu/mips.h
index 942f098f..d665d6d6 100644
--- a/qemu/mips.h
+++ b/qemu/mips.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_mips
 #define memory_region_init_io memory_region_init_io_mips
 #define memory_region_init_ram memory_region_init_ram_mips
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mips
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_mips
 #define memory_region_init_reservation memory_region_init_reservation_mips
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_mips
 #define memory_region_is_logging memory_region_is_logging_mips
 #define memory_region_is_mapped memory_region_is_mapped_mips
-#define memory_region_is_skip_dump memory_region_is_skip_dump_mips
+#define memory_region_is_ram_device memory_region_is_ram_device_mips
 #define memory_region_is_unassigned memory_region_is_unassigned_mips
 #define memory_region_name memory_region_name_mips
 #define memory_region_need_escape memory_region_need_escape_mips
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_mips
 #define memory_region_set_readonly memory_region_set_readonly_mips
 #define memory_region_set_size memory_region_set_size_mips
-#define memory_region_set_skip_dump memory_region_set_skip_dump_mips
 #define memory_region_size memory_region_size_mips
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_mips
 #define memory_region_to_address_space memory_region_to_address_space_mips
diff --git a/qemu/mips64.h b/qemu/mips64.h
index ac493d12..f3228165 100644
--- a/qemu/mips64.h
+++ b/qemu/mips64.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_mips64
 #define memory_region_init_io memory_region_init_io_mips64
 #define memory_region_init_ram memory_region_init_ram_mips64
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mips64
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_mips64
 #define memory_region_init_reservation memory_region_init_reservation_mips64
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips64
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_mips64
 #define memory_region_is_logging memory_region_is_logging_mips64
 #define memory_region_is_mapped memory_region_is_mapped_mips64
-#define memory_region_is_skip_dump memory_region_is_skip_dump_mips64
+#define memory_region_is_ram_device memory_region_is_ram_device_mips64
 #define memory_region_is_unassigned memory_region_is_unassigned_mips64
 #define memory_region_name memory_region_name_mips64
 #define memory_region_need_escape memory_region_need_escape_mips64
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_mips64
 #define memory_region_set_readonly memory_region_set_readonly_mips64
 #define memory_region_set_size memory_region_set_size_mips64
-#define memory_region_set_skip_dump memory_region_set_skip_dump_mips64
 #define memory_region_size memory_region_size_mips64
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_mips64
 #define memory_region_to_address_space memory_region_to_address_space_mips64
diff --git a/qemu/mips64el.h b/qemu/mips64el.h
index 46729bc5..72a465dd 100644
--- a/qemu/mips64el.h
+++ b/qemu/mips64el.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_mips64el
 #define memory_region_init_io memory_region_init_io_mips64el
 #define memory_region_init_ram memory_region_init_ram_mips64el
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mips64el
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_mips64el
 #define memory_region_init_reservation memory_region_init_reservation_mips64el
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mips64el
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_mips64el
 #define memory_region_is_logging memory_region_is_logging_mips64el
 #define memory_region_is_mapped memory_region_is_mapped_mips64el
-#define memory_region_is_skip_dump memory_region_is_skip_dump_mips64el
+#define memory_region_is_ram_device memory_region_is_ram_device_mips64el
 #define memory_region_is_unassigned memory_region_is_unassigned_mips64el
 #define memory_region_name memory_region_name_mips64el
 #define memory_region_need_escape memory_region_need_escape_mips64el
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_mips64el
 #define memory_region_set_readonly memory_region_set_readonly_mips64el
 #define memory_region_set_size memory_region_set_size_mips64el
-#define memory_region_set_skip_dump memory_region_set_skip_dump_mips64el
 #define memory_region_size memory_region_size_mips64el
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_mips64el
 #define memory_region_to_address_space memory_region_to_address_space_mips64el
diff --git a/qemu/mipsel.h b/qemu/mipsel.h
index c79299a8..b69a8ee0 100644
--- a/qemu/mipsel.h
+++ b/qemu/mipsel.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_mipsel
 #define memory_region_init_io memory_region_init_io_mipsel
 #define memory_region_init_ram memory_region_init_ram_mipsel
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_mipsel
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_mipsel
 #define memory_region_init_reservation memory_region_init_reservation_mipsel
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_mipsel
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_mipsel
 #define memory_region_is_logging memory_region_is_logging_mipsel
 #define memory_region_is_mapped memory_region_is_mapped_mipsel
-#define memory_region_is_skip_dump memory_region_is_skip_dump_mipsel
+#define memory_region_is_ram_device memory_region_is_ram_device_mipsel
 #define memory_region_is_unassigned memory_region_is_unassigned_mipsel
 #define memory_region_name memory_region_name_mipsel
 #define memory_region_need_escape memory_region_need_escape_mipsel
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_mipsel
 #define memory_region_set_readonly memory_region_set_readonly_mipsel
 #define memory_region_set_size memory_region_set_size_mipsel
-#define memory_region_set_skip_dump memory_region_set_skip_dump_mipsel
 #define memory_region_size memory_region_size_mipsel
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_mipsel
 #define memory_region_to_address_space memory_region_to_address_space_mipsel
diff --git a/qemu/powerpc.h b/qemu/powerpc.h
index 34ef120a..401107c6 100644
--- a/qemu/powerpc.h
+++ b/qemu/powerpc.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_powerpc
 #define memory_region_init_io memory_region_init_io_powerpc
 #define memory_region_init_ram memory_region_init_ram_powerpc
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_powerpc
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_powerpc
 #define memory_region_init_reservation memory_region_init_reservation_powerpc
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_powerpc
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_powerpc
 #define memory_region_is_logging memory_region_is_logging_powerpc
 #define memory_region_is_mapped memory_region_is_mapped_powerpc
-#define memory_region_is_skip_dump memory_region_is_skip_dump_powerpc
+#define memory_region_is_ram_device memory_region_is_ram_device_powerpc
 #define memory_region_is_unassigned memory_region_is_unassigned_powerpc
 #define memory_region_name memory_region_name_powerpc
 #define memory_region_need_escape memory_region_need_escape_powerpc
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_powerpc
 #define memory_region_set_readonly memory_region_set_readonly_powerpc
 #define memory_region_set_size memory_region_set_size_powerpc
-#define memory_region_set_skip_dump memory_region_set_skip_dump_powerpc
 #define memory_region_size memory_region_size_powerpc
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_powerpc
 #define memory_region_to_address_space memory_region_to_address_space_powerpc
diff --git a/qemu/sparc.h b/qemu/sparc.h
index 2c8d2fce..bb708220 100644
--- a/qemu/sparc.h
+++ b/qemu/sparc.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_sparc
 #define memory_region_init_io memory_region_init_io_sparc
 #define memory_region_init_ram memory_region_init_ram_sparc
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_sparc
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_sparc
 #define memory_region_init_reservation memory_region_init_reservation_sparc
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_sparc
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_sparc
 #define memory_region_is_logging memory_region_is_logging_sparc
 #define memory_region_is_mapped memory_region_is_mapped_sparc
-#define memory_region_is_skip_dump memory_region_is_skip_dump_sparc
+#define memory_region_is_ram_device memory_region_is_ram_device_sparc
 #define memory_region_is_unassigned memory_region_is_unassigned_sparc
 #define memory_region_name memory_region_name_sparc
 #define memory_region_need_escape memory_region_need_escape_sparc
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_sparc
 #define memory_region_set_readonly memory_region_set_readonly_sparc
 #define memory_region_set_size memory_region_set_size_sparc
-#define memory_region_set_skip_dump memory_region_set_skip_dump_sparc
 #define memory_region_size memory_region_size_sparc
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_sparc
 #define memory_region_to_address_space memory_region_to_address_space_sparc
diff --git a/qemu/sparc64.h b/qemu/sparc64.h
index 84a7bb67..2f952b70 100644
--- a/qemu/sparc64.h
+++ b/qemu/sparc64.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_sparc64
 #define memory_region_init_io memory_region_init_io_sparc64
 #define memory_region_init_ram memory_region_init_ram_sparc64
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_sparc64
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_sparc64
 #define memory_region_init_reservation memory_region_init_reservation_sparc64
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_sparc64
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_sparc64
 #define memory_region_is_logging memory_region_is_logging_sparc64
 #define memory_region_is_mapped memory_region_is_mapped_sparc64
-#define memory_region_is_skip_dump memory_region_is_skip_dump_sparc64
+#define memory_region_is_ram_device memory_region_is_ram_device_sparc64
 #define memory_region_is_unassigned memory_region_is_unassigned_sparc64
 #define memory_region_name memory_region_name_sparc64
 #define memory_region_need_escape memory_region_need_escape_sparc64
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_sparc64
 #define memory_region_set_readonly memory_region_set_readonly_sparc64
 #define memory_region_set_size memory_region_set_size_sparc64
-#define memory_region_set_skip_dump memory_region_set_skip_dump_sparc64
 #define memory_region_size memory_region_size_sparc64
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_sparc64
 #define memory_region_to_address_space memory_region_to_address_space_sparc64
diff --git a/qemu/x86_64.h b/qemu/x86_64.h
index 5712fda1..2cf5e716 100644
--- a/qemu/x86_64.h
+++ b/qemu/x86_64.h
@@ -2080,6 +2080,7 @@
 #define memory_region_init_alias memory_region_init_alias_x86_64
 #define memory_region_init_io memory_region_init_io_x86_64
 #define memory_region_init_ram memory_region_init_ram_x86_64
+#define memory_region_init_ram_device_ptr memory_region_init_ram_device_ptr_x86_64
 #define memory_region_init_ram_ptr memory_region_init_ram_ptr_x86_64
 #define memory_region_init_reservation memory_region_init_reservation_x86_64
 #define memory_region_init_resizeable_ram memory_region_init_resizeable_ram_x86_64
@@ -2087,7 +2088,7 @@
 #define memory_region_initfn memory_region_initfn_x86_64
 #define memory_region_is_logging memory_region_is_logging_x86_64
 #define memory_region_is_mapped memory_region_is_mapped_x86_64
-#define memory_region_is_skip_dump memory_region_is_skip_dump_x86_64
+#define memory_region_is_ram_device memory_region_is_ram_device_x86_64
 #define memory_region_is_unassigned memory_region_is_unassigned_x86_64
 #define memory_region_name memory_region_name_x86_64
 #define memory_region_need_escape memory_region_need_escape_x86_64
@@ -2106,7 +2107,6 @@
 #define memory_region_set_global_locking memory_region_set_global_locking_x86_64
 #define memory_region_set_readonly memory_region_set_readonly_x86_64
 #define memory_region_set_size memory_region_set_size_x86_64
-#define memory_region_set_skip_dump memory_region_set_skip_dump_x86_64
 #define memory_region_size memory_region_size_x86_64
 #define memory_region_test_and_clear_dirty memory_region_test_and_clear_dirty_x86_64
 #define memory_region_to_address_space memory_region_to_address_space_x86_64