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: tpm: use g_autofree

Browse Source 
Mark eligible declarations as g_autofree and remove
the corresponding VIR_FREE calls.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2020-02-01 00:01:13 +01:00
parent 9994bee5f2
commit 3f897afda6
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/qemu/qemu_tpm.c
View File

@ -126,7 +126,7 @@ qemuTPMCreateEmulatorStorage(const char *storagepath,
gid_t swtpm_group) gid_t swtpm_group)
{ {
int ret = -1; int ret = -1;
char *swtpmStorageDir = g_path_get_dirname(storagepath); g_autofree char *swtpmStorageDir = g_path_get_dirname(storagepath);
if (qemuTPMEmulatorInitStorage(swtpmStorageDir) < 0) if (qemuTPMEmulatorInitStorage(swtpmStorageDir) < 0)
goto cleanup; goto cleanup;
@ -150,8 +150,6 @@ qemuTPMCreateEmulatorStorage(const char *storagepath,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(swtpmStorageDir);
return ret; return ret;
} }
@ -220,14 +218,12 @@ qemuTPMEmulatorCreatePidFilename(const char *swtpmStateDir,
const char *shortName) const char *shortName)
{ {
char *pidfile = NULL; char *pidfile = NULL;
char *devicename = NULL; g_autofree char *devicename = NULL;
devicename = g_strdup_printf("%s-swtpm", shortName); devicename = g_strdup_printf("%s-swtpm", shortName);
pidfile = virPidFileBuildPath(swtpmStateDir, devicename); pidfile = virPidFileBuildPath(swtpmStateDir, devicename);
VIR_FREE(devicename);
return pidfile; return pidfile;
} }
@ -433,7 +429,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath,
int exitstatus; int exitstatus;
int ret = -1; int ret = -1;
char uuid[VIR_UUID_STRING_BUFLEN]; char uuid[VIR_UUID_STRING_BUFLEN];
char *vmid = NULL; g_autofree char *vmid = NULL;
g_autofree char *swtpm_setup = virTPMGetSwtpmSetup(); g_autofree char *swtpm_setup = virTPMGetSwtpmSetup();
VIR_AUTOCLOSE pwdfile_fd = -1; VIR_AUTOCLOSE pwdfile_fd = -1;
@ -516,7 +512,6 @@ qemuTPMEmulatorRunSetup(const char *storagepath,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(vmid);
virCommandFree(cmd); virCommandFree(cmd);
return ret; return ret;
@ -554,7 +549,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDefPtr tpm,
{ {
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
bool created = false; bool created = false;
char *pidfile; g_autofree char *pidfile = NULL;
g_autofree char *swtpm = virTPMGetSwtpm(); g_autofree char *swtpm = virTPMGetSwtpm();
VIR_AUTOCLOSE pwdfile_fd = -1; VIR_AUTOCLOSE pwdfile_fd = -1;
VIR_AUTOCLOSE migpwdfile_fd = -1; VIR_AUTOCLOSE migpwdfile_fd = -1;
@ -615,7 +610,6 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDefPtr tpm,
virCommandAddArg(cmd, "--pid"); virCommandAddArg(cmd, "--pid");
virCommandAddArgFormat(cmd, "file=%s", pidfile); virCommandAddArgFormat(cmd, "file=%s", pidfile);
VIR_FREE(pidfile);
if (tpm->data.emulator.hassecretuuid) { if (tpm->data.emulator.hassecretuuid) {
if (!virTPMSwtpmCapsGet(VIR_TPM_SWTPM_FEATURE_CMDARG_PWD_FD)) { if (!virTPMSwtpmCapsGet(VIR_TPM_SWTPM_FEATURE_CMDARG_PWD_FD)) {
@ -669,8 +663,8 @@ qemuTPMEmulatorStop(const char *swtpmStateDir,
const char *shortName) const char *shortName)
{ {
virCommandPtr cmd; virCommandPtr cmd;
char *pathname; g_autofree char *pathname = NULL;
char *errbuf = NULL; g_autofree char *errbuf = NULL;
g_autofree char *swtpm_ioctl = virTPMGetSwtpmIoctl(); g_autofree char *swtpm_ioctl = virTPMGetSwtpmIoctl();
if (!swtpm_ioctl) if (!swtpm_ioctl)
@ -701,8 +695,7 @@ qemuTPMEmulatorStop(const char *swtpmStateDir,
unlink(pathname); unlink(pathname);
cleanup: cleanup:
VIR_FREE(pathname); return;
VIR_FREE(errbuf);
} }
@ -735,7 +728,7 @@ qemuExtTPMPrepareHost(virQEMUDriverPtr driver,
{ {
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
int ret = 0; int ret = 0;
char *shortName = NULL; g_autofree char *shortName = NULL;
switch (def->tpm->type) { switch (def->tpm->type) {
case VIR_DOMAIN_TPM_TYPE_EMULATOR: case VIR_DOMAIN_TPM_TYPE_EMULATOR:
@ -755,7 +748,6 @@ qemuExtTPMPrepareHost(virQEMUDriverPtr driver,
} }
cleanup: cleanup:
VIR_FREE(shortName);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
@ -885,7 +877,7 @@ qemuExtTPMStop(virQEMUDriverPtr driver,
virDomainObjPtr vm) virDomainObjPtr vm)
{ {
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
char *shortName = NULL; g_autofree char *shortName = NULL;
switch (vm->def->tpm->type) { switch (vm->def->tpm->type) {
case VIR_DOMAIN_TPM_TYPE_EMULATOR: case VIR_DOMAIN_TPM_TYPE_EMULATOR:
@ -902,7 +894,6 @@ qemuExtTPMStop(virQEMUDriverPtr driver,
} }
cleanup: cleanup:
VIR_FREE(shortName);
virObjectUnref(cfg); virObjectUnref(cfg);
} }
@ -913,7 +904,7 @@ qemuExtTPMSetupCgroup(virQEMUDriverPtr driver,
virCgroupPtr cgroup) virCgroupPtr cgroup)
{ {
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
char *shortName = NULL; g_autofree char *shortName = NULL;
int ret = -1, rc; int ret = -1, rc;
pid_t pid; pid_t pid;
@ -939,7 +930,6 @@ qemuExtTPMSetupCgroup(virQEMUDriverPtr driver,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(shortName);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;