From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlGsO-000764-0G for qemu-devel@nongnu.org; Tue, 26 Nov 2013 06:32:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlGsF-0001uZ-J4 for qemu-devel@nongnu.org; Tue, 26 Nov 2013 06:32:19 -0500 Received: from mail-qe0-x22d.google.com ([2607:f8b0:400d:c02::22d]:58194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlGsF-0001uV-F9 for qemu-devel@nongnu.org; Tue, 26 Nov 2013 06:32:11 -0500 Received: by mail-qe0-f45.google.com with SMTP id 6so5449142qea.18 for ; Tue, 26 Nov 2013 03:32:11 -0800 (PST) Sender: Paolo Bonzini Message-ID: <529486B5.90500@redhat.com> Date: Tue, 26 Nov 2013 12:32:05 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1385025100-3191-1-git-send-email-lilei@linux.vnet.ibm.com> <1385025100-3191-17-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1385025100-3191-17-git-send-email-lilei@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 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: Lei Li Cc: aarcange@redhat.com, quintela@redhat.com, mdroth@linux.vnet.ibm.com, mrhines@linux.vnet.ibm.com, qemu-devel@nongnu.org, aliguori@amazon.com, lagarcia@br.ibm.com, rcj@linux.vnet.ibm.com Il 21/11/2013 10:11, 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..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); I'm not sure why you need this. > } 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); > + } This however is okay. Paolo > if (ret >= 0) { > qemu_file_set_rate_limit(s->file, INT_MAX); > qemu_savevm_state_complete(s->file); >