qemu: Rename outgoingMigration parameter in various TPM functions

The parameter is used to skip TPM state cleanup on outgoing migration
with shared storage. But we also need to skip the cleanup after a failed
incoming migration. Let's call the parameter "migration" to reflect its
usage on both sides of migration.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index c3ca4b30402aa2cf432fbd73b922cb09cb60f26c..47c110c6d7dc05f96188aa9b079ef13e4f61890e 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5790,7 +5790,7 @@ static void
 qemuDomainRemoveInactiveCommon(virQEMUDriver *driver,
                                virDomainObj *vm,
                                virDomainUndefineFlagsValues flags,
-                               bool outgoingMigration)
+                               bool migration)
 {
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     g_autofree char *snapDir = NULL;
@@ -5816,7 +5816,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver,
         if (rmdir(chkDir) < 0 && errno != ENOENT)
             VIR_WARN("unable to remove checkpoint directory %s", chkDir);
     }
-    qemuExtDevicesCleanupHost(driver, vm->def, flags, outgoingMigration);
+    qemuExtDevicesCleanupHost(driver, vm->def, flags, migration);
 }
 
 
@@ -5829,14 +5829,14 @@ void
 qemuDomainRemoveInactive(virQEMUDriver *driver,
                          virDomainObj *vm,
                          virDomainUndefineFlagsValues flags,
-                         bool outgoingMigration)
+                         bool migration)
 {
     if (vm->persistent) {
         /* Short-circuit, we don't want to remove a persistent domain */
         return;
     }
 
-    qemuDomainRemoveInactiveCommon(driver, vm, flags, outgoingMigration);
+    qemuDomainRemoveInactiveCommon(driver, vm, flags, migration);
 
     virDomainObjListRemove(driver->domains, vm);
 }

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 70e1fb187fa979f9fcd62323dd6b943c3bd18431..6fd47f16e7ac466e392acdde9648a839590ec8ec 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -693,7 +693,7 @@ int qemuDomainMomentDiscardAll(void *payload,
 void qemuDomainRemoveInactive(virQEMUDriver *driver,
                               virDomainObj *vm,
                               virDomainUndefineFlagsValues flags,
-                              bool outgoingMigration);
+                              bool migration);
 
 void
 qemuDomainRemoveInactiveLocked(virQEMUDriver *driver,

diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 78e72b7c10b48f7f629232515ddc98df8b9baf19..31c7a1415606d27eb44ac38954685e10774b5e91 100644 (file)
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -154,7 +154,7 @@ void
 qemuExtDevicesCleanupHost(virQEMUDriver *driver,
                           virDomainDef *def,
                           virDomainUndefineFlagsValues flags,
-                          bool outgoingMigration)
+                          bool migration)
 {
     size_t i;
 
@@ -165,7 +165,7 @@ qemuExtDevicesCleanupHost(virQEMUDriver *driver,
         virDomainTPMDef *tpm = def->tpms[i];
 
         if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR)
-            qemuExtTPMCleanupHost(driver, tpm, flags, outgoingMigration);
+            qemuExtTPMCleanupHost(driver, tpm, flags, migration);
     }
 }
 
