qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: "Wang, Wei W" <wei.w.wang@intel.com>
Cc: "peterx@redhat.com" <peterx@redhat.com>,
	 "isaku.yamahata@gmail.com" <isaku.yamahata@gmail.com>,
	 "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Subject: Re: [PATCH v2] migration: refactor migration_completion
Date: Wed, 11 Oct 2023 22:31:31 +0200	[thread overview]
Message-ID: <87mswo7vfg.fsf@secure.mitica> (raw)
In-Reply-To: <DS0PR11MB637312D6D5D3E178D4B034D5DCCCA@DS0PR11MB6373.namprd11.prod.outlook.com> (Wei W. Wang's message of "Wed, 11 Oct 2023 14:45:28 +0000")

"Wang, Wei W" <wei.w.wang@intel.com> wrote:
> On Wednesday, October 11, 2023 8:41 PM, Juan Quintela wrote:
>> Wei Wang <wei.w.wang@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.wang@intel.com>
>> 
>> There was some conflict with:
>> 
>> commit d50f5dc075cbb891bfe4a9378600a4871264468a
>> Author: Fabiano Rosas <farosas@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.



  reply	other threads:[~2023-10-11 20:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-04  9:30 [PATCH v2] migration: refactor migration_completion Wei Wang
2023-08-04 13:37 ` Peter Xu
2023-10-11  9:03   ` Wang, Wei W
2023-08-14 22:14 ` Isaku Yamahata
2023-10-11 11:22 ` Juan Quintela
2023-10-11 12:41 ` Juan Quintela
2023-10-11 14:45   ` Wang, Wei W
2023-10-11 20:31     ` Juan Quintela [this message]
2023-10-12 14:36       ` Wang, Wei W
2023-10-12 14:43   ` Wang, Wei W

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87mswo7vfg.fsf@secure.mitica \
    --to=quintela@redhat.com \
    --cc=isaku.yamahata@gmail.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=wei.w.wang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).