External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-16 22:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtpm: Use automatic mutex management

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2022-02-08 14:50:12 +01:00
parent db7eede6b4
commit ae24a63ef8
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/util/virtpm.c
View File

@ -137,18 +137,12 @@ static int virTPMEmulatorInit(bool quiet);
static char *
virTPMBinaryGetPath(virTPMBinary binary)
{
char *s = NULL;
virMutexLock(&swtpm_tools_lock);
VIR_LOCK_GUARD lock = virLockGuardLock(&swtpm_tools_lock);
if (virTPMEmulatorInit(false) < 0)
goto cleanup;
return NULL;
s = g_strdup(swtpmBinaries[binary].path);
cleanup:
virMutexUnlock(&swtpm_tools_lock);
return s;
return g_strdup(swtpmBinaries[binary].path);
}
char *
@ -171,20 +165,14 @@ virTPMGetSwtpmIoctl(void)
bool virTPMHasSwtpm(void)
{
bool ret = false;
virMutexLock(&swtpm_tools_lock);
VIR_LOCK_GUARD lock = virLockGuardLock(&swtpm_tools_lock);
if (virTPMEmulatorInit(true) < 0)
goto cleanup;
return false;
ret = swtpmBinaries[VIR_TPM_BINARY_SWTPM].path != NULL &&
return swtpmBinaries[VIR_TPM_BINARY_SWTPM].path != NULL &&
swtpmBinaries[VIR_TPM_BINARY_SWTPM_SETUP].path != NULL &&
swtpmBinaries[VIR_TPM_BINARY_SWTPM_IOCTL].path != NULL;
cleanup:
virMutexUnlock(&swtpm_tools_lock);
return ret;
}
/* virTPMExecGetCaps
@ -341,12 +329,10 @@ static bool
virTPMBinaryGetCaps(virTPMBinary binary,
unsigned int cap)
{
bool ret = false;
virMutexLock(&swtpm_tools_lock);
VIR_LOCK_GUARD lock = virLockGuardLock(&swtpm_tools_lock);
if (virTPMEmulatorInit(false) < 0)
goto cleanup;
return false;
if (!swtpmBinaries[binary].caps &&
swtpmBinaries[binary].capsParse) {
@ -355,12 +341,11 @@ virTPMBinaryGetCaps(virTPMBinary binary,
swtpmBinaries[binary].path,
swtpmBinaries[binary].parm);
}
if (swtpmBinaries[binary].caps)
ret = virBitmapIsBitSet(swtpmBinaries[binary].caps, cap);
cleanup:
virMutexUnlock(&swtpm_tools_lock);
return ret;
if (!swtpmBinaries[binary].caps)
return false;
return virBitmapIsBitSet(swtpmBinaries[binary].caps, cap);
}
bool