From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 14 Dec 2022 09:18:54 +0000 (+0100)
Subject: qemu_security: Rename qemuSecurityCleanupTPMEmulator()
X-Git-Tag: v9.0.0-rc1~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51b92836ff0a771adcace52d393d74ea583bb692;p=thirdparty%2Flibvirt.git

qemu_security: Rename qemuSecurityCleanupTPMEmulator()

The qemuSecurityCleanupTPMEmulator() function calls
virSecurityManagerRestoreTPMLabels() and thus the proper name is
qemuSecurityRestoreTPMLabels(). Rename it.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c
index a0b78764e5..82d686b0e3 100644
--- a/src/qemu/qemu_security.c
+++ b/src/qemu/qemu_security.c
@@ -577,9 +577,9 @@ qemuSecurityStartTPMEmulator(virQEMUDriver *driver,
 
 
 int
-qemuSecurityCleanupTPMEmulator(virQEMUDriver *driver,
-                               virDomainObj *vm,
-                               bool restoreTPMStateLabel)
+qemuSecurityRestoreTPMLabels(virQEMUDriver *driver,
+                             virDomainObj *vm,
+                             bool restoreTPMStateLabel)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     int ret = -1;
diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h
index 0b19f48ef2..b6f917a62f 100644
--- a/src/qemu/qemu_security.h
+++ b/src/qemu/qemu_security.h
@@ -94,9 +94,9 @@ int qemuSecurityStartTPMEmulator(virQEMUDriver *driver,
                                  int *exitstatus,
                                  int *cmdret);
 
-int qemuSecurityCleanupTPMEmulator(virQEMUDriver *driver,
-                                   virDomainObj *vm,
-                                   bool restoreTPMStateLabel);
+int qemuSecurityRestoreTPMLabels(virQEMUDriver *driver,
+                                 virDomainObj *vm,
+                                 bool restoreTPMStateLabel);
 
 int qemuSecuritySetSavedStateLabel(virQEMUDriver *driver,
                                    virDomainObj *vm,
diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index 8778d43913..200ff0de6f 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -1143,7 +1143,7 @@ qemuExtTPMStop(virQEMUDriver *driver,
     if (outgoingMigration || qemuTPMHasSharedStorage(vm->def))
         restoreTPMStateLabel = false;
 
-    if (qemuSecurityCleanupTPMEmulator(driver, vm, restoreTPMStateLabel) < 0)
+    if (qemuSecurityRestoreTPMLabels(driver, vm, restoreTPMStateLabel) < 0)
         VIR_WARN("Unable to restore labels on TPM state and/or log file");
 }