From 30677a78abcb70d5e7222fae601ea200ecbda981 Mon Sep 17 00:00:00 2001 From: Nishith Shah Date: Fri, 20 May 2016 07:09:02 +0000 Subject: [PATCH] qemu: parse: Use qemuParseCommandLineMem for -m memory Move the parsing of -m memory to a new function, qemuParseCommandLineMem Signed-off-by: Nishith Shah --- src/qemu/qemu_parse_command.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index e30586f74b..d0a9dc0dcc 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1632,6 +1632,26 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, } +static int +qemuParseCommandLineMem(virDomainDefPtr dom, + const char *val) +{ + unsigned long long mem; + char *end; + + if (virStrToLong_ull(val, &end, 10, &mem) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse memory level '%s'"), val); + return -1; + } + + virDomainDefSetMemoryTotal(dom, mem * 1024); + dom->mem.cur_balloon = mem * 1024; + + return 0; +} + + static int qemuParseCommandLineSmp(virDomainDefPtr dom, const char *val) @@ -1869,15 +1889,9 @@ qemuParseCommandLine(virCapsPtr caps, } else if (STREQ(arg, "-sdl")) { have_sdl = true; } else if (STREQ(arg, "-m")) { - int mem; WANT_VALUE(); - if (virStrToLong_i(val, NULL, 10, &mem) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("cannot parse memory level '%s'"), val); + if (qemuParseCommandLineMem(def, val) < 0) goto error; - } - virDomainDefSetMemoryTotal(def, mem * 1024); - def->mem.cur_balloon = mem * 1024; } else if (STREQ(arg, "-smp")) { WANT_VALUE(); if (qemuParseCommandLineSmp(def, val) < 0) -- GitLab