From patchwork Tue Jul 24 18:36:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 173040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 752882C0080 for ; Wed, 25 Jul 2012 05:34:25 +1000 (EST) Received: from localhost ([::1]:34975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stk0B-0002AR-Ub for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 14:38:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stjz2-0000Oi-TM for qemu-devel@nongnu.org; Tue, 24 Jul 2012 14:37:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Stjz0-0005bG-Ml for qemu-devel@nongnu.org; Tue, 24 Jul 2012 14:37:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57607) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stjz0-0005b2-DJ for qemu-devel@nongnu.org; Tue, 24 Jul 2012 14:37:22 -0400 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 q6OIbLYW008781 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 24 Jul 2012 14:37:21 -0400 Received: from trasno.mitica (ovpn-116-53.ams2.redhat.com [10.36.116.53]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6OIaqYn003393; Tue, 24 Jul 2012 14:37:20 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 24 Jul 2012 20:36:46 +0200 Message-Id: <1343155012-26316-22-git-send-email-quintela@redhat.com> In-Reply-To: <1343155012-26316-1-git-send-email-quintela@redhat.com> References: <1343155012-26316-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 21/27] migration: stop all cpus correctly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org You can only stop all cpus from the iothread or an vcpu. As we want to do it from the migration_thread, we need to do this dance with the botton handlers. This patch is a request for ideas. I can move this function to cpus.c, but wondered if there is an easy way of doing this? Signed-off-by: Juan Quintela --- migration.c | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/migration.c b/migration.c index cd1c11f..e3eec97 100644 --- a/migration.c +++ b/migration.c @@ -20,6 +20,7 @@ #include "sysemu.h" #include "block.h" #include "qemu_socket.h" +#include "qemu-thread.h" #include "block-migration.h" #include "qmp-commands.h" @@ -326,14 +327,37 @@ ssize_t migrate_fd_put_buffer(MigrationState *s, const void *data, return ret; } +static QemuCond migrate_vm_stop_cond; + +static void migrate_vm_stop(void *opaque) +{ + QEMUBH **bh = opaque; + vm_stop(RUN_STATE_FINISH_MIGRATE); + qemu_bh_delete(*bh); + qemu_cond_signal(&migrate_vm_stop_cond); +} + +extern QemuMutex qemu_global_mutex; + void migrate_fd_put_ready(MigrationState *s) { int ret; + static bool first_time = true; if (s->state != MIG_STATE_ACTIVE) { DPRINTF("put_ready returning because of non-active state\n"); return; } + if (first_time) { + first_time = false; + DPRINTF("beginning savevm\n"); + ret = qemu_savevm_state_begin(s->file, &s->params); + if (ret < 0) { + DPRINTF("failed, %d\n", ret); + migrate_fd_error(s); + return; + } + } DPRINTF("iterate\n"); ret = qemu_savevm_state_iterate(s->file); @@ -344,7 +368,16 @@ void migrate_fd_put_ready(MigrationState *s) DPRINTF("done iterating\n"); qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); - vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); + if (old_vm_running) { + QEMUBH *bh; + + qemu_cond_init(&migrate_vm_stop_cond); + bh = qemu_bh_new(migrate_vm_stop, &bh); + qemu_bh_schedule(bh); + qemu_cond_wait(&migrate_vm_stop_cond, &qemu_global_mutex); + } else { + vm_stop_force_state(RUN_STATE_FINISH_MIGRATE); + } if (qemu_savevm_state_complete(s->file) < 0) { migrate_fd_error(s); @@ -430,19 +463,8 @@ bool migration_has_failed(MigrationState *s) void migrate_fd_connect(MigrationState *s) { - int ret; - s->state = MIG_STATE_ACTIVE; qemu_fopen_ops_buffered(s); - - DPRINTF("beginning savevm\n"); - ret = qemu_savevm_state_begin(s->file, &s->params); - if (ret < 0) { - DPRINTF("failed, %d\n", ret); - migrate_fd_error(s); - return; - } - migrate_fd_put_ready(s); } static MigrationState *migrate_init(const MigrationParams *params)