diff --git a/qemu/aarch64.h b/qemu/aarch64.h
index fc18db9a..f75ad9e0 100644
--- a/qemu/aarch64.h
+++ b/qemu/aarch64.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_aarch64
 #define object_set_link_property object_set_link_property_aarch64
 #define object_type_get_instance_size object_type_get_instance_size_aarch64
-#define object_unparent object_unparent_aarch64
 #define omap_cachemaint_write omap_cachemaint_write_aarch64
 #define omap_cp_reginfo omap_cp_reginfo_aarch64
 #define omap_threadid_write omap_threadid_write_aarch64
diff --git a/qemu/aarch64eb.h b/qemu/aarch64eb.h
index 67486929..9a2f57be 100644
--- a/qemu/aarch64eb.h
+++ b/qemu/aarch64eb.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_aarch64eb
 #define object_set_link_property object_set_link_property_aarch64eb
 #define object_type_get_instance_size object_type_get_instance_size_aarch64eb
-#define object_unparent object_unparent_aarch64eb
 #define omap_cachemaint_write omap_cachemaint_write_aarch64eb
 #define omap_cp_reginfo omap_cp_reginfo_aarch64eb
 #define omap_threadid_write omap_threadid_write_aarch64eb
diff --git a/qemu/arm.h b/qemu/arm.h
index a26642dc..02a7bf5c 100644
--- a/qemu/arm.h
+++ b/qemu/arm.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_arm
 #define object_set_link_property object_set_link_property_arm
 #define object_type_get_instance_size object_type_get_instance_size_arm
-#define object_unparent object_unparent_arm
 #define omap_cachemaint_write omap_cachemaint_write_arm
 #define omap_cp_reginfo omap_cp_reginfo_arm
 #define omap_threadid_write omap_threadid_write_arm
diff --git a/qemu/armeb.h b/qemu/armeb.h
index c5915f13..7f2473a9 100644
--- a/qemu/armeb.h
+++ b/qemu/armeb.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_armeb
 #define object_set_link_property object_set_link_property_armeb
 #define object_type_get_instance_size object_type_get_instance_size_armeb
-#define object_unparent object_unparent_armeb
 #define omap_cachemaint_write omap_cachemaint_write_armeb
 #define omap_cp_reginfo omap_cp_reginfo_armeb
 #define omap_threadid_write omap_threadid_write_armeb
