From 098f56f335241d20ed220d8bb245a0dc9ab5fc39 Mon Sep 17 00:00:00 2001

Message-Id: <098f56f335241d20ed220d8bb245a0dc9ab5fc39@dist-git>

From: Jiri Denemark <jdenemar@redhat.com>

Date: Mon, 22 Jan 2018 11:37:04 +0100

Subject: [PATCH] qemu: Refresh caps cache after booting a different kernel

Whenever a different kernel is booted, some capabilities related to KVM

(such as CPUID bits) may change. We need to refresh the cache to see the

changes.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>

(cherry picked from commit 52b7d910b6b0ceeff50866774adba6efab55b2c0)

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

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

---

 src/qemu/qemu_capabilities.c | 57 +++++++++++++++++++++++++++++++++++++-------

 src/qemu/qemu_capspriv.h     |  1 +

 tests/qemucapsprobe.c        |  2 +-

 3 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c

index 09323d2580..af4875f82e 100644

--- a/src/qemu/qemu_capabilities.c

+++ b/src/qemu/qemu_capabilities.c

@@ -52,6 +52,7 @@

 #include <unistd.h>

 #include <sys/wait.h>

 #include <stdarg.h>

+#include <sys/utsname.h>

 #define VIR_FROM_THIS VIR_FROM_QEMU

@@ -509,6 +510,7 @@ struct _virQEMUCaps {

     unsigned int libvirtVersion;

     unsigned int microcodeVersion;

     char *package;

+    char *kernelVersion;

     virArch arch;

@@ -2302,6 +2304,9 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)

     if (VIR_STRDUP(ret->package, qemuCaps->package) < 0)

         goto error;

+    if (VIR_STRDUP(ret->kernelVersion, qemuCaps->kernelVersion) < 0)

+        goto error;

+

     ret->arch = qemuCaps->arch;

     if (qemuCaps->kvmCPUModels) {

@@ -2362,6 +2367,7 @@ void virQEMUCapsDispose(void *obj)

     virBitmapFree(qemuCaps->flags);

     VIR_FREE(qemuCaps->package);

+    VIR_FREE(qemuCaps->kernelVersion);

     VIR_FREE(qemuCaps->binary);

     VIR_FREE(qemuCaps->gicCapabilities);

@@ -3822,6 +3828,7 @@ struct _virQEMUCapsCachePriv {

     gid_t runGid;

     virArch hostArch;

     unsigned int microcodeVersion;

+    char *kernelVersion;

 };

 typedef struct _virQEMUCapsCachePriv virQEMUCapsCachePriv;

 typedef virQEMUCapsCachePriv *virQEMUCapsCachePrivPtr;

@@ -3833,6 +3840,7 @@ virQEMUCapsCachePrivFree(void *privData)

     virQEMUCapsCachePrivPtr priv = privData;

     VIR_FREE(priv->libDir);

+    VIR_FREE(priv->kernelVersion);

     VIR_FREE(priv);

 }

@@ -3958,6 +3966,12 @@ virQEMUCapsLoadCache(virArch hostArch,

             goto cleanup;

     }

+    if (virXPathBoolean("boolean(./kernelVersion)", ctxt) > 0) {

+        qemuCaps->kernelVersion = virXPathString("string(./kernelVersion)", ctxt);

+        if (!qemuCaps->kernelVersion)

+            goto cleanup;

+    }

+

     if (!(str = virXPathString("string(./arch)", ctxt))) {

         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

                        _("missing arch in QEMU capabilities cache"));

@@ -4236,6 +4250,10 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)

         virBufferAsprintf(&buf, "<package>%s</package>\n",

                           qemuCaps->package);

+    if (qemuCaps->kernelVersion)

+        virBufferAsprintf(&buf, "<kernelVersion>%s</kernelVersion>\n",

+                          qemuCaps->kernelVersion);

+

     virBufferAsprintf(&buf, "<arch>%s</arch>\n",

                       virArchToString(qemuCaps->arch));

