NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Refactor virQEMUCapsCacheLookup

Browse Source 
The function is made a little bit more readable and the code which
refreshes cached capabilities if they are not valid any more was moved
into a separate function (virQEMUCapsCacheValidate) so that it can be
reused in other places.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-11-16 13:47:09 +01:00
parent cd51b90fbf
commit 72e5aa4e1e
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/qemu/qemu_capabilities.c
View File

@ -4542,6 +4542,37 @@ virQEMUCapsCacheNew(const char *libDir,
return NULL; return NULL;
} }
static void ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
virQEMUCapsCacheValidate(virQEMUCapsCachePtr cache,
const char *binary,
virCapsPtr caps,
virQEMUCapsPtr *qemuCaps)
{
if (*qemuCaps &&
!virQEMUCapsIsValid(*qemuCaps, 0, cache->runUid, cache->runGid)) {
VIR_DEBUG("Cached capabilities %p no longer valid for %s",
*qemuCaps, binary);
virHashRemoveEntry(cache->binaries, binary);
*qemuCaps = NULL;
}
if (!*qemuCaps) {
VIR_DEBUG("Creating capabilities for %s", binary);
*qemuCaps = virQEMUCapsNewForBinary(caps, binary,
cache->libDir, cache->cacheDir,
cache->runUid, cache->runGid);
if (*qemuCaps) {
VIR_DEBUG("Caching capabilities %p for %s", *qemuCaps, binary);
if (virHashAddEntry(cache->binaries, binary, *qemuCaps) < 0) {
virObjectUnref(*qemuCaps);
*qemuCaps = NULL;
}
}
}
}
const char *qemuTestCapsName; const char *qemuTestCapsName;
virQEMUCapsPtr virQEMUCapsPtr
@ -4556,32 +4587,14 @@ virQEMUCapsCacheLookup(virCapsPtr caps,
binary = qemuTestCapsName; binary = qemuTestCapsName;
virMutexLock(&cache->lock); virMutexLock(&cache->lock);
ret = virHashLookup(cache->binaries, binary); ret = virHashLookup(cache->binaries, binary);
if (ret && virQEMUCapsCacheValidate(cache, binary, caps, &ret);
!virQEMUCapsIsValid(ret, 0, cache->runUid, cache->runGid)) {
VIR_DEBUG("Cached capabilities %p no longer valid for %s",
ret, binary);
virHashRemoveEntry(cache->binaries, binary);
ret = NULL;
}
if (!ret) {
VIR_DEBUG("Creating capabilities for %s",
binary);
ret = virQEMUCapsNewForBinary(caps, binary, cache->libDir,
cache->cacheDir,
cache->runUid, cache->runGid);
if (ret) {
VIR_DEBUG("Caching capabilities %p for %s",
ret, binary);
if (virHashAddEntry(cache->binaries, binary, ret) < 0) {
virObjectUnref(ret);
ret = NULL;
}
}
}
VIR_DEBUG("Returning caps %p for %s", ret, binary);
virObjectRef(ret); virObjectRef(ret);
virMutexUnlock(&cache->lock); virMutexUnlock(&cache->lock);
VIR_DEBUG("Returning caps %p for %s", ret, binary);
return ret; return ret;
} }