diff --git a/qemu/header_gen.py b/qemu/header_gen.py
index 967aba71..89d52a6c 100644
--- a/qemu/header_gen.py
+++ b/qemu/header_gen.py
@@ -2115,7 +2115,6 @@ symbols = (
     'object_resolve_path_type',
     'object_set_link_property',
     'object_type_get_instance_size',
-    'object_unparent',
     'omap_cachemaint_write',
     'omap_cp_reginfo',
     'omap_threadid_write',
diff --git a/qemu/m68k.h b/qemu/m68k.h
index b7453228..b6651d30 100644
--- a/qemu/m68k.h
+++ b/qemu/m68k.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_m68k
 #define object_set_link_property object_set_link_property_m68k
 #define object_type_get_instance_size object_type_get_instance_size_m68k
-#define object_unparent object_unparent_m68k
 #define omap_cachemaint_write omap_cachemaint_write_m68k
 #define omap_cp_reginfo omap_cp_reginfo_m68k
 #define omap_threadid_write omap_threadid_write_m68k
diff --git a/qemu/memory.c b/qemu/memory.c
index fc54a32c..73a97534 100644
--- a/qemu/memory.c
+++ b/qemu/memory.c
@@ -1382,6 +1382,7 @@ void memory_region_init_ram_nomigrate(struct uc_struct *uc,
                                       uint32_t perms,
                                       Error **errp)
 {
+    Error *err = NULL;
     memory_region_init(uc, mr, owner, name, size);
     mr->ram = true;
     if (!(perms & UC_PROT_WRITE)) {
@@ -1390,8 +1391,13 @@ void memory_region_init_ram_nomigrate(struct uc_struct *uc,
     mr->perms = perms;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
-    mr->ram_block = qemu_ram_alloc(size, mr, errp);
+    mr->ram_block = qemu_ram_alloc(size, mr, &err);
     mr->dirty_log_mask = tcg_enabled(uc) ? (1 << DIRTY_MEMORY_CODE) : 0;
+    if (err) {
+        mr->size = int128_zero();
+        object_unparent(uc, OBJECT(mr));
+        error_propagate(errp, err);
+    }
 }
 
 void memory_region_init_ram_ptr(struct uc_struct *uc, MemoryRegion *mr,
@@ -1422,13 +1428,19 @@ void memory_region_init_resizeable_ram(struct uc_struct *uc,
                                                        void *host),
                                        Error **errp)
 {
+    Error *err = NULL;
     memory_region_init(uc, mr, owner, name, size);
     mr->ram = true;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
     mr->ram_block = qemu_ram_alloc_resizeable(size, max_size, resized,
-                                              mr, errp);
+                                              mr, &err);
     mr->dirty_log_mask = tcg_enabled(uc) ? (1 << DIRTY_MEMORY_CODE) : 0;
+    if (err) {
+        mr->size = int128_zero();
+        object_unparent(uc, OBJECT(mr));
+        error_propagate(errp, err);
+    }
 }
 
 void memory_region_init_rom_nomigrate(struct uc_struct *uc,
@@ -1438,13 +1450,19 @@ void memory_region_init_rom_nomigrate(struct uc_struct *uc,
                                       uint64_t size,
                                       Error **errp)
 {
+    Error *err = NULL;
     memory_region_init(uc, mr, owner, name, size);
     mr->ram = true;
     mr->readonly = true;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_ram;
-    mr->ram_block = qemu_ram_alloc(size, mr, errp);
+    mr->ram_block = qemu_ram_alloc(size, mr, &err);
     mr->dirty_log_mask = tcg_enabled(uc) ? (1 << DIRTY_MEMORY_CODE) : 0;
+    if (err) {
+        mr->size = int128_zero();
+        object_unparent(uc, OBJECT(mr));
+        error_propagate(errp, err);
+    }
 }
 
 void memory_region_init_ram_device_ptr(struct uc_struct *uc,
diff --git a/qemu/mips.h b/qemu/mips.h
index ef585968..e29e8501 100644
--- a/qemu/mips.h
+++ b/qemu/mips.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_mips
 #define object_set_link_property object_set_link_property_mips
 #define object_type_get_instance_size object_type_get_instance_size_mips
-#define object_unparent object_unparent_mips
 #define omap_cachemaint_write omap_cachemaint_write_mips
 #define omap_cp_reginfo omap_cp_reginfo_mips
 #define omap_threadid_write omap_threadid_write_mips
diff --git a/qemu/mips64.h b/qemu/mips64.h
index db01ae46..1d6e4589 100644
--- a/qemu/mips64.h
+++ b/qemu/mips64.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_mips64
 #define object_set_link_property object_set_link_property_mips64
 #define object_type_get_instance_size object_type_get_instance_size_mips64
-#define object_unparent object_unparent_mips64
 #define omap_cachemaint_write omap_cachemaint_write_mips64
 #define omap_cp_reginfo omap_cp_reginfo_mips64
 #define omap_threadid_write omap_threadid_write_mips64
diff --git a/qemu/mips64el.h b/qemu/mips64el.h
index 9fc86442..42a3b825 100644
--- a/qemu/mips64el.h
+++ b/qemu/mips64el.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_mips64el
 #define object_set_link_property object_set_link_property_mips64el
 #define object_type_get_instance_size object_type_get_instance_size_mips64el
-#define object_unparent object_unparent_mips64el
 #define omap_cachemaint_write omap_cachemaint_write_mips64el
 #define omap_cp_reginfo omap_cp_reginfo_mips64el
 #define omap_threadid_write omap_threadid_write_mips64el
diff --git a/qemu/mipsel.h b/qemu/mipsel.h
index be407bcd..1481951b 100644
--- a/qemu/mipsel.h
+++ b/qemu/mipsel.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_mipsel
 #define object_set_link_property object_set_link_property_mipsel
 #define object_type_get_instance_size object_type_get_instance_size_mipsel
-#define object_unparent object_unparent_mipsel
 #define omap_cachemaint_write omap_cachemaint_write_mipsel
 #define omap_cp_reginfo omap_cp_reginfo_mipsel
 #define omap_threadid_write omap_threadid_write_mipsel
diff --git a/qemu/powerpc.h b/qemu/powerpc.h
index 7099ea6d..07d5f3c8 100644
--- a/qemu/powerpc.h
+++ b/qemu/powerpc.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_powerpc
 #define object_set_link_property object_set_link_property_powerpc
 #define object_type_get_instance_size object_type_get_instance_size_powerpc
-#define object_unparent object_unparent_powerpc
 #define omap_cachemaint_write omap_cachemaint_write_powerpc
 #define omap_cp_reginfo omap_cp_reginfo_powerpc
 #define omap_threadid_write omap_threadid_write_powerpc
diff --git a/qemu/sparc.h b/qemu/sparc.h
index 3ab9c7cb..5699103c 100644
--- a/qemu/sparc.h
+++ b/qemu/sparc.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_sparc
 #define object_set_link_property object_set_link_property_sparc
 #define object_type_get_instance_size object_type_get_instance_size_sparc
-#define object_unparent object_unparent_sparc
 #define omap_cachemaint_write omap_cachemaint_write_sparc
 #define omap_cp_reginfo omap_cp_reginfo_sparc
 #define omap_threadid_write omap_threadid_write_sparc
diff --git a/qemu/sparc64.h b/qemu/sparc64.h
index 7bb371b3..9f3bec1e 100644
--- a/qemu/sparc64.h
+++ b/qemu/sparc64.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_sparc64
 #define object_set_link_property object_set_link_property_sparc64
 #define object_type_get_instance_size object_type_get_instance_size_sparc64
-#define object_unparent object_unparent_sparc64
 #define omap_cachemaint_write omap_cachemaint_write_sparc64
 #define omap_cp_reginfo omap_cp_reginfo_sparc64
 #define omap_threadid_write omap_threadid_write_sparc64
diff --git a/qemu/x86_64.h b/qemu/x86_64.h
index 5d944d84..7063a576 100644
--- a/qemu/x86_64.h
+++ b/qemu/x86_64.h
@@ -2109,7 +2109,6 @@
 #define object_resolve_path_type object_resolve_path_type_x86_64
 #define object_set_link_property object_set_link_property_x86_64
 #define object_type_get_instance_size object_type_get_instance_size_x86_64
-#define object_unparent object_unparent_x86_64
 #define omap_cachemaint_write omap_cachemaint_write_x86_64
 #define omap_cp_reginfo omap_cp_reginfo_x86_64
 #define omap_threadid_write omap_threadid_write_x86_64