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

util: use consistent naming for swtpm global variables

Browse Source 
Use a '_path' suffix on all vars which are paths.

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 10:15:22 +00:00
parent 01f9873724
commit 3d8ee06b6e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/virtpm.c
View File

@ -100,11 +100,11 @@ static char *swtpm_path;
static struct stat swtpm_stat; static struct stat swtpm_stat;
static virBitmap *swtpm_caps; static virBitmap *swtpm_caps;
static char *swtpm_setup; static char *swtpm_setup_path;
static struct stat swtpm_setup_stat; static struct stat swtpm_setup_stat;
static virBitmap *swtpm_setup_caps; static virBitmap *swtpm_setup_caps;
static char *swtpm_ioctl; static char *swtpm_ioctl_path;
static struct stat swtpm_ioctl_stat; static struct stat swtpm_ioctl_stat;
typedef int (*TypeFromStringFn)(const char *); typedef int (*TypeFromStringFn)(const char *);
@ -129,11 +129,11 @@ virTPMGetSwtpmSetup(void)
{ {
char *s; char *s;
if (!swtpm_setup && virTPMEmulatorInit() < 0) if (!swtpm_setup_path && virTPMEmulatorInit() < 0)
return NULL; return NULL;
virMutexLock(&swtpm_tools_lock); virMutexLock(&swtpm_tools_lock);
s = g_strdup(swtpm_setup); s = g_strdup(swtpm_setup_path);
virMutexUnlock(&swtpm_tools_lock); virMutexUnlock(&swtpm_tools_lock);
return s; return s;
@ -144,11 +144,11 @@ virTPMGetSwtpmIoctl(void)
{ {
char *s; char *s;
if (!swtpm_ioctl && virTPMEmulatorInit() < 0) if (!swtpm_ioctl_path && virTPMEmulatorInit() < 0)
return NULL; return NULL;
virMutexLock(&swtpm_tools_lock); virMutexLock(&swtpm_tools_lock);
s = g_strdup(swtpm_ioctl); s = g_strdup(swtpm_ioctl_path);
virMutexUnlock(&swtpm_tools_lock); virMutexUnlock(&swtpm_tools_lock);
return s; return s;
@ -275,14 +275,14 @@ virTPMEmulatorInit(void)
}, },
{ {
.name = "swtpm_setup", .name = "swtpm_setup",
.path = &swtpm_setup, .path = &swtpm_setup_path,
.stat = &swtpm_setup_stat, .stat = &swtpm_setup_stat,
.caps = &swtpm_setup_caps, .caps = &swtpm_setup_caps,
.typeFromStringFn = virTPMSwtpmSetupFeatureTypeFromString, .typeFromStringFn = virTPMSwtpmSetupFeatureTypeFromString,
}, },
{ {
.name = "swtpm_ioctl", .name = "swtpm_ioctl",
.path = &swtpm_ioctl, .path = &swtpm_ioctl_path,
.stat = &swtpm_ioctl_stat, .stat = &swtpm_ioctl_stat,
} }
}; };