From patchwork Thu Feb 6 08:16:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 317388 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1A3642C009A for ; Thu, 6 Feb 2014 19:23:31 +1100 (EST) Received: from localhost ([::1]:35123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WBKF4-0006GA-HI for incoming@patchwork.ozlabs.org; Thu, 06 Feb 2014 03:23:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WBKDz-0004i2-76 for qemu-devel@nongnu.org; Thu, 06 Feb 2014 03:22:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WBKDt-0008Sb-5U for qemu-devel@nongnu.org; Thu, 06 Feb 2014 03:22:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50987) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WBKDs-0008RV-UF for qemu-devel@nongnu.org; Thu, 06 Feb 2014 03:22:13 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s168MARF002826 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 6 Feb 2014 03:22:10 -0500 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s168LqJ2022681; Thu, 6 Feb 2014 03:22:04 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 6 Feb 2014 09:16:04 +0100 Message-Id: <1391674564-3783-3-git-send-email-imammedo@redhat.com> In-Reply-To: <1391674564-3783-1-git-send-email-imammedo@redhat.com> References: <1391674564-3783-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, aliguori@amazon.com, mjt@tls.msk.ru, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, akong@redhat.com Subject: [Qemu-devel] [PATCH 2/2] vl: convert -m to QemuOpts 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 Adds option to -m "mem" - startup memory amount For compatibility with legacy CLI if suffix-less number is passed, it assumes amount in Mb. Otherwise user is free to use suffixed number using suffixes b,k/K,M,G Signed-off-by: Igor Mammedov Signed-off-by: Paolo Bonzini --- qemu-options.hx | 7 +++++-- vl.c | 53 ++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 56e5fdf..4d7ef52 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -210,8 +210,11 @@ use is discouraged as it may be removed from future versions. ETEXI DEF("m", HAS_ARG, QEMU_OPTION_m, - "-m megs set virtual RAM size to megs MB [default=" - stringify(DEFAULT_RAM_SIZE) "]\n", QEMU_ARCH_ALL) + "-m [mem=]megs\n" + " configure guest RAM\n" + " mem: initial amount of guest memory (default: " + stringify(DEFAULT_RAM_SIZE) "Mb)\n", + QEMU_ARCH_ALL) STEXI @item -m @var{megs} @findex -m diff --git a/vl.c b/vl.c index 7f2595c..fe5dae3 100644 --- a/vl.c +++ b/vl.c @@ -532,6 +532,20 @@ static QemuOptsList qemu_msg_opts = { }, }; +static QemuOptsList qemu_mem_opts = { + .name = "memory-opts", + .implied_opt_name = "mem", + .head = QTAILQ_HEAD_INITIALIZER(qemu_mem_opts.head), + .merge_lists = true, + .desc = { + { + .name = "mem", + .type = QEMU_OPT_SIZE, + }, + { /* end of list */ } + }, +}; + /** * Get machine options * @@ -2868,6 +2882,7 @@ int main(int argc, char **argv, char **envp) }; const char *trace_events = NULL; const char *trace_file = NULL; + const ram_addr_t default_ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; atexit(qemu_run_exit_notifiers); error_set_progname(argv[0]); @@ -2906,6 +2921,7 @@ int main(int argc, char **argv, char **envp) qemu_add_opts(&qemu_tpmdev_opts); qemu_add_opts(&qemu_realtime_opts); qemu_add_opts(&qemu_msg_opts); + qemu_add_opts(&qemu_mem_opts); runstate_init(); @@ -2921,7 +2937,7 @@ int main(int argc, char **argv, char **envp) module_call_init(MODULE_INIT_MACHINE); machine = find_default_machine(); cpu_model = NULL; - ram_size = 0; + ram_size = default_ram_size; snapshot = 0; cyls = heads = secs = 0; translation = BIOS_ATA_TRANSLATION_AUTO; @@ -3198,16 +3214,32 @@ int main(int argc, char **argv, char **envp) exit(0); break; case QEMU_OPTION_m: { - int64_t value; uint64_t sz; - char *end; + const char *mem_str; - value = strtosz(optarg, &end); - if (value < 0 || *end) { - fprintf(stderr, "qemu: invalid ram size: %s\n", optarg); + opts = qemu_opts_parse(qemu_find_opts("memory-opts"), + optarg, 1); + + mem_str = qemu_opt_get(opts, "mem"); + if (!mem_str) { + fprintf(stderr, "qemu: invalid -m option, missing " + " 'mem' option\n"); exit(1); } - sz = QEMU_ALIGN_UP((uint64_t)value, 8192); + + sz = qemu_opt_get_size(opts, "mem", ram_size); + + /* Fix up legacy suffix-less format */ + if (g_ascii_isdigit(mem_str[strlen(mem_str) - 1])) { + sz <<= 20; + } + + /* backward compatibility behaviour for case "-m 0" */ + if (sz == 0) { + sz = default_ram_size; + } + + sz = QEMU_ALIGN_UP(sz, 8192); ram_size = sz; if (ram_size != sz) { fprintf(stderr, "qemu: ram size too large\n"); @@ -4056,10 +4088,9 @@ int main(int argc, char **argv, char **envp) exit(1); } - /* init the memory */ - if (ram_size == 0) { - ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; - } + /* store value for the future use */ + qemu_opt_set_number(qemu_find_opts_singleton("memory-opts"), + "mem", ram_size); if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0) != 0) {