memory: Simplify memory_region_init_ram_from_fd() calls

[mirror_qemu.git] / system / memory.c

diff --git a/system/memory.c b/system/memory.c
index 3997ac5928205da2dda4172705228b8d910c05c7..c1374e9968d1d490cfe3e31bc8f5d974b5d4b05f 100644 (file)
--- a/system/memory.c
+++ b/system/memory.c
@@ -3577,11 +3577,8 @@ void memory_region_init_ram(MemoryRegion *mr,
                             Error **errp)
 {
     DeviceState *owner_dev;
-    Error *err = NULL;
 
-    memory_region_init_ram_nomigrate(mr, owner, name, size, &err);
-    if (err) {
-        error_propagate(errp, err);
+    if (!memory_region_init_ram_nomigrate(mr, owner, name, size, errp)) {
         return;
     }
     /* This will assert if owner is neither NULL nor a DeviceState.