@@ -4373,14 +4391,24 @@ virQEMUCapsIsValid(void *data,

         return false;

     }

-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) &&

-        priv->microcodeVersion != qemuCaps->microcodeVersion) {

-        VIR_DEBUG("Outdated capabilities for '%s': microcode version changed "

-                  "(%u vs %u)",

-                  qemuCaps->binary,

-                  priv->microcodeVersion,

-                  qemuCaps->microcodeVersion);

-        return false;

+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) {

+        if (priv->microcodeVersion != qemuCaps->microcodeVersion) {

+            VIR_DEBUG("Outdated capabilities for '%s': microcode version "

+                      "changed (%u vs %u)",

+                      qemuCaps->binary,

+                      priv->microcodeVersion,

+                      qemuCaps->microcodeVersion);

+            return false;

+        }

+

+        if (STRNEQ_NULLABLE(priv->kernelVersion, qemuCaps->kernelVersion)) {

+            VIR_DEBUG("Outdated capabilities for '%s': kernel version changed "

+                      "('%s' vs '%s')",

+                      qemuCaps->binary,

+                      priv->kernelVersion,

+                      qemuCaps->kernelVersion);

+            return false;

+        }

     }

     return true;

@@ -5213,6 +5241,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch,

                                 uid_t runUid,

                                 gid_t runGid,

                                 unsigned int microcodeVersion,

+                                const char *kernelVersion,

                                 bool qmpOnly)

 {

     virQEMUCapsPtr qemuCaps;

@@ -5269,9 +5298,13 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch,

     virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_KVM);

     virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_QEMU);

-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))

+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) {

         qemuCaps->microcodeVersion = microcodeVersion;

+        if (VIR_STRDUP(qemuCaps->kernelVersion, kernelVersion) < 0)

+            goto error;

+    }

+

  cleanup:

     VIR_FREE(qmperr);

     return qemuCaps;

@@ -5294,6 +5327,7 @@ virQEMUCapsNewData(const char *binary,

                                            priv->runUid,

                                            priv->runGid,

                                            priv->microcodeVersion,

+                                           priv->kernelVersion,

                                            false);

 }

@@ -5382,6 +5416,7 @@ virQEMUCapsCacheNew(const char *libDir,

     char *capsCacheDir = NULL;

     virFileCachePtr cache = NULL;

     virQEMUCapsCachePrivPtr priv = NULL;

+    struct utsname uts = { 0 };

     if (virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir) < 0)

         goto error;

@@ -5402,6 +5437,10 @@ virQEMUCapsCacheNew(const char *libDir,

     priv->runGid = runGid;

     priv->microcodeVersion = microcodeVersion;

+    if (uname(&uts) == 0 &&

+        virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.version) < 0)

+        goto error;

+

  cleanup:

     VIR_FREE(capsCacheDir);

     return cache;

diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h

index 98d163b920..222f3368e3 100644

--- a/src/qemu/qemu_capspriv.h

+++ b/src/qemu/qemu_capspriv.h

@@ -37,6 +37,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch,

                                 uid_t runUid,

                                 gid_t runGid,

                                 unsigned int microcodeVersion,

+                                const char *kernelVersion,

                                 bool qmpOnly);

 int virQEMUCapsLoadCache(virArch hostArch,

diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c

index a5f5a38b16..7d60246949 100644

--- a/tests/qemucapsprobe.c

+++ b/tests/qemucapsprobe.c

@@ -72,7 +72,7 @@ main(int argc, char **argv)

         return EXIT_FAILURE;

     if (!(caps = virQEMUCapsNewForBinaryInternal(VIR_ARCH_NONE, argv[1], "/tmp",

-                                                 -1, -1, 0, true)))

+                                                 -1, -1, 0, NULL, true)))

         return EXIT_FAILURE;

     virObjectUnref(caps);

-- 

2.16.1