From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 25 Feb 2021 10:41:08 +0000 (+0100)
Subject: qemu_tpm: Move logfile path generation into a separate function
X-Git-Tag: v7.2.0-rc1~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9cd29a2e44d61da0fc94f245d27206ea66e1161;p=thirdparty%2Flibvirt.git

qemu_tpm: Move logfile path generation into a separate function

Strictly not needed, but the rest of paths is generated in
separate functions. Helps with code readability.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index f94cad8230..71339b785a 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -82,6 +82,21 @@ qemuTPMCreateEmulatorStoragePath(const char *swtpmStorageDir,
 }
 
 
+/**
+ * qemuTPMCreateEmulatorLogPath:
+ * @logDir: directory where swtpm writes its logs into
+ * @vmname: name of the VM
+ *
+ * Create the swtpm's log path.
+ */
+static char*
+qemuTPMCreateEmulatorLogPath(const char *logDir,
+                             const char *vmname)
+{
+    return g_strdup_printf("%s/%s-swtpm.log", logDir, vmname);
+}
+
+
 /*
  * qemuTPMEmulatorInitStorage
  *
@@ -286,7 +301,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm,
 
     /* create logfile name ... */
     if (!tpm->data.emulator.logfile)
-        tpm->data.emulator.logfile = g_strdup_printf("%s/%s-swtpm.log", logDir, vmname);
+        tpm->data.emulator.logfile = qemuTPMCreateEmulatorLogPath(logDir, vmname);
 
     if (!virFileExists(tpm->data.emulator.logfile) &&
         virFileTouch(tpm->data.emulator.logfile, 0644) < 0) {