From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZZ5h-00005f-2q for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:33:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZZ5Y-0008US-5K for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:33:41 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:48554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZZ5X-0008UE-HM for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:33:32 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 25 Oct 2013 10:03:29 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 36C701258017 for ; Fri, 25 Oct 2013 10:04:01 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9P4aPB840042698 for ; Fri, 25 Oct 2013 10:06:25 +0530 Received: from d28av01.in.ibm.com (localhost [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9P4XPJ9004236 for ; Fri, 25 Oct 2013 10:03:26 +0530 Message-ID: <5269F493.2010606@linux.vnet.ibm.com> Date: Fri, 25 Oct 2013 12:33:23 +0800 From: Lei Li MIME-Version: 1.0 References: <1382412341-1173-1-git-send-email-lilei@linux.vnet.ibm.com> <1382412341-1173-17-git-send-email-lilei@linux.vnet.ibm.com> <52692B9F.4020909@redhat.com> In-Reply-To: <52692B9F.4020909@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 16/17] migration: adjust migration_thread() process for page flipping List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: aarcange@redhat.com, quintela@redhat.com, mdroth@linux.vnet.ibm.com, mrhines@linux.vnet.ibm.com, qemu-devel@nongnu.org, Anthony Liguori , lagarcia@br.ibm.com, rcj@linux.vnet.ibm.com On 10/24/2013 10:15 PM, Paolo Bonzini wrote: > Il 22/10/2013 04:25, Lei Li ha scritto: >> Signed-off-by: Lei Li >> --- >> migration.c | 10 +++++++--- >> 1 files changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/migration.c b/migration.c >> index 4ac466b..568b73a 100644 >> --- a/migration.c >> +++ b/migration.c >> @@ -579,10 +579,11 @@ static void *migration_thread(void *opaque) >> pending_size = qemu_savevm_state_pending(s->file, max_size); >> DPRINTF("pending size %" PRIu64 " max %" PRIu64 "\n", >> pending_size, max_size); >> - if (pending_size && pending_size >= max_size) { >> + if (pending_size && pending_size >= max_size && >> + !migrate_unix_page_flipping()) { > This is a bit ugly but I understand the need. Perhaps "&& > !runstate_needs_reset()" like below? '&& !runstate_needs_reset()' is fine, thanks. > > Paolo > >> qemu_savevm_state_iterate(s->file); >> } else { >> - int ret; >> + int ret = 0; >> >> DPRINTF("done iterating\n"); >> qemu_mutex_lock_iothread(); >> @@ -590,7 +591,10 @@ static void *migration_thread(void *opaque) >> qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); >> old_vm_running = runstate_is_running(); >> >> - ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); >> + if (!runstate_needs_reset()) { >> + ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); >> + } >> + >> if (ret >= 0) { >> qemu_file_set_rate_limit(s->file, INT_MAX); >> qemu_savevm_state_complete(s->file); >> > -- Lei