From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VC2iW-0000H0-Pu for qemu-devel@nongnu.org; Wed, 21 Aug 2013 03:20:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VC2iN-0000uT-F4 for qemu-devel@nongnu.org; Wed, 21 Aug 2013 03:20:32 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:37658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VC2iM-0000tp-PE for qemu-devel@nongnu.org; Wed, 21 Aug 2013 03:20:23 -0400 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 21 Aug 2013 12:40:49 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 47C6B3940059 for ; Wed, 21 Aug 2013 12:50:09 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r7L7KFdI46203020 for ; Wed, 21 Aug 2013 12:50:16 +0530 Received: from d28av01.in.ibm.com (localhost [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r7L7KIGl025451 for ; Wed, 21 Aug 2013 12:50:18 +0530 From: Lei Li Date: Wed, 21 Aug 2013 15:18:40 +0800 Message-Id: <1377069536-12658-4-git-send-email-lilei@linux.vnet.ibm.com> In-Reply-To: <1377069536-12658-1-git-send-email-lilei@linux.vnet.ibm.com> References: <1377069536-12658-1-git-send-email-lilei@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 03/18] rename is_active to is_block_active List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, aliguori@us.ibm.com, Lei Li , quintela@redhat.com, mrhines@linux.vnet.ibm.com, lagarcia@br.ibm.com, pbonzini@redhat.com, rcj@linux.vnet.ibm.com is_active is used to identify block migration, rename to is_block_active to make it more clear. Signed-off-by: Lei Li --- block-migration.c | 2 +- include/migration/vmstate.h | 2 +- savevm.c | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/block-migration.c b/block-migration.c index f803f20..ce84377 100644 --- a/block-migration.c +++ b/block-migration.c @@ -834,7 +834,7 @@ SaveVMHandlers savevm_block_handlers = { .save_live_pending = block_save_pending, .load_state = block_load, .cancel = block_migration_cancel, - .is_active = block_is_active, + .is_block_active = block_is_active, }; void blk_mig_init(void) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 1c31b5d..de47326 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -42,7 +42,7 @@ typedef struct SaveVMHandlers { int (*save_live_complete)(QEMUFile *f, void *opaque); /* This runs both outside and inside the iothread lock. */ - bool (*is_active)(void *opaque); + bool (*is_block_active)(void *opaque); /* This runs outside the iothread lock in the migration case, and * within the lock in the savevm case. The callback had better only diff --git a/savevm.c b/savevm.c index f89e979..68552a7 100644 --- a/savevm.c +++ b/savevm.c @@ -1860,8 +1860,8 @@ void qemu_savevm_state_begin(QEMUFile *f, if (!se->ops || !se->ops->save_live_setup) { continue; } - if (se->ops && se->ops->is_active) { - if (!se->ops->is_active(se->opaque)) { + if (se->ops && se->ops->is_block_active) { + if (!se->ops->is_block_active(se->opaque)) { continue; } } @@ -1900,8 +1900,8 @@ int qemu_savevm_state_iterate(QEMUFile *f) if (!se->ops || !se->ops->save_live_iterate) { continue; } - if (se->ops && se->ops->is_active) { - if (!se->ops->is_active(se->opaque)) { + if (se->ops && se->ops->is_block_active) { + if (!se->ops->is_block_active(se->opaque)) { continue; } } @@ -1941,8 +1941,8 @@ void qemu_savevm_state_complete(QEMUFile *f) if (!se->ops || !se->ops->save_live_complete) { continue; } - if (se->ops && se->ops->is_active) { - if (!se->ops->is_active(se->opaque)) { + if (se->ops && se->ops->is_block_active) { + if (!se->ops->is_block_active(se->opaque)) { continue; } } @@ -1995,8 +1995,8 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) if (!se->ops || !se->ops->save_live_pending) { continue; } - if (se->ops && se->ops->is_active) { - if (!se->ops->is_active(se->opaque)) { + if (se->ops && se->ops->is_block_active) { + if (!se->ops->is_block_active(se->opaque)) { continue; } } -- 1.7.7.6