From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adhjM-0003lY-4p for qemu-devel@nongnu.org; Wed, 09 Mar 2016 12:17:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adhjI-0002PM-Vg for qemu-devel@nongnu.org; Wed, 09 Mar 2016 12:17:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54167) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adhjI-0002PD-QV for qemu-devel@nongnu.org; Wed, 09 Mar 2016 12:17:00 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 88BF8C0006F5 for ; Wed, 9 Mar 2016 17:17:00 +0000 (UTC) From: Paolo Bonzini Date: Wed, 9 Mar 2016 18:16:58 +0100 Message-Id: <1457543818-16696-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] exec;fix early return from ram_block_add List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng 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. Fixes: 528f46af6ecd1e300db18684969104d4067b867b Cc: Fam Zheng Signed-off-by: Paolo Bonzini --- exec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/exec.c b/exec.c index d972737..11a5fa1 100644 --- a/exec.c +++ b/exec.c @@ -1588,6 +1588,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp) if (err) { error_propagate(errp, err); qemu_mutex_unlock_ramlist(); + return; } } else { new_block->host = phys_mem_alloc(new_block->max_length, @@ -1597,6 +1598,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp) "cannot set up guest memory '%s'", memory_region_name(new_block->mr)); qemu_mutex_unlock_ramlist(); + return; } memory_try_enable_merging(new_block->host, new_block->max_length); } -- 2.5.0