From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 27 May 2019 09:07:12 +0000 (+0200)
Subject: qemu: Get default hugepage size only if needed
X-Git-Tag: v5.4.0-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c46bdad5768da39bbccaa66c5c63f7303e56ad49;p=thirdparty%2Flibvirt.git

qemu: Get default hugepage size only if needed

Fixes: 6864d8f740e2502dc7625bdf18ffde4465b14f69

Hugepages don't work in session mode but when building memory
part of command line we query for the default size anyway. This
breaks creating domains under session daemon. Query the page size
only if it's clear we need hugepages.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 73f570c419..5bf6c704e0 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3573,7 +3573,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
         pagesize = 0;
         needHugepage = false;
         useHugepage = false;
-    } else if (pagesize == 0) {
+    } else if (useHugepage && pagesize == 0) {
         if (qemuBuildMemoryGetDefaultPagesize(cfg, &pagesize) < 0)
             goto cleanup;
     }