Commit a94cd7b8 authored by Wei Yang's avatar Wei Yang Committed by Dr. David Alan Gilbert
Browse files

migration: not necessary to check ops again 



During each iteration, se->ops is checked before each loop. So it is not
necessary to check it again and simplify the following check a little.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Message-Id: <20190327013130.26259-1-richardw.yang@linux.intel.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 772c6212

migration/savevm.c

+6 −8
Original line number Diff line number Diff line
@@ -1157,16 +1157,14 @@ int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy) 
        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->is_active &&

            !se->ops->is_active(se->opaque)) {

            continue;

        }

        }

        if (se->ops && se->ops->is_active_iterate) {

            if (!se->ops->is_active_iterate(se->opaque)) {

        if (se->ops->is_active_iterate &&

            !se->ops->is_active_iterate(se->opaque)) {

            continue;

        }

        }

        /*

         * In the postcopy phase, any device that doesn't know how to

         * do postcopy should have saved it's state in the _complete