From patchwork Wed Nov 27 00:27:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 294444 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 740732C00A8 for ; Wed, 27 Nov 2013 11:28:25 +1100 (EST) Received: from localhost ([::1]:33288 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlSzO-0001ek-UO for incoming@patchwork.ozlabs.org; Tue, 26 Nov 2013 19:28:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlSyy-0001eW-MY for qemu-devel@nongnu.org; Tue, 26 Nov 2013 19:28:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlSyr-0007Hv-VZ for qemu-devel@nongnu.org; Tue, 26 Nov 2013 19:27:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlSyr-0007Hk-NA for qemu-devel@nongnu.org; Tue, 26 Nov 2013 19:27:49 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAR0RfaZ010559 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Nov 2013 19:27:41 -0500 Received: from thinkpad.redhat.com (vpn-227-207.phx2.redhat.com [10.3.227.207]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rAR0RaxE011886; Tue, 26 Nov 2013 19:27:37 -0500 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 27 Nov 2013 01:27:35 +0100 Message-Id: <1385512056-24556-1-git-send-email-imammedo@redhat.com> In-Reply-To: <87pppn6wwu.fsf@blackfin.pond.sub.org> References: <87pppn6wwu.fsf@blackfin.pond.sub.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, stefanha@redhat.com, mst@redhat.com, hutao@cn.fujitsu.com, stefanb@linux.vnet.ibm.com, mjt@tls.msk.ru, mdroth@linux.vnet.ibm.com, armbru@redhat.com, vasilis.liaskovitis@profitbricks.com, quintela@redhat.com, kraxel@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, marcel.a@redhat.com, lcapitulino@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 04/28] 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 --- 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 8b94264..d923995 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 f28674f..44cc4ed 100644 --- a/vl.c +++ b/vl.c @@ -529,6 +529,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 * @@ -2852,6 +2866,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]); @@ -2887,6 +2902,8 @@ 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); + qemu_opts_create_nofail(&qemu_mem_opts); runstate_init(); @@ -2901,7 +2918,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; @@ -3178,16 +3195,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"); @@ -4029,10 +4062,8 @@ 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(opts, "mem", ram_size); if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0) != 0) {