Explorar o código

memory: Have memory_region_init_resizeable_ram() return a boolean

Following the example documented since commit e3fe3988d7 ("error:
Document Error API usage rules"), have memory_region_init_resizeable_ram
return a boolean indicating whether an error is set or not.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-Id: <20231120213301.24349-12-philmd@linaro.org>
Philippe Mathieu-Daudé hai 1 ano
pai
achega
f25a9fbb64
Modificáronse 2 ficheiros con 6 adicións e 2 borrados
  1. 3 1
      include/exec/memory.h
  2. 3 1
      system/memory.c

+ 3 - 1
include/exec/memory.h

@@ -1342,8 +1342,10 @@ bool memory_region_init_ram_flags_nomigrate(MemoryRegion *mr,
  *
  *
  * Note that this function does not do anything to cause the data in the
  * Note that this function does not do anything to cause the data in the
  * RAM memory region to be migrated; that is the responsibility of the caller.
  * RAM memory region to be migrated; that is the responsibility of the caller.
+ *
+ * Return: true on success, else false setting @errp with error.
  */
  */
-void memory_region_init_resizeable_ram(MemoryRegion *mr,
+bool memory_region_init_resizeable_ram(MemoryRegion *mr,
                                        Object *owner,
                                        Object *owner,
                                        const char *name,
                                        const char *name,
                                        uint64_t size,
                                        uint64_t size,

+ 3 - 1
system/memory.c

@@ -1578,7 +1578,7 @@ bool memory_region_init_ram_flags_nomigrate(MemoryRegion *mr,
     return true;
     return true;
 }
 }
 
 
-void memory_region_init_resizeable_ram(MemoryRegion *mr,
+bool memory_region_init_resizeable_ram(MemoryRegion *mr,
                                        Object *owner,
                                        Object *owner,
                                        const char *name,
                                        const char *name,
                                        uint64_t size,
                                        uint64_t size,
@@ -1599,7 +1599,9 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr,
         mr->size = int128_zero();
         mr->size = int128_zero();
         object_unparent(OBJECT(mr));
         object_unparent(OBJECT(mr));
         error_propagate(errp, err);
         error_propagate(errp, err);
+        return false;
     }
     }
+    return true;
 }
 }
 
 
 #ifdef CONFIG_POSIX
 #ifdef CONFIG_POSIX