From patchwork Tue Mar 15 11:26:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,03/20] s390: Detect invalid invocations of qemu_ram_free/remap Date: Tue, 15 Mar 2011 01:26:14 -0000 From: Jan Kiszka X-Patchwork-Id: 86959 Message-Id: <4efc571e2bc438d886fb100d28525a285b157f75.1300188374.git.jan.kiszka@siemens.com> To: Avi Kivity , Marcelo Tosatti Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Alexander Graf 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)