From 9cf056404ad83cf3762938fa0d642a9daa8f4bca Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 21 Feb 2018 21:37:52 -0500
Subject: [PATCH] exec: fix early return from ram_block_add

After reporting an error, ram_block_add was going on with the registration
of the RAMBlock. The visible effect is that it unlocked the ramlist
mutex twice.

Backports commit 39c350ee12e733070e63d64a21bd42607366ea99 from qemu
---
 qemu/exec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qemu/exec.c b/qemu/exec.c
index 5959e532..679e40fe 100644
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -1125,6 +1125,7 @@ static void ram_block_add(struct uc_struct *uc, RAMBlock *new_block, Error **err
             error_setg_errno(errp, errno,
                              "cannot set up guest memory '%s'",
                              memory_region_name(new_block->mr));
+            return;
         }
         memory_try_enable_merging(new_block->host, new_block->max_length);
     }