|
@@ -3570,7 +3570,7 @@ void mtree_info(bool flatview, bool dispatch_tree, bool owner, bool disabled)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-void memory_region_init_ram(MemoryRegion *mr,
|
|
|
|
|
|
+bool memory_region_init_ram(MemoryRegion *mr,
|
|
Object *owner,
|
|
Object *owner,
|
|
const char *name,
|
|
const char *name,
|
|
uint64_t size,
|
|
uint64_t size,
|
|
@@ -3579,7 +3579,7 @@ void memory_region_init_ram(MemoryRegion *mr,
|
|
DeviceState *owner_dev;
|
|
DeviceState *owner_dev;
|
|
|
|
|
|
if (!memory_region_init_ram_nomigrate(mr, owner, name, size, errp)) {
|
|
if (!memory_region_init_ram_nomigrate(mr, owner, name, size, errp)) {
|
|
- return;
|
|
|
|
|
|
+ return false;
|
|
}
|
|
}
|
|
/* This will assert if owner is neither NULL nor a DeviceState.
|
|
/* This will assert if owner is neither NULL nor a DeviceState.
|
|
* We only want the owner here for the purposes of defining a
|
|
* We only want the owner here for the purposes of defining a
|
|
@@ -3589,6 +3589,8 @@ void memory_region_init_ram(MemoryRegion *mr,
|
|
*/
|
|
*/
|
|
owner_dev = DEVICE(owner);
|
|
owner_dev = DEVICE(owner);
|
|
vmstate_register_ram(mr, owner_dev);
|
|
vmstate_register_ram(mr, owner_dev);
|
|
|
|
+
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
|
|
|
|
void memory_region_init_rom(MemoryRegion *mr,
|
|
void memory_region_init_rom(MemoryRegion *mr,
|