From f9cd29a2e44d61da0fc94f245d27206ea66e1161 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 25 Feb 2021 11:41:08 +0100 Subject: [PATCH] qemu_tpm: Move logfile path generation into a separate function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Strictly not needed, but the rest of paths is generated in separate functions. Helps with code readability. Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko --- src/qemu/qemu_tpm.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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) { -- 2.47.2