]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu_tpm: Move logfile path generation into a separate function
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 25 Feb 2021 10:41:08 +0000 (11:41 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 2 Mar 2021 08:44:03 +0000 (09:44 +0100)
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>
src/qemu/qemu_tpm.c

index f94cad8230b7439b9906cff8b6cbab6b58a0a6c2..71339b785ae16f88823722deee3862bed321522d 100644 (file)
@@ -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) {