From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmKyv-0008Vf-De for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmKym-000846-E3 for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:29 -0500 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:35774) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmKyl-00083c-OL for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:07:20 -0500 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 29 Nov 2013 20:07:18 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id B2B2B2CE8051 for ; Fri, 29 Nov 2013 21:07:15 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rAT9n8Xc1573284 for ; Fri, 29 Nov 2013 20:49:08 +1100 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rATA7ERc012883 for ; Fri, 29 Nov 2013 21:07:14 +1100 From: Lei Li Date: Fri, 29 Nov 2013 18:06:23 +0800 Message-Id: <1385719584-21114-17-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1385719584-21114-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1385719584-21114-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 4ac466b..68b5b02 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