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_autoptr where applicable

Browse Source 
This requires stealing one cmd pointer before returning it.

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:11:22 +01:00
parent 3f897afda6
commit 9226a627eb
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qemu/qemu_tpm.c
View File

@ -425,7 +425,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath,
const unsigned char *secretuuid, const unsigned char *secretuuid,
bool incomingMigration) bool incomingMigration)
{ {
virCommandPtr cmd = NULL; g_autoptr(virCommand) cmd = NULL;
int exitstatus; int exitstatus;
int ret = -1; int ret = -1;
char uuid[VIR_UUID_STRING_BUFLEN]; char uuid[VIR_UUID_STRING_BUFLEN];
@ -512,8 +512,6 @@ qemuTPMEmulatorRunSetup(const char *storagepath,
ret = 0; ret = 0;
cleanup: cleanup:
virCommandFree(cmd);
return ret; return ret;
} }
@ -547,7 +545,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDefPtr tpm,
const char *shortName, const char *shortName,
bool incomingMigration) bool incomingMigration)
{ {
virCommandPtr cmd = NULL; g_autoptr(virCommand) cmd = NULL;
bool created = false; bool created = false;
g_autofree char *pidfile = NULL; g_autofree char *pidfile = NULL;
g_autofree char *swtpm = virTPMGetSwtpm(); g_autofree char *swtpm = virTPMGetSwtpm();
@ -639,14 +637,12 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDefPtr tpm,
migpwdfile_fd = -1; migpwdfile_fd = -1;
} }
return cmd; return g_steal_pointer(&cmd);
error: error:
if (created) if (created)
qemuTPMDeleteEmulatorStorage(tpm); qemuTPMDeleteEmulatorStorage(tpm);
virCommandFree(cmd);
return NULL; return NULL;
} }
@ -703,7 +699,7 @@ int
qemuExtTPMInitPaths(virQEMUDriverPtr driver, qemuExtTPMInitPaths(virQEMUDriverPtr driver,
virDomainDefPtr def) virDomainDefPtr def)
{ {
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
int ret = 0; int ret = 0;
switch (def->tpm->type) { switch (def->tpm->type) {
@ -716,8 +712,6 @@ qemuExtTPMInitPaths(virQEMUDriverPtr driver,
break; break;
} }
virObjectUnref(cfg);
return ret; return ret;
} }
@ -726,7 +720,7 @@ int
qemuExtTPMPrepareHost(virQEMUDriverPtr driver, qemuExtTPMPrepareHost(virQEMUDriverPtr driver,
virDomainDefPtr def) virDomainDefPtr def)
{ {
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
int ret = 0; int ret = 0;
g_autofree char *shortName = NULL; g_autofree char *shortName = NULL;
@ -748,8 +742,6 @@ qemuExtTPMPrepareHost(virQEMUDriverPtr driver,
} }
cleanup: cleanup:
virObjectUnref(cfg);
return ret; return ret;
} }
@ -876,7 +868,7 @@ void
qemuExtTPMStop(virQEMUDriverPtr driver, qemuExtTPMStop(virQEMUDriverPtr driver,
virDomainObjPtr vm) virDomainObjPtr vm)
{ {
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
g_autofree char *shortName = NULL; g_autofree char *shortName = NULL;
switch (vm->def->tpm->type) { switch (vm->def->tpm->type) {
@ -894,7 +886,7 @@ qemuExtTPMStop(virQEMUDriverPtr driver,
} }
cleanup: cleanup:
virObjectUnref(cfg); return;
} }
@ -903,7 +895,7 @@ qemuExtTPMSetupCgroup(virQEMUDriverPtr driver,
virDomainDefPtr def, virDomainDefPtr def,
virCgroupPtr cgroup) virCgroupPtr cgroup)
{ {
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
g_autofree char *shortName = NULL; g_autofree char *shortName = NULL;
int ret = -1, rc; int ret = -1, rc;
pid_t pid; pid_t pid;
@ -930,7 +922,5 @@ qemuExtTPMSetupCgroup(virQEMUDriverPtr driver,
ret = 0; ret = 0;
cleanup: cleanup:
virObjectUnref(cfg);
return ret; return ret;
} }