"Wang, Wei W" <wei.w.w...@intel.com> wrote: > On Wednesday, October 11, 2023 8:41 PM, Juan Quintela wrote: >> Wei Wang <wei.w.w...@intel.com> wrote: >> > Current migration_completion function is a bit long. Refactor the long >> > implementation into different subfunctions: >> > - migration_completion_precopy: completion code related to precopy >> > - migration_completion_postcopy: completion code related to postcopy >> > - close_return_path_on_source: rp thread related cleanup on migration >> > completion. It is named to match with open_return_path_on_source. >> > >> > This improves readability and is easier for future updates (e.g. add >> > new subfunctions when completion code related to new features are >> > needed). No functional changes intended. >> > >> > Signed-off-by: Wei Wang <wei.w.w...@intel.com> >> >> There was some conflict with: >> >> commit d50f5dc075cbb891bfe4a9378600a4871264468a >> Author: Fabiano Rosas <faro...@suse.de> >> Date: Mon Sep 18 14:28:20 2023 -0300 >> >> migration: Consolidate return path closing code >> >> (basically the traces and the rp_thread_created check were already on the >> tree). >> >> BTW, the diff is uglier than it needs to be. >> >> You can add to your global .gitconfig: >> >> [diff] >> algorithm = patience >> renames = true > > Yeah, this generates a nicer diff, thanks. > I'll rebase and resend it.
Already on the pull request. I have to fix the conflict, but it has the same changes that yours as far as I can see. Later, Juan.