Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1121837 --- src/conf/numatune_conf.c | 18 +++++++++++-- ...emuxml2argv-numatune-memory-invalid-nodeset.xml | 31 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml diff --git a/src/conf/numatune_conf.c b/src/conf/numatune_conf.c index 48d1d04..9d7959a 100644 --- a/src/conf/numatune_conf.c +++ b/src/conf/numatune_conf.c @@ -182,6 +182,12 @@ virDomainNumatuneNodeParseXML(virDomainNumatunePtr *numatunePtr, if (virBitmapParse(tmp, 0, &mem_node->nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) goto cleanup; + + if (virBitmapIsAllClear(mem_node->nodeset)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Numatune memory nodeset is empty")); + goto cleanup; + } VIR_FREE(tmp); } @@ -264,8 +270,16 @@ virDomainNumatuneParseXML(virDomainNumatunePtr *numatunePtr, VIR_FREE(tmp); tmp = virXMLPropString(node, "nodeset"); - if (tmp && virBitmapParse(tmp, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) - goto cleanup; + if (tmp) { + if (virBitmapParse(tmp, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) + goto cleanup; + + if (virBitmapIsAllClear(nodeset)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Numatune memory nodeset is empty")); + goto cleanup; + } + } VIR_FREE(tmp); if (virDomainNumatuneSet(numatunePtr, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml new file mode 100644 index 0000000..d2b41b4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory-invalid-nodeset.xml @@ -0,0 +1,31 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <numatune> + <memory mode="strict" nodeset="0,^0"/> + </numatune> + <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-kvm</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1c121ff..62b969c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1210,6 +1210,7 @@ mymain(void) DO_TEST("cputune-zero-shares", QEMU_CAPS_NAME); DO_TEST("numatune-memory", NONE); + DO_TEST_PARSE_ERROR("numatune-memory-invalid-nodeset", NONE); DO_TEST("numatune-memnode", QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM); DO_TEST_FAILURE("numatune-memnode", NONE); -- 1.9.3