From patchwork Tue Mar 15 11:26:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 86959 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 365CAB700F for ; Tue, 15 Mar 2011 22:45:45 +1100 (EST) Received: from localhost ([127.0.0.1]:42741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzSh4-0003sm-Jg for incoming@patchwork.ozlabs.org; Tue, 15 Mar 2011 07:45:42 -0400 Received: from [140.186.70.92] (port=34961 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzSOc-0000pa-02 for qemu-devel@nongnu.org; Tue, 15 Mar 2011 07:26:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PzSOa-00049c-Qy for qemu-devel@nongnu.org; Tue, 15 Mar 2011 07:26:37 -0400 Received: from thoth.sbs.de ([192.35.17.2]:19881) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PzSOa-000494-HN for qemu-devel@nongnu.org; Tue, 15 Mar 2011 07:26:36 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p2FBQYge017812; Tue, 15 Mar 2011 12:26:34 +0100 Received: from mchn199C.mchp.siemens.de ([146.254.215.103]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p2FBQVfv000888; Tue, 15 Mar 2011 12:26:33 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Tue, 15 Mar 2011 12:26:14 +0100 Message-Id: <4efc571e2bc438d886fb100d28525a285b157f75.1300188374.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.2 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Alexander Graf Subject: [Qemu-devel] [PATCH v2 03/20] s390: Detect invalid invocations of qemu_ram_free/remap X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This both detects invalid invocations of qemu_ram_free and qemu_ram_remap when mem_path is non-NULL and fixes a build error on s390 ("'area' may be used uninitialized in this function"). Signed-off-by: Jan Kiszka CC: Alexander Graf --- exec.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/exec.c b/exec.c index 723ace4..c5358c3 100644 --- a/exec.c +++ b/exec.c @@ -2931,6 +2931,8 @@ void qemu_ram_free(ram_addr_t addr) } else { qemu_vfree(block->host); } +#else + abort(); #endif } else { #if defined(TARGET_S390X) && defined(CONFIG_KVM) @@ -2979,6 +2981,8 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) area = mmap(vaddr, length, PROT_READ | PROT_WRITE, flags, -1, 0); } +#else + abort(); #endif } else { #if defined(TARGET_S390X) && defined(CONFIG_KVM)