External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: refactor TPM helper methods to reduce duplicationm

Browse Source 
The TPM helper methods for querying the binary path and capabilities
have the same patterns across all swtpm binaries. This code duplication
can be reduced by introducing helper methods.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-11-24 13:13:15 +00:00
parent 7475907d1a
commit e715648e8b
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/util/virtpm.c
View File

@ -109,49 +109,37 @@ static struct stat swtpm_ioctl_stat;
typedef int (*virTPMBinaryCapsParse)(const char *);
char *
virTPMGetSwtpm(void)
static char *
virTPMBinaryGetPath(char **path_var)
{
char *s;
if (!swtpm_path && virTPMEmulatorInit() < 0)
if (!*path_var && virTPMEmulatorInit() < 0)
return NULL;
virMutexLock(&swtpm_tools_lock);
s = g_strdup(swtpm_path);
s = g_strdup(*path_var);
virMutexUnlock(&swtpm_tools_lock);
return s;
}
char *
virTPMGetSwtpm(void)
{
return virTPMBinaryGetPath(&swtpm_path);
}
char *
virTPMGetSwtpmSetup(void)
{
char *s;
if (!swtpm_setup_path && virTPMEmulatorInit() < 0)
return NULL;
virMutexLock(&swtpm_tools_lock);
s = g_strdup(swtpm_setup_path);
virMutexUnlock(&swtpm_tools_lock);
return s;
return virTPMBinaryGetPath(&swtpm_setup_path);
}
char *
virTPMGetSwtpmIoctl(void)
{
char *s;
if (!swtpm_ioctl_path && virTPMEmulatorInit() < 0)
return NULL;
virMutexLock(&swtpm_tools_lock);
s = g_strdup(swtpm_ioctl_path);
virMutexUnlock(&swtpm_tools_lock);
return s;
return virTPMBinaryGetPath(&swtpm_ioctl_path);
}
/* virTPMExecGetCaps
@ -345,18 +333,23 @@ virTPMEmulatorInit(void)
return ret;
}
bool
virTPMSwtpmCapsGet(unsigned int cap)
static bool
virTPMBinaryGetCaps(virBitmap **caps_var,
unsigned int cap)
{
if (virTPMEmulatorInit() < 0)
return false;
return virBitmapIsBitSet(swtpm_caps, cap);
return virBitmapIsBitSet(*caps_var, cap);
}
bool
virTPMSwtpmCapsGet(unsigned int cap)
{
return virTPMBinaryGetCaps(&swtpm_caps, cap);
}
bool
virTPMSwtpmSetupCapsGet(unsigned int cap)
{
if (virTPMEmulatorInit() < 0)
return false;
return virBitmapIsBitSet(swtpm_setup_caps, cap);
return virTPMBinaryGetCaps(&swtpm_setup_caps, cap);
}