From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <4E49A961.9020909@web.de> Date: Mon, 15 Aug 2011 16:18:57 -0700 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] Reorder default ram_size initialization List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel 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) {