[libvirt] [PATCH 1/2] qemu: Force capabilities cache refresh if libvirtd date is different
Daniel P. Berrange
berrange at redhat.com
Tue May 26 15:38:19 UTC 2015
On Sat, May 23, 2015 at 10:33:30AM -0400, John Ferlan wrote:
> https://bugzilla.redhat.com/show_bug.cgi?id=1195882
>
> Original commit id 'cbde3589' indicates that the cache file would be
> discarded if either the QEMU binary or libvirtd 'ctime' changes; however,
> the code only discarded if the QEMU binary time didn't match or if the
> new libvirtd ctime was later than what created the cache file.
>
> Since many factors come into play with 'ctime' adjustments (including
> perhaps turning back the hands of time), change the logic to also force
> a refresh if the ctime of libvirt is different than what's in the cache.
>
> Signed-off-by: John Ferlan <jferlan at redhat.com>
> ---
> src/qemu/qemu_capabilities.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 375df22..a6fae38 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -2981,9 +2981,9 @@ virQEMUCapsInitCached(virQEMUCapsPtr qemuCaps, const char *cacheDir)
> goto cleanup;
> }
>
> - /* Discard if cache is older that QEMU binary */
> + /* Discard cache if QEMU binary or libvirtd changed */
> if (qemuctime != qemuCaps->ctime ||
> - selfctime < virGetSelfLastChanged()) {
> + selfctime != virGetSelfLastChanged()) {
> VIR_DEBUG("Outdated cached capabilities '%s' for '%s' "
> "(%lld vs %lld, %lld vs %lld)",
> capsfile, qemuCaps->binary,
ACK
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
More information about the libvir-list
mailing list