Re: [libvirt] [PATCH] qemu: Allow suffixes for the RAM option and fix it's type

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=812295

According to QEMU docs, the '-m' option for specifying RAM is by default in MiB, and a suffix of "M" or "G" may be passed for values in MiB and GiB respectively. This commit adds support and a test for the same. Also, change the type of mem from int to unsigned long long as per convention and also because virDomainDefSetMemoryTotal expects the latter. Signed-off-by: Nishith Shah <nishithshah.2211(a)gmail.com&gt; --- src/qemu/qemu_parse_command.c | 14 +++++++++---- tests/qemuargv2xmldata/qemuargv2xml-m.args | 22 ++++++++++++++++++++ tests/qemuargv2xmldata/qemuargv2xml-m.xml | 33 ++++++++++++++++++++++++++++++ tests/qemuargv2xmltest.c | 1 + 4 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-m.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-m.xml diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index e30586f..48076eb 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1869,15 +1869,21 @@ qemuParseCommandLine(virCapsPtr caps, } else if (STREQ(arg, "-sdl")) { have_sdl = true; } else if (STREQ(arg, "-m")) {

- int mem; + unsigned long long mem; + char *end; WANT_VALUE(); - if (virStrToLong_i(val, NULL, 10, &mem) < 0) { + if (virStrToLong_ull(val, &end, 10, &mem) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, \ _("cannot parse memory level '%s'"), val); goto error; }

- virDomainDefSetMemoryTotal(def, mem * 1024); - def->mem.cur_balloon = mem * 1024; + if (virScaleInteger(&mem, end, 1024 * 1024, ULLONG_MAX) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, \ + _("cannot scale memory '%s'"), val); + goto error; + }

+ virDomainDefSetMemoryTotal(def, mem / 1024); + def->mem.cur_balloon = mem / 1024; } else if (STREQ(arg, "-smp")) { WANT_VALUE(); if (qemuParseCommandLineSmp(def, val) < 0) diff --git a/tests/qemuargv2xmldata/qemuargv2xml-m.args b/tests/qemuargv2xmldata/qemuargv2xml-m.args new file mode 100644 index 0000000..90da94d --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-m.args @@ -0,0 +1,22 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 2G \ +-smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-m.xml b/tests/qemuargv2xmldata/qemuargv2xml-m.xml new file mode 100644 index 0000000..8002e00 --- /dev/null +++ b/tests/qemuargv2xmldata/qemuargv2xml-m.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static' current='1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 48c83ea..c7bbc5b 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -264,6 +264,7 @@ mymain(void) DO_TEST("hostdev-pci-address"); + DO_TEST("m"); DO_TEST("smp"); DO_TEST("hyperv");