From patchwork Wed Apr 21 05:57:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 93818 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 o3L62Lmn005310 for ; Wed, 21 Apr 2010 06:02:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752471Ab0DUGCc (ORCPT ); Wed, 21 Apr 2010 02:02:32 -0400 Received: from sh.osrg.net ([192.16.179.4]:58785 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752072Ab0DUGCC (ORCPT ); Wed, 21 Apr 2010 02:02:02 -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 o3L61QCM004091; Wed, 21 Apr 2010 15:01:27 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 493093E02FE; Wed, 21 Apr 2010 15:01:25 +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, yoshikawa.takuya@oss.ntt.co.jp, Yoshiaki Tamura Subject: [RFC PATCH 17/20] Modify migrate_fd_put_ready() when ft_mode is on. Date: Wed, 21 Apr 2010 14:57:22 +0900 Message-Id: <1271829445-5328-18-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 67 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 21 Apr 2010 06:02:46 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 21 Apr 2010 15:01:27 +0900 (JST) X-Virus-Scanned: clamav-milter 0.95.3 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 3cc47fc..c81fdb4 100644 --- a/migration.c +++ b/migration.c @@ -494,8 +494,32 @@ 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_put_vector, + migrate_fd_get_buffer, + NULL, + migrate_fd_close, + 1); + + /* events are tapped from now. */ + event_tap_on(); + + if (old_vm_running) { + vm_start(); + } + } else { + migrate_fd_cleanup(s); + s->state = state; + } } } @@ -515,8 +539,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_off(); + } + + qemu_savevm_state_cancel(s->mon, s->file); migrate_fd_cleanup(s); }