[libvirt] [PATCH 2/2] qemu: Check for guest NUMA nodes properly when validating hugepages

Michal Privoznik mprivozn at redhat.com
Wed Jul 4 11:51:57 UTC 2018


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

In fa6bdf6afa878 and ec982f6d929f3c23 I've tried to forbid
configuring <hugepages/> for non-existent guest NUMA nodes.
However, the check was not fine tuned enough as it failed when no
guest NUMA was configured but <hugepages/> were configured for
guest NUMA node #0.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_command.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 04c5c28438..15caf392aa 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7421,7 +7421,7 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg,
 
     if (def->mem.hugepages[0].nodemask) {
         ssize_t next_bit = virBitmapNextSetBit(def->mem.hugepages[0].nodemask, -1);
-        if (next_bit >= 0) {
+        if (next_bit > 0) {
             virReportError(VIR_ERR_XML_DETAIL,
                            _("hugepages: node %zd not found"),
                            next_bit);
@@ -7577,7 +7577,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
         }
 
         next_bit = virBitmapNextSetBit(def->mem.hugepages[i].nodemask, pos);
-        if (next_bit >= 0) {
+        if (next_bit > 0) {
             virReportError(VIR_ERR_XML_DETAIL,
                            _("hugepages: node %zd not found"),
                            next_bit);
-- 
2.16.4




More information about the libvir-list mailing list