From patchwork Mon Aug 15 23:18:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 110109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6240CB6F67 for ; Tue, 16 Aug 2011 09:19:16 +1000 (EST) Received: from localhost ([::1]:44611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qt6R6-0002On-ET for incoming@patchwork.ozlabs.org; Mon, 15 Aug 2011 19:19:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qt6R0-0002OU-Kz for qemu-devel@nongnu.org; Mon, 15 Aug 2011 19:19:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qt6Qz-0002wd-HV for qemu-devel@nongnu.org; Mon, 15 Aug 2011 19:19:06 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:43072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qt6Qy-0002wP-VS for qemu-devel@nongnu.org; Mon, 15 Aug 2011 19:19:05 -0400 Received: from smtp07.web.de ( [172.20.5.215]) by fmmailgate02.web.de (Postfix) with ESMTP id 9EA9F1A8BC0F6; Tue, 16 Aug 2011 01:19:03 +0200 (CEST) Received: from [216.123.155.199] (helo=mchn199C.mchp.siemens.de) by smtp07.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1Qt6Qx-0005Cm-00; Tue, 16 Aug 2011 01:19:03 +0200 Message-ID: <4E49A961.9020909@web.de> Date: Mon, 15 Aug 2011 16:18:57 -0700 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Anthony Liguori X-Enigmail-Version: 1.2 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/d/poo+VdnUlFJvludgL6eNUUC+JTT7bhaRybH Qvhawsd9ADRLYKVnopWzVGE2BYwj+0r8ACb4g+SetZgLP9FiYu utnSiFnkQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.227 Cc: qemu-devel Subject: [Qemu-devel] [PATCH] Reorder default ram_size initialization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org code_gen_alloc depends on it, and that is now called earlier via configure_accelerator. Signed-off-by: Jan Kiszka --- vl.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vl.c b/vl.c index cc4998f..44ea10c 100644 --- a/vl.c +++ b/vl.c @@ -3087,6 +3087,11 @@ int main(int argc, char **argv, char **envp) exit(1); } + /* init the memory */ + if (ram_size == 0) { + ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; + } + configure_accelerator(); if (qemu_init_main_loop()) { @@ -3121,11 +3126,6 @@ int main(int argc, char **argv, char **envp) if (foreach_device_config(DEV_BT, bt_parse)) exit(1); - /* init the memory */ - if (ram_size == 0) { - ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; - } - if (!xen_enabled()) { /* On 32-bit hosts, QEMU is limited by virtual address space */ if (ram_size > (2047 << 20) && HOST_LONG_BITS == 32) {