openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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@gmail.com>
This commit is contained in:
Nishith Shah 2016-05-20 07:09:02 +00:00 committed by Cole Robinson
parent 2c8e75554b
commit 30677a78ab
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qemu/qemu_parse_command.c
View File

@ -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)