@@ -280,7 +280,7 @@ qemuExtDevicesStart(virQEMUDriver *driver,
 void
 qemuExtDevicesStop(virQEMUDriver *driver,
                    virDomainObj *vm,
-                   bool outgoingMigration)
+                   bool migration)
 {
     virDomainDef *def = vm->def;
     size_t i;
@@ -297,7 +297,7 @@ qemuExtDevicesStop(virQEMUDriver *driver,
 
     for (i = 0; i < def->ntpms; i++) {
         if (def->tpms[i]->type == VIR_DOMAIN_TPM_TYPE_EMULATOR)
-            qemuExtTPMStop(driver, vm, outgoingMigration);
+            qemuExtTPMStop(driver, vm, migration);
     }
 
     for (i = 0; i < def->nnets; i++) {

diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
index d4ac9f395c8d5d59ca775220177fcca829350a79..36f7fb77a8526cc3f8397dae917afcb1229e94ff 100644 (file)
--- a/src/qemu/qemu_extdevice.h
+++ b/src/qemu/qemu_extdevice.h
@@ -48,7 +48,7 @@ int qemuExtDevicesPrepareHost(virQEMUDriver *driver,
 void qemuExtDevicesCleanupHost(virQEMUDriver *driver,
                                virDomainDef *def,
                                virDomainUndefineFlagsValues flags,
-                               bool outgoingMigration)
+                               bool migration)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
 int qemuExtDevicesStart(virQEMUDriver *driver,
@@ -59,7 +59,7 @@ int qemuExtDevicesStart(virQEMUDriver *driver,
 
 void qemuExtDevicesStop(virQEMUDriver *driver,
                         virDomainObj *vm,
-                        bool outgoingMigration)
+                        bool migration)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
 bool qemuExtDevicesHasDevice(virDomainDef *def);

diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index 3e97518c06a3fe57445316ccc645bfffbfb70acd..0d3be3971a0a42a0671c8326924a0d3159377ce3 100644 (file)
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -929,7 +929,8 @@ qemuTPMEmulatorInitPaths(virDomainTPMDef *tpm,
  * @driver: QEMU driver
  * @tpm: TPM definition
  * @flags: flags indicating whether to keep or remove TPM persistent state
- * @outgoingMigration: whether cleanup is due to an outgoing migration
+ * @migration: whether cleanup is due to a successful outgoing or failed
+ *      incoming migration
  *
  * Clean up persistent storage for the swtpm.
  */
@@ -937,14 +938,12 @@ static void
 qemuTPMEmulatorCleanupHost(virQEMUDriver *driver,
                            virDomainTPMDef *tpm,
                            virDomainUndefineFlagsValues flags,
-                           bool outgoingMigration)
+                           bool migration)
 {
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
 
-    /* Never remove the state in case of outgoing migration with shared
-     * storage.
-     */
-    if (outgoingMigration &&
+    /* Never remove the state in case of migration with shared storage. */
+    if (migration &&
         virFileIsSharedFS(tpm->data.emulator.source_path, cfg->sharedFilesystems) == 1)
         return;
 
@@ -1315,9 +1314,9 @@ void
 qemuExtTPMCleanupHost(virQEMUDriver *driver,
                       virDomainTPMDef *tpm,
                       virDomainUndefineFlagsValues flags,
-                      bool outgoingMigration)
+                      bool migration)
 {
-    qemuTPMEmulatorCleanupHost(driver, tpm, flags, outgoingMigration);
+    qemuTPMEmulatorCleanupHost(driver, tpm, flags, migration);
 }
 
 
@@ -1341,7 +1340,7 @@ qemuExtTPMStart(virQEMUDriver *driver,
 void
 qemuExtTPMStop(virQEMUDriver *driver,
                virDomainObj *vm,
-               bool outgoingMigration)
+               bool migration)
 {
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     g_autofree char *shortName = virDomainDefGetShortName(vm->def);
@@ -1351,7 +1350,7 @@ qemuExtTPMStop(virQEMUDriver *driver,
         return;
 
     qemuTPMEmulatorStop(cfg->swtpmStateDir, shortName);
-    if (outgoingMigration && qemuTPMHasSharedStorage(driver, vm->def))
+    if (migration && qemuTPMHasSharedStorage(driver, vm->def))
         restoreTPMStateLabel = false;
 
     if (qemuSecurityRestoreTPMLabels(driver, vm, restoreTPMStateLabel, false) < 0)

diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h
index 7096060a2aa2dcf5e3129ea5265e503d220df234..37813087cfcf03b4754c6e56821d7a00059c395c 100644 (file)
--- a/src/qemu/qemu_tpm.h
+++ b/src/qemu/qemu_tpm.h
@@ -38,7 +38,7 @@ int qemuExtTPMPrepareHost(virQEMUDriver *driver,
 void qemuExtTPMCleanupHost(virQEMUDriver *driver,
                            virDomainTPMDef *tpm,
                            virDomainUndefineFlagsValues flags,
-                           bool outgoingMigration)
+                           bool migration)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
 int qemuExtTPMStart(virQEMUDriver *driver,
@@ -52,7 +52,7 @@ int qemuExtTPMStart(virQEMUDriver *driver,
 
 void qemuExtTPMStop(virQEMUDriver *driver,
                     virDomainObj *vm,
-                    bool outgoingMigration)
+                    bool migration)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
 int qemuExtTPMSetupCgroup(virQEMUDriver *driver,