From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:33061)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <quintela@redhat.com>) id 1TjUV9-0003Q4-DI
	for qemu-devel@nongnu.org; Fri, 14 Dec 2012 07:36:28 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <quintela@redhat.com>) id 1TjUV8-0006md-BI
	for qemu-devel@nongnu.org; Fri, 14 Dec 2012 07:36:27 -0500
Received: from mx1.redhat.com ([209.132.183.28]:27266)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <quintela@redhat.com>) id 1TjUV8-0006mY-3Z
	for qemu-devel@nongnu.org; Fri, 14 Dec 2012 07:36:26 -0500
Received: from int-mx10.intmail.prod.int.phx2.redhat.com
	(int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBECaOEr007393
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Fri, 14 Dec 2012 07:36:24 -0500
From: Juan Quintela <quintela@redhat.com>
In-Reply-To: <50A3B6E9.1020303@redhat.com> (Paolo Bonzini's message of "Wed,
	14 Nov 2012 16:21:13 +0100")
References: <1350545426-23172-1-git-send-email-quintela@redhat.com>
	<1350545426-23172-7-git-send-email-quintela@redhat.com>
	<50A0E123.4040406@redhat.com> <50A3B6E9.1020303@redhat.com>
Date: Fri, 14 Dec 2012 13:36:15 +0100
Message-ID: <87ehisg69s.fsf@elfo.mitica>
MIME-Version: 1.0
Content-Type: text/plain
Subject: Re: [Qemu-devel] [PATCH 06/30] migration: stop all cpus correctly
Reply-To: quintela@redhat.com
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org

Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 12/11/2012 12:44, Paolo Bonzini ha scritto:
>>> @@ -339,7 +351,11 @@ void migrate_fd_put_ready(MigrationState *s)
>>>          DPRINTF("done iterating\n");
>>>          start_time = qemu_get_clock_ms(rt_clock);
>>>          qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
>>> -        vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
>>> +        if (old_vm_running) {
>>> +            vm_stop(RUN_STATE_FINISH_MIGRATE);
>>> +        } else {
>>> +            vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
>>> +        }
>>> 
>>>          if (qemu_savevm_state_complete(s->file) < 0) {
>>>              migrate_fd_error(s);
>
> This hunk also seems to be useless nowadays.

it is needed for when we are migrating in suspended state.  We need to
fix it some other way, but it needs to remaing for now.