]> xenbits.xensource.com Git - libvirt.git/commitdiff
Change QEMU capabilities cache to check ctime instead of mtime
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 10 Mar 2014 15:50:19 +0000 (15:50 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Tue, 11 Mar 2014 10:52:29 +0000 (10:52 +0000)
Debian's package manager will preserve mtime timestamp on binaries
from the time they are built, rather than installed. So if a
user downgrades their QEMU dpkg, the libvirt capabilities
cache will not refresh. The fix is to use ctime instead of mtime
since it cannot be faked.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/qemu/qemu_capabilities.c

index cae25e0e1ff498a905aa3e0f08411f7d11961029..df5581fb65d85bbc154b9b4343b833918839d0e4 100644 (file)
@@ -259,7 +259,7 @@ struct _virQEMUCaps {
     bool usedQMP;
 
     char *binary;
-    time_t mtime;
+    time_t ctime;
 
     virBitmapPtr flags;
 
@@ -2796,7 +2796,7 @@ virQEMUCapsPtr virQEMUCapsNewForBinary(const char *binary,
                              binary);
         goto error;
     }
-    qemuCaps->mtime = sb.st_mtime;
+    qemuCaps->ctime = sb.st_ctime;
 
     /* Make sure the binary we are about to try exec'ing exists.
      * Technically we could catch the exec() failure, but that's
@@ -2838,7 +2838,7 @@ bool virQEMUCapsIsValid(virQEMUCapsPtr qemuCaps)
     if (stat(qemuCaps->binary, &sb) < 0)
         return false;
 
-    return sb.st_mtime == qemuCaps->mtime;
+    return sb.st_ctime == qemuCaps->ctime;
 }