From patchwork Wed Dec 19 12:33:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 207380 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 C5AD32C008E for ; Thu, 20 Dec 2012 02:04:03 +1100 (EST) Received: from localhost ([::1]:32819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlIrx-0005Tq-V5 for incoming@patchwork.ozlabs.org; Wed, 19 Dec 2012 07:35:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlIqu-0004DE-O0 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlIqp-0004GZ-EG for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlIqp-0004GO-5j for qemu-devel@nongnu.org; Wed, 19 Dec 2012 07:34:19 -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 qBJCYIVX021897 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Dec 2012 07:34:18 -0500 Received: from trasno.mitica (ovpn-113-59.phx2.redhat.com [10.3.113.59]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBJCXwub027690; Wed, 19 Dec 2012 07:34:17 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 19 Dec 2012 13:33:36 +0100 Message-Id: <1355920437-29882-14-git-send-email-quintela@redhat.com> In-Reply-To: <1355920437-29882-1-git-send-email-quintela@redhat.com> References: <1355920437-29882-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: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 13/34] migration: move migration thread init code to migrate_fd_put_ready 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 This way everything related with migration is run on the migration thread and no locking is needed. Signed-off-by: Juan Quintela --- migration.c | 29 +++++++++++++++++------------ migration.h | 1 + 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/migration.c b/migration.c index f32fe3e..90dbe8e 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" @@ -339,6 +340,16 @@ void migrate_fd_put_ready(MigrationState *s) DPRINTF("put_ready returning because of non-active state\n"); return; } + if (s->first_time) { + s->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); @@ -351,7 +362,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); @@ -445,19 +460,9 @@ bool migration_has_failed(MigrationState *s) void migrate_fd_connect(MigrationState *s) { - int ret; - s->state = MIG_STATE_ACTIVE; + s->first_time = true; 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) diff --git a/migration.h b/migration.h index b66fd60..8f2ff8a 100644 --- a/migration.h +++ b/migration.h @@ -46,6 +46,7 @@ struct MigrationState bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size; bool complete; + bool first_time; }; void process_incoming_migration(QEMUFile *f);