From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjQJg-0007is-Lk for qemu-devel@nongnu.org; Thu, 21 Nov 2013 04:13:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjQJX-0003cO-IL for qemu-devel@nongnu.org; Thu, 21 Nov 2013 04:12:52 -0500 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:55839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjQJW-0003c2-Oj for qemu-devel@nongnu.org; Thu, 21 Nov 2013 04:12:43 -0500 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 21 Nov 2013 14:42:41 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 84B94125805A for ; Thu, 21 Nov 2013 14:43:33 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rAL9CWl559637922 for ; Thu, 21 Nov 2013 14:42:32 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rAL9CclZ000611 for ; Thu, 21 Nov 2013 14:42:38 +0530 From: Lei Li Date: Thu, 21 Nov 2013 17:11:39 +0800 Message-Id: <1385025100-3191-17-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1385025100-3191-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1385025100-3191-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, mdroth@linux.vnet.ibm.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 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/migration.c b/migration.c index 4ac466b..0f98ac1 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 && + !runstate_needs_reset()) { 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); -- 1.7.7.6