From patchwork Wed Aug 12 21:04:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 506524 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CD772140129 for ; Wed, 12 Aug 2015 19:13:58 +1000 (AEST) Received: from localhost ([::1]:37565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPS6e-0001Wo-Uy for incoming@patchwork.ozlabs.org; Wed, 12 Aug 2015 05:13:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPS69-0000YB-Js for qemu-devel@nongnu.org; Wed, 12 Aug 2015 05:13:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPS65-0003Wk-Ae for qemu-devel@nongnu.org; Wed, 12 Aug 2015 05:13:25 -0400 Received: from mga02.intel.com ([134.134.136.20]:44934) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPS65-0003WM-2N; Wed, 12 Aug 2015 05:13:21 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 12 Aug 2015 02:13:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,660,1432623600"; d="scan'208";a="747010261" Received: from ll.sh.intel.com (HELO localhost) ([10.239.13.27]) by orsmga001.jf.intel.com with ESMTP; 12 Aug 2015 02:13:18 -0700 From: Liang Li To: qemu-devel@nongnu.org Date: Thu, 13 Aug 2015 05:04:24 +0800 Message-Id: <1439413464-7326-3-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439413464-7326-1-git-send-email-liang.z.li@intel.com> References: <1439413464-7326-1-git-send-email-liang.z.li@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Cc: qemu-block@nongnu.org, quintela@redhat.com, Liang Li , yang.z.zhang@intel.com, stefanha@redhat.com, amit.shah@redhat.com Subject: [Qemu-devel] [PATCH 2/2] migration: rename qemu_savevm_state_cancel 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 The function qemu_savevm_state_cancel is called after the migration in migration_thread, it seems strange to 'cancel' it after completion, rename it to qemu_savevm_state_cleanup looks better. Signed-off-by: Liang Li --- include/sysemu/sysemu.h | 2 +- migration/migration.c | 4 ++-- migration/savevm.c | 6 +++--- trace-events | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 44570d1..9cc0240 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -88,7 +88,7 @@ void qemu_savevm_state_begin(QEMUFile *f, void qemu_savevm_state_header(QEMUFile *f); int qemu_savevm_state_iterate(QEMUFile *f); void qemu_savevm_state_complete(QEMUFile *f); -void qemu_savevm_state_cancel(void); +void qemu_savevm_state_cleanup(void); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); int qemu_loadvm_state(QEMUFile *f); diff --git a/migration/migration.c b/migration/migration.c index c22095e..e7fe50f 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -561,7 +561,7 @@ static void migrate_fd_cleanup(void *opaque) assert(s->state != MIGRATION_STATUS_ACTIVE); if (s->state != MIGRATION_STATUS_COMPLETED) { - qemu_savevm_state_cancel(); + qemu_savevm_state_cleanup(); if (s->state == MIGRATION_STATUS_CANCELLING) { migrate_set_state(s, MIGRATION_STATUS_CANCELLING, MIGRATION_STATUS_CANCELLED); @@ -1010,7 +1010,7 @@ static void *migration_thread(void *opaque) qemu_mutex_lock_iothread(); end_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); - qemu_savevm_state_cancel(); + qemu_savevm_state_cleanup(); if (s->state == MIGRATION_STATUS_COMPLETED) { uint64_t transferred_bytes = qemu_ftell(s->file); diff --git a/migration/savevm.c b/migration/savevm.c index 6071215..b141b17 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -905,11 +905,11 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) return ret; } -void qemu_savevm_state_cancel(void) +void qemu_savevm_state_cleanup(void) { SaveStateEntry *se; - trace_savevm_state_cancel(); + trace_savevm_state_cleanup(); QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { if (se->ops && se->ops->cancel) { se->ops->cancel(se->opaque); @@ -946,7 +946,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp) ret = qemu_file_get_error(f); } if (ret != 0) { - qemu_savevm_state_cancel(); + qemu_savevm_state_cleanup(); error_setg_errno(errp, -ret, "Error while writing VM state"); } return ret; diff --git a/trace-events b/trace-events index 94bf3bb..102373c 100644 --- a/trace-events +++ b/trace-events @@ -1195,7 +1195,7 @@ savevm_state_begin(void) "" savevm_state_header(void) "" savevm_state_iterate(void) "" savevm_state_complete(void) "" -savevm_state_cancel(void) "" +savevm_state_cleanup(void) "" vmstate_save(const char *idstr, const char *vmsd_name) "%s, %s" vmstate_load(const char *idstr, const char *vmsd_name) "%s, %s" qemu_announce_self_iter(const char *mac) "%s"