* [Qemu-devel] [PATCH v4 1/2] qemu-option: introduce qemu_find_opts_singleton
2014-03-06 9:39 [Qemu-devel] [PATCH v4 0/2] convert -m to QemuOpts Igor Mammedov
@ 2014-03-06 9:39 ` Igor Mammedov
2014-03-06 9:39 ` [Qemu-devel] [PATCH v4 2/2] vl: convert -m to QemuOpts Igor Mammedov
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Igor Mammedov @ 2014-03-06 9:39 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, stefanha, qemu-trivial, coreyb, mjt, mreitz, aliguori,
pbonzini, lcapitulino, imammedo, akong, lersek, afaerber
From: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
include/qemu/config-file.h | 2 ++
util/qemu-config.c | 14 ++++++++++++++
vl.c | 11 +----------
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h
index dbd97c4..d4ba20e 100644
--- a/include/qemu/config-file.h
+++ b/include/qemu/config-file.h
@@ -8,6 +8,8 @@
QemuOptsList *qemu_find_opts(const char *group);
QemuOptsList *qemu_find_opts_err(const char *group, Error **errp);
+QemuOpts *qemu_find_opts_singleton(const char *group);
+
void qemu_add_opts(QemuOptsList *list);
void qemu_add_drive_opts(QemuOptsList *list);
int qemu_set_option(const char *str);
diff --git a/util/qemu-config.c b/util/qemu-config.c
index f610101..60051df 100644
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -39,6 +39,20 @@ QemuOptsList *qemu_find_opts(const char *group)
return ret;
}
+QemuOpts *qemu_find_opts_singleton(const char *group)
+{
+ QemuOptsList *list;
+ QemuOpts *opts;
+
+ list = qemu_find_opts(group);
+ assert(list);
+ opts = qemu_opts_find(list, NULL);
+ if (!opts) {
+ opts = qemu_opts_create(list, NULL, 0, &error_abort);
+ }
+ return opts;
+}
+
static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc *desc)
{
CommandLineParameterInfoList *param_list = NULL, *entry;
diff --git a/vl.c b/vl.c
index 685a7a9..7eb3b73 100644
--- a/vl.c
+++ b/vl.c
@@ -482,16 +482,7 @@ static QemuOptsList qemu_msg_opts = {
*/
QemuOpts *qemu_get_machine_opts(void)
{
- QemuOptsList *list;
- QemuOpts *opts;
-
- list = qemu_find_opts("machine");
- assert(list);
- opts = qemu_opts_find(list, NULL);
- if (!opts) {
- opts = qemu_opts_create(list, NULL, 0, &error_abort);
- }
- return opts;
+ return qemu_find_opts_singleton("machine");
}
const char *qemu_get_vm_name(void)
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Qemu-devel] [PATCH v4 2/2] vl: convert -m to QemuOpts
2014-03-06 9:39 [Qemu-devel] [PATCH v4 0/2] convert -m to QemuOpts Igor Mammedov
2014-03-06 9:39 ` [Qemu-devel] [PATCH v4 1/2] qemu-option: introduce qemu_find_opts_singleton Igor Mammedov
@ 2014-03-06 9:39 ` Igor Mammedov
2014-03-06 19:30 ` Andreas Färber
2014-03-06 19:32 ` [Qemu-devel] [PATCH v4 0/2] " Andreas Färber
2014-03-20 16:21 ` Michael Tokarev
3 siblings, 1 reply; 9+ messages in thread
From: Igor Mammedov @ 2014-03-06 9:39 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, stefanha, qemu-trivial, coreyb, mjt, mreitz, aliguori,
pbonzini, lcapitulino, imammedo, akong, lersek, afaerber
Adds option to -m
"size" - 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 <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
v3:
- fix not completed renaming of 'mem' option to 'size'
v2:
- suggested by Andreas Färber <afaerber@suse.de>
* s/fprintf/error_report/
* rename 'mem' option to 'size'
- fix conflict with missing numa QemuOpts
---
qemu-options.hx | 9 ++++--
vl.c | 71 ++++++++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 63 insertions(+), 17 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 56e5fdf..5e89e0d 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -210,10 +210,13 @@ 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 [size=]megs\n"
+ " configure guest RAM\n"
+ " size: initial amount of guest memory (default: "
+ stringify(DEFAULT_RAM_SIZE) "MiB)\n",
+ QEMU_ARCH_ALL)
STEXI
-@item -m @var{megs}
+@item -m [size=]@var{megs}
@findex -m
Set virtual RAM size to @var{megs} megabytes. Default is 128 MiB. Optionally,
a suffix of ``M'' or ``G'' can be used to signify a value in megabytes or
diff --git a/vl.c b/vl.c
index 7eb3b73..8b085c3 100644
--- a/vl.c
+++ b/vl.c
@@ -475,6 +475,20 @@ static QemuOptsList qemu_msg_opts = {
},
};
+static QemuOptsList qemu_mem_opts = {
+ .name = "memory",
+ .implied_opt_name = "size",
+ .head = QTAILQ_HEAD_INITIALIZER(qemu_mem_opts.head),
+ .merge_lists = true,
+ .desc = {
+ {
+ .name = "size",
+ .type = QEMU_OPT_SIZE,
+ },
+ { /* end of list */ }
+ },
+};
+
/**
* Get machine options
*
@@ -2835,6 +2849,8 @@ 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 = (ram_addr_t)DEFAULT_RAM_SIZE *
+ 1024 * 1024;
atexit(qemu_run_exit_notifiers);
error_set_progname(argv[0]);
@@ -2866,6 +2882,7 @@ int main(int argc, char **argv, char **envp)
qemu_add_opts(&qemu_trace_opts);
qemu_add_opts(&qemu_option_rom_opts);
qemu_add_opts(&qemu_machine_opts);
+ qemu_add_opts(&qemu_mem_opts);
qemu_add_opts(&qemu_smp_opts);
qemu_add_opts(&qemu_boot_opts);
qemu_add_opts(&qemu_sandbox_opts);
@@ -2889,7 +2906,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;
@@ -3176,20 +3193,48 @@ 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);
- exit(1);
+ opts = qemu_opts_parse(qemu_find_opts("memory"),
+ optarg, 1);
+ if (!opts) {
+ exit(EXIT_FAILURE);
+ }
+
+ mem_str = qemu_opt_get(opts, "size");
+ if (!mem_str) {
+ error_report("invalid -m option, missing 'size' option");
+ exit(EXIT_FAILURE);
+ }
+ if (!*mem_str) {
+ error_report("missing 'size' option value");
+ exit(EXIT_FAILURE);
+ }
+
+ sz = qemu_opt_get_size(opts, "size", ram_size);
+
+ /* Fix up legacy suffix-less format */
+ if (g_ascii_isdigit(mem_str[strlen(mem_str) - 1])) {
+ uint64_t overflow_check = sz;
+
+ sz <<= 20;
+ if ((sz >> 20) != overflow_check) {
+ error_report("too large 'size' option value");
+ exit(EXIT_FAILURE);
+ }
+ }
+
+ /* backward compatibility behaviour for case "-m 0" */
+ if (sz == 0) {
+ sz = default_ram_size;
}
- sz = QEMU_ALIGN_UP((uint64_t)value, 8192);
+
+ sz = QEMU_ALIGN_UP(sz, 8192);
ram_size = sz;
if (ram_size != sz) {
- fprintf(stderr, "qemu: ram size too large\n");
- exit(1);
+ error_report("ram size too large");
+ exit(EXIT_FAILURE);
}
break;
}
@@ -4034,10 +4079,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(qemu_find_opts_singleton("memory"), "size", ram_size);
if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0)
!= 0) {
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [Qemu-devel] [PATCH v4 0/2] convert -m to QemuOpts
2014-03-06 9:39 [Qemu-devel] [PATCH v4 0/2] convert -m to QemuOpts Igor Mammedov
2014-03-06 9:39 ` [Qemu-devel] [PATCH v4 1/2] qemu-option: introduce qemu_find_opts_singleton Igor Mammedov
2014-03-06 9:39 ` [Qemu-devel] [PATCH v4 2/2] vl: convert -m to QemuOpts Igor Mammedov
@ 2014-03-06 19:32 ` Andreas Färber
2014-03-15 20:26 ` Igor Mammedov
2014-03-20 16:21 ` Michael Tokarev
3 siblings, 1 reply; 9+ messages in thread
From: Andreas Färber @ 2014-03-06 19:32 UTC (permalink / raw)
To: Michael Tokarev
Cc: kwolf, akong, aliguori, qemu-trivial, coreyb, qemu-devel, mreitz,
stefanha, pbonzini, Igor Mammedov, lcapitulino, lersek
mjt,
Am 06.03.2014 10:39, schrieb Igor Mammedov:
> Igor Mammedov (1):
> vl: convert -m to QemuOpts
>
> Paolo Bonzini (1):
> qemu-option: introduce qemu_find_opts_singleton
>
> include/qemu/config-file.h | 2 +
> qemu-options.hx | 9 +++--
> util/qemu-config.c | 14 +++++++
> vl.c | 82 +++++++++++++++++++++++++++++++-------------
> 4 files changed, 80 insertions(+), 27 deletions(-)
Since I believe you have a track record of reviewing and queuing such
QemuOpts conversions, can you review and take this for 2.0 please?
Regards,
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 9+ messages in thread