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 a0b78764e58e0398743dd9f82ff7e10950f68664..82d686b0e3dd21d8dd1728fefdf2aedd139eb0a4 100644 (file)
--- 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 0b19f48ef29d8bd937f55edfeb957288667a1112..b6f917a62fa6ce2b72a5dccde19ca1c7c12e274b 100644 (file)
--- 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 8778d43913336498eb29d16eb29885aa5f546db3..200ff0de6f4c831fd384273b1122ef622691f902 100644 (file)
--- 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");
 }