diff mbox

[v4,4/6] rename memory_region_init_ram_may_fail to memory_region_init_ram

Message ID b2eeb13de5cd4225c58b592522d1a6f20f69ea36.1407206291.git.hutao@cn.fujitsu.com
State New
Headers show

Commit Message

Hu Tao Aug. 5, 2014, 5:56 a.m. UTC 
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
---
 backends/hostmem-ram.c |  4 ++--
 include/exec/memory.h  | 15 +++++++--------
 memory.c               | 12 ++++++------
 3 files changed, 15 insertions(+), 16 deletions(-)
diff mbox

Patch

diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c
index d0e92ad..a67a134 100644
--- a/backends/hostmem-ram.c
+++ b/backends/hostmem-ram.c
@@ -26,8 +26,8 @@  ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
     }
 
     path = object_get_canonical_path_component(OBJECT(backend));
-    memory_region_init_ram_may_fail(&backend->mr, OBJECT(backend), path,
-                                    backend->size, errp);
+    memory_region_init_ram(&backend->mr, OBJECT(backend), path,
+                           backend->size, errp);
     g_free(path);
 }
 
diff --git a/include/exec/memory.h b/include/exec/memory.h
index c0a19e7..bc795cf 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -304,9 +304,8 @@  void memory_region_init_io(MemoryRegion *mr,
                            uint64_t size);
 
 /**
- * memory_region_init_ram_may_fail:  Initialize RAM memory region.  Accesses
- *                                   into the region will modify memory
- *                                   directly.
+ * memory_region_init_ram:  Initialize RAM memory region.  Accesses
+ *                          into the region will modify memory directly.
  *
  * @mr: the #MemoryRegion to be initialized.
  * @owner: the object that tracks the region's reference count
@@ -314,11 +313,11 @@  void memory_region_init_io(MemoryRegion *mr,
  * @size: size of the region.
  * @errp: pointer to Error*, to store an error if it happens.
  */
-void memory_region_init_ram_may_fail(MemoryRegion *mr,
-                                     struct Object *owner,
-                                     const char *name,
-                                     uint64_t size,
-                                     Error **errp);
+void memory_region_init_ram(MemoryRegion *mr,
+                            struct Object *owner,
+                            const char *name,
+                            uint64_t size,
+                            Error **errp);
 
 /**
  * memory_region_init_ram_nofail:  Initialize RAM memory region.  Accesses into
diff --git a/memory.c b/memory.c
index 7bc7d59..fb47b5d 100644
--- a/memory.c
+++ b/memory.c
@@ -1161,11 +1161,11 @@  void memory_region_init_io(MemoryRegion *mr,
     mr->ram_addr = ~(ram_addr_t)0;
 }
 
-void memory_region_init_ram_may_fail(MemoryRegion *mr,
-                                     Object *owner,
-                                     const char *name,
-                                     uint64_t size,
-                                     Error **errp)
+void memory_region_init_ram(MemoryRegion *mr,
+                            Object *owner,
+                            const char *name,
+                            uint64_t size,
+                            Error **errp)
 {
     memory_region_init(mr, owner, name, size);
     mr->ram = true;
@@ -1181,7 +1181,7 @@  void memory_region_init_ram_nofail(MemoryRegion *mr,
 {
     Error *local_err = NULL;
 
-    memory_region_init_ram_may_fail(mr, owner, name, size, &local_err);
+    memory_region_init_ram(mr, owner, name, size, &local_err);
 
     if (local_err) {
         error_report("%s", error_get_pretty(local_err));