Signed-off-by: Hu Tao <hu...@cn.fujitsu.com>
---
include/exec/memory.h | 18 +++++++++---------
memory.c | 14 +++++++-------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 8bebae8..9107fa5 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -356,9 +356,9 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,
#endif
/**
- * memory_region_init_ram_ptr_may_fail: Initialize RAM memory region from a
- * user-provided pointer. Accesses into
- * the region will modify memory
directly.
+ * memory_region_init_ram_ptr: Initialize RAM memory region from a
+ * user-provided pointer. Accesses into
+ * the region will modify memory directly.
*
* @mr: the #MemoryRegion to be initialized.
* @owner: the object that tracks the region's reference count
@@ -367,12 +367,12 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,
* @ptr: memory to be mapped; must contain at least @size bytes.
* @errp: pointer to Error*, to store an error if it happens.
*/
-void memory_region_init_ram_ptr_may_fail(MemoryRegion *mr,
- struct Object *owner,
- const char *name,
- uint64_t size,
- void *ptr,
- Error **errp);
+void memory_region_init_ram_ptr(MemoryRegion *mr,
+ struct Object *owner,
+ const char *name,
+ uint64_t size,
+ void *ptr,
+ Error **errp);
/**
* memory_region_init_ram_ptr_nofail: Initialize RAM memory region from a
diff --git a/memory.c b/memory.c
index af618ae..ce82f0f 100644
--- a/memory.c
+++ b/memory.c
@@ -1207,12 +1207,12 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,
}
#endif
-void memory_region_init_ram_ptr_may_fail(MemoryRegion *mr,
- Object *owner,
- const char *name,
- uint64_t size,
- void *ptr,
- Error **errp)
+void memory_region_init_ram_ptr(MemoryRegion *mr,
+ Object *owner,
+ const char *name,
+ uint64_t size,
+ void *ptr,
+ Error **errp)
{
memory_region_init(mr, owner, name, size);
mr->ram = true;
@@ -1229,7 +1229,7 @@ void memory_region_init_ram_ptr_nofail(MemoryRegion *mr,
{
Error *local_err = NULL;
- memory_region_init_ram_ptr_may_fail(mr, owner, name, size, ptr,
&local_err);
+ memory_region_init_ram_ptr(mr, owner, name, size, ptr, &local_err);
if (local_err) {
error_report("%s", error_get_pretty(local_err));
--
1.9.3
