From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afssL-0006Iw-2B for qemu-devel@nongnu.org; Tue, 15 Mar 2016 13:35:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afssK-0003ms-CH for qemu-devel@nongnu.org; Tue, 15 Mar 2016 13:35:20 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:34854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afssK-0003mm-5k for qemu-devel@nongnu.org; Tue, 15 Mar 2016 13:35:20 -0400 Received: by mail-wm0-x22c.google.com with SMTP id l68so159975195wml.0 for ; Tue, 15 Mar 2016 10:35:20 -0700 (PDT) Received: from 640k.lan (94-39-161-17.adsl-ull.clienti.tiscali.it. [94.39.161.17]) by smtp.gmail.com with ESMTPSA id z127sm21827680wme.5.2016.03.15.10.35.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2016 10:35:18 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 15 Mar 2016 18:35:07 +0100 Message-Id: <1458063310-128525-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1458063310-128525-1-git-send-email-pbonzini@redhat.com> References: <1458063310-128525-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 5/8] 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 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 Reviewed-by: Fam Zheng Signed-off-by: Paolo Bonzini --- exec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/exec.c b/exec.c index 274b619..f398d21 100644 --- a/exec.c +++ b/exec.c @@ -1589,6 +1589,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, @@ -1598,6 +1599,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); } -- 1.8.3.1