From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48192) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnPfu-0007g1-T3 for qemu-devel@nongnu.org; Mon, 02 Dec 2013 04:20:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VnPfl-0002pR-Ig for qemu-devel@nongnu.org; Mon, 02 Dec 2013 04:20:18 -0500 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:48841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VnPfk-0002nv-TU for qemu-devel@nongnu.org; Mon, 02 Dec 2013 04:20:09 -0500 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Dec 2013 14:50:06 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 905E1E005A for ; Mon, 2 Dec 2013 14:52:14 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rB29Jx3528246016 for ; Mon, 2 Dec 2013 14:49:59 +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 rB29K1R5003209 for ; Mon, 2 Dec 2013 14:50:02 +0530 From: Lei Li Date: Mon, 2 Dec 2013 17:19:16 +0800 Message-Id: <1385975957-22941-17-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1385975957-22941-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1385975957-22941-1-git-send-email-lilei@linux.vnet.ibm.com> Subject: [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: qemu-devel@nongnu.org Cc: aarcange@redhat.com, Lei Li , quintela@redhat.com, mrhines@linux.vnet.ibm.com, aliguori@amazon.com, lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com Signed-off-by: Lei Li --- migration.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/migration.c b/migration.c index e012cd4..7e0ec33 100644 --- a/migration.c +++ b/migration.c @@ -582,7 +582,7 @@ static void *migration_thread(void *opaque) if (pending_size && pending_size >= max_size) { qemu_savevm_state_iterate(s->file); } else { - int ret; + int ret = 0; DPRINTF("done iterating\n"); qemu_mutex_lock_iothread(); @@ -590,7 +590,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); -- 1.7.7.6