qemu: implement basic virFileCache for nbdkit caps

Preparatory step for caching nbdkit capabilities. This patch implements
the newData and isValid virFileCacheHandlers callback functions.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_nbdkit.c b/src/qemu/qemu_nbdkit.c
index 58828dd89ae2179da15431d4e2b5b97095859501..9828f562f7c08603a3549caf29e004d05ab271aa 100644 (file)
--- a/src/qemu/qemu_nbdkit.c
+++ b/src/qemu/qemu_nbdkit.c
@@ -201,7 +201,7 @@ qemuNbdkitGetDirMtime(const char *moddir)
 }
 
 
-G_GNUC_UNUSED static void
+static void
 qemuNbdkitCapsQuery(qemuNbdkitCaps *caps)
 {
     struct stat st;
@@ -240,3 +240,90 @@ qemuNbdkitCapsSet(qemuNbdkitCaps *nbdkitCaps,
 {
     ignore_value(virBitmapSetBit(nbdkitCaps->flags, flag));
 }
+
+
+static bool
+virNbkditCapsCheckModdir(const char *moddir,
+                         time_t expectedMtime)
+{
+    time_t mtime = qemuNbdkitGetDirMtime(moddir);
+
+    if (mtime != expectedMtime) {
+        VIR_DEBUG("Outdated capabilities for nbdkit: module directory '%s' changed (%lld vs %lld)",
+                  moddir, (long long)mtime, (long long)expectedMtime);
+        return false;
+    }
+    return true;
+}
+
+
+static bool
+virNbdkitCapsIsValid(void *data,
+                     void *privData G_GNUC_UNUSED)
+{
+    qemuNbdkitCaps *nbdkitCaps = data;
+    struct stat st;
+
+    if (!nbdkitCaps->path)
+        return true;
+
+    if (!virNbkditCapsCheckModdir(NBDKIT_PLUGINDIR, nbdkitCaps->pluginDirMtime))
+        return false;
+    if (!virNbkditCapsCheckModdir(NBDKIT_FILTERDIR, nbdkitCaps->filterDirMtime))
+        return false;
+
+    if (nbdkitCaps->libvirtCtime != virGetSelfLastChanged() ||
+        nbdkitCaps->libvirtVersion != LIBVIR_VERSION_NUMBER) {
+        VIR_DEBUG("Outdated capabilities for '%s': libvirt changed (%lld vs %lld, %lu vs %lu)",
+                  nbdkitCaps->path,
+                  (long long)nbdkitCaps->libvirtCtime,
+                  (long long)virGetSelfLastChanged(),
+                  (unsigned long)nbdkitCaps->libvirtVersion,
+                  (unsigned long)LIBVIR_VERSION_NUMBER);
+        return false;
+    }
+
+    if (stat(nbdkitCaps->path, &st) < 0) {
+        VIR_DEBUG("Failed to stat nbdkit binary '%s': %s",
+                  nbdkitCaps->path,
+                  g_strerror(errno));
+        return false;
+    }
+
+    if (st.st_ctime != nbdkitCaps->ctime) {
+        VIR_DEBUG("Outdated capabilities for '%s': nbdkit binary changed (%lld vs %lld)",
+                  nbdkitCaps->path,
+                  (long long)st.st_ctime, (long long)nbdkitCaps->ctime);
+        return false;
+    }
+
+    return true;
+}
+
+
+static void*
+virNbdkitCapsNewData(const char *binary,
+                     void *privData G_GNUC_UNUSED)
+{
+    qemuNbdkitCaps *caps = qemuNbdkitCapsNew(binary);
+    qemuNbdkitCapsQuery(caps);
+
+    return caps;
+}
+
+
+virFileCacheHandlers nbdkitCapsCacheHandlers = {
+    .isValid = virNbdkitCapsIsValid,
+    .newData = virNbdkitCapsNewData,
+    .loadFile = NULL,
+    .saveFile = NULL,
+    .privFree = NULL,
+};
+
+
+virFileCache*
+qemuNbdkitCapsCacheNew(const char *cachedir)
+{
+    g_autofree char *dir = g_build_filename(cachedir, "nbdkitcapabilities", NULL);
+    return virFileCacheNew(dir, "xml", &nbdkitCapsCacheHandlers);
+}

diff --git a/src/qemu/qemu_nbdkit.h b/src/qemu/qemu_nbdkit.h
index e191e1fdb407b3bdedfbe2b1858416f51794b45c..4aba7c845582e7c680f864524210c2693cbf0eb2 100644 (file)
--- a/src/qemu/qemu_nbdkit.h
+++ b/src/qemu/qemu_nbdkit.h
@@ -21,6 +21,7 @@
 
 #include "internal.h"
 #include "virenum.h"
+#include "virfilecache.h"
 
 typedef struct _qemuNbdkitCaps qemuNbdkitCaps;
 
@@ -38,6 +39,9 @@ VIR_ENUM_DECL(qemuNbdkitCaps);
 qemuNbdkitCaps *
 qemuNbdkitCapsNew(const char *path);
 
+virFileCache *
+qemuNbdkitCapsCacheNew(const char *cachedir);
+
 bool
 qemuNbdkitCapsGet(qemuNbdkitCaps *nbdkitCaps,
                   qemuNbdkitCapsFlags flag);