From patchwork Tue May 25 08:37:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 102102 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4P8ehcA029815 for ; Tue, 25 May 2010 08:40:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756312Ab0EYIkl (ORCPT ); Tue, 25 May 2010 04:40:41 -0400 Received: from sh.osrg.net ([192.16.179.4]:34877 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756236Ab0EYIkj (ORCPT ); Tue, 25 May 2010 04:40:39 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o4P8eJpG010288; Tue, 25 May 2010 17:40:19 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id F38E53E030A; Tue, 25 May 2010 17:40:17 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: avi@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura Subject: [RFC PATCH 19/23] Introduce ft_tranx_ready(), and modify migrate_fd_put_ready() when ft_mode is on. Date: Tue, 25 May 2010 17:37:00 +0900 Message-Id: <1274776624-16435-21-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 124 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 25 May 2010 08:40:43 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Tue, 25 May 2010 17:40:19 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96 at sh X-Virus-Status: Clean Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/migration.c b/migration.c index 2adf7ad..5b90d37 100644 --- a/migration.c +++ b/migration.c @@ -21,6 +21,7 @@ #include "qemu_socket.h" #include "block-migration.h" #include "qemu-objects.h" +#include "event-tap.h" //#define DEBUG_MIGRATION @@ -375,6 +376,49 @@ void migrate_fd_connect(FdMigrationState *s) migrate_fd_put_ready(s); } +static int ft_tranx_ready(void) +{ + FdMigrationState *s = migrate_to_fms(current_migration); + int ret = -1; + + if (ft_mode != FT_TRANSACTION && ft_mode != FT_INIT) { + return ret; + } + + if (qemu_transaction_begin(s->file) < 0) { + fprintf(stderr, "tranx_begin failed\n"); + goto error_out; + } + + /* make the VM state consistent by flushing outstanding requests. */ + vm_stop(0); + qemu_aio_flush(); + bdrv_flush_all(); + + if (qemu_savevm_state_all(s->mon, s->file) < 0) { + fprintf(stderr, "savevm_state_all failed\n"); + goto error_out; + } + + if (qemu_transaction_commit(s->file) < 0) { + fprintf(stderr, "tranx_commit failed\n"); + goto error_out; + } + + ret = 0; + goto unpause_out; + +error_out: + ft_mode = FT_OFF; + qemu_savevm_state_cancel(s->mon, s->file); + migrate_fd_cleanup(s); + event_tap_unregister(); + +unpause_out: + vm_start(); + return ret; +} + void migrate_fd_put_ready(void *opaque) { FdMigrationState *s = opaque; @@ -402,8 +446,30 @@ void migrate_fd_put_ready(void *opaque) } else { state = MIG_STATE_COMPLETED; } - migrate_fd_cleanup(s); - s->state = state; + + if (ft_mode && state == MIG_STATE_COMPLETED) { + /* close buffered_file and open ft_transaction. + * Note: file discriptor won't get closed, + * but reused by ft_transaction. */ + socket_set_block(s->fd); + socket_set_nodelay(s->fd); + qemu_fclose(s->file); + s->file = qemu_fopen_ops_ft_tranx(s, + migrate_fd_put_buffer, + migrate_fd_get_buffer, + migrate_fd_close, + 1); + + /* events are tapped from now. */ + event_tap_register(ft_tranx_ready); + + if (old_vm_running) { + vm_start(); + } + } else { + migrate_fd_cleanup(s); + s->state = state; + } } } @@ -423,8 +489,14 @@ void migrate_fd_cancel(MigrationState *mig_state) DPRINTF("cancelling migration\n"); s->state = MIG_STATE_CANCELLED; - qemu_savevm_state_cancel(s->mon, s->file); + if (ft_mode == FT_TRANSACTION) { + qemu_transaction_cancel(s->file); + ft_mode = FT_OFF; + event_tap_unregister(); + } + + qemu_savevm_state_cancel(s->mon, s->file); migrate_fd_cleanup(s); }