[libvirt] [PATCH v2 1/2] qemu: parse: Use qemuParseCommandLineMem for -m memory
Move the parsing of -m memory to a new function, qemuParseCommandLineMem
Signed-off-by: Nishith Shah <nishithshah.2211(a)gmail.com>
---
src/qemu/qemu_parse_command.c | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index e30586f..334dcf8 100644
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -1633,6 +1633,28 @@ 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);
+ goto error;
+ }
+
+ virDomainDefSetMemoryTotal(dom, mem * 1024);
+ dom->mem.cur_balloon = mem * 1024;
+
+ return 0;
+
+ error:
+ return -1;
+}
+
+
+static int
qemuParseCommandLineSmp(virDomainDefPtr dom,
const char *val)
{
@@ -1869,15 +1891,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)
--
2.1.4