From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZYjp-00027z-U4 for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:11:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZYjg-0003Md-RQ for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:11:05 -0400 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:49453) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZYjg-0003MW-6n for qemu-devel@nongnu.org; Fri, 25 Oct 2013 00:10:56 -0400 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 25 Oct 2013 09:40:50 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id B5150394004D for ; Fri, 25 Oct 2013 09:40:27 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9P4AjZD45220082 for ; Fri, 25 Oct 2013 09:40:46 +0530 Received: from d28av04.in.ibm.com (localhost [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9P4AkW4010702 for ; Fri, 25 Oct 2013 09:40:47 +0530 Message-ID: <5269EF44.7090801@linux.vnet.ibm.com> Date: Fri, 25 Oct 2013 12:10:44 +0800 From: Lei Li MIME-Version: 1.0 References: <1382412341-1173-1-git-send-email-lilei@linux.vnet.ibm.com> <1382412341-1173-2-git-send-email-lilei@linux.vnet.ibm.com> <526924A1.5010905@redhat.com> In-Reply-To: <526924A1.5010905@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 01/17] rename is_active to is_block_active List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Andrea Arcangeli , quintela@redhat.com, mdroth@linux.vnet.ibm.com, mrhines@linux.vnet.ibm.com, qemu-devel@nongnu.org, Anthony Liguori , lagarcia@br.ibm.com, rcj@linux.vnet.ibm.com On 10/24/2013 09:46 PM, Paolo Bonzini wrote: > Il 22/10/2013 04:25, Lei Li ha scritto: >> is_active is used to identify block migration, rename to >> is_block_active to make it more clear. > No, is_active is used to identify whether a set of SaveVMHandlers is > active. The default is true, so only block migration is using it. But > we could use it in the future for other features (probably using > migration capabilities instead of a flag as is the case for block). It updates my knowledge. Thanks for your clarifying! > > Paolo > >> 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 daf9ec1..b637695 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 9d09e60..c634d65 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 2f631d4..56b8643 100644 >> --- a/savevm.c >> +++ b/savevm.c >> @@ -1867,8 +1867,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; >> } >> } >> @@ -1907,8 +1907,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; >> } >> } >> @@ -1948,8 +1948,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; >> } >> } >> @@ -2002,8 +2002,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; >> } >> } >> > -- Lei