Skip to content

Commit 00f6822

Browse files
phip1611rbradford
authored andcommitted
misc: Remove more "local" migration inconsistencies
On-behalf-of: SAP philipp.schuster@sap.com Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>
1 parent 40e3d3f commit 00f6822

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

cloud-hypervisor/tests/integration.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6737,8 +6737,8 @@ mod common_parallel {
67376737
handle_child_output(r, &output);
67386738
}
67396739

6740-
// This test exercises the local live-migration between two Cloud Hypervisor VMs on the
6741-
// same host. It ensures the following behaviors:
6740+
// This helper exercises migration between two Cloud Hypervisor VMs on the
6741+
// same host:
67426742
// 1. The source VM is up and functional (including various virtio-devices are working properly);
67436743
// 2. The 'send-migration' and 'receive-migration' command finished successfully;
67446744
// 3. The source VM terminated gracefully after live migration;

virtio-devices/src/vhost_user/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ impl VhostUserCommon {
779779
let snapshot = Snapshot::new_from_state(state)?;
780780

781781
if self.migration_started {
782-
// Local migration does not enable dirty logging.
782+
// Precopy migration may enable dirty logging.
783783
if self.dirty_logging {
784784
self.saved_dirty_log = Some(self.dirty_log()?);
785785
}

vm-migration/src/context.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@ impl MemoryMigrationContext {
288288

289289
/// Returns an empty finalized block.
290290
///
291-
/// This can be used if no memory was transferred (e.g., local migration).
291+
/// This can be used if no memory was transferred eagerly (e.g., local or
292+
/// postcopy migration).
292293
pub fn empty_finalized() -> Self {
293294
let mut this = Self::new();
294295
this.finalize();

vmm/src/api/openapi/cloud-hypervisor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,7 @@ components:
17651765
description: >
17661766
The number of parallel TCP connections to use for migration.
17671767
Must be between 1 and 128. Multiple connections are not supported
1768-
with local UNIX-socket migration.
1768+
with UNIX domain socket migration.
17691769
tls_dir:
17701770
type: string
17711771
description: >

0 commit comments

Comments
 (0)