Re: [Qemu-devel] [PATCH 01/17] rename is_active to is_block_active

[Lei Li]

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 <address@hidden>
> > ---
> >   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