From patchwork Tue Feb 23 15:13:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harper X-Patchwork-Id: 46066 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 EDD78B7CFA for ; Wed, 24 Feb 2010 02:15:36 +1100 (EST) Received: from localhost ([127.0.0.1]:37393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NjwTv-0003z7-AO for incoming@patchwork.ozlabs.org; Tue, 23 Feb 2010 10:15:27 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NjwST-0003xf-P6 for qemu-devel@nongnu.org; Tue, 23 Feb 2010 10:13:57 -0500 Received: from [199.232.76.173] (port=60319 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NjwST-0003xU-8e for qemu-devel@nongnu.org; Tue, 23 Feb 2010 10:13:57 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NjwSS-0005N1-Gj for qemu-devel@nongnu.org; Tue, 23 Feb 2010 10:13:57 -0500 Received: from e35.co.us.ibm.com ([32.97.110.153]:33283) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NjwSS-0005MT-7B for qemu-devel@nongnu.org; Tue, 23 Feb 2010 10:13:56 -0500 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e35.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o1NFA4i7022015 for ; Tue, 23 Feb 2010 08:10:04 -0700 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o1NFDK9X057306 for ; Tue, 23 Feb 2010 08:13:24 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o1NFDJjW008744 for ; Tue, 23 Feb 2010 08:13:19 -0700 Received: from localhost.localdomain (frylock.austin.ibm.com [9.53.41.12]) by d03av02.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o1NFDJIj008716; Tue, 23 Feb 2010 08:13:19 -0700 Received: by localhost.localdomain (Postfix, from userid 1000) id E18171BF82; Tue, 23 Feb 2010 09:13:14 -0600 (CST) Date: Tue, 23 Feb 2010 09:13:14 -0600 From: Ryan Harper To: qemu-devel@nongnu.org Message-ID: <20100223151314.GN17350@us.ibm.com> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.6+20040907i X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH] Fix segfault with ram_size > 4095M without kvm 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 Currently, x86_64-softmmu qemu segfaults when trying to use > 4095M memsize. This patch adds a simple check and error message (much like the 2047 limit on 32-bit hosts) on ram_size in the control path after we determine we're not using kvm Upstream qemu-kvm is affected if using the -no-kvm option; this patch address the segfault there as well. Signed-off-by: Ryan Harper --- vl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vl.c b/vl.c index db7a178..a659e98 100644 --- a/vl.c +++ b/vl.c @@ -5760,6 +5760,12 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "failed to initialize KVM\n"); exit(1); } + } else { + /* without kvm enabled, we can only support 4095 MB RAM */ + if (ram_size > (4095UL << 20)) { + fprintf(stderr, "qemu: without kvm support at most 4095 MB RAM can be simulated\n"); + exit(1); + } } if (qemu_init_main_loop()) {