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

migration: cleanup check on ops in savevm.handlers iterations 



During migration, there are several places to iterate on
savevm.handlers. And on each iteration, we need to check its ops and
related callbacks before invoke it.

Generally, ops is the first element to check, and it is only necessary
to check it once.

This patch clean all the related part in savevm.c to check ops only once
in those iterations.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>

Message-Id: <20190819032804.8579-1-richardw.yang@linux.intel.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 2f4aefd3

migration/savevm.c

+6 −6
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ void qemu_savevm_state_setup(QEMUFile *f) 
        if (!se->ops || !se->ops->save_setup) {

            continue;

        }

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

        if (se->ops->is_active) {

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

                continue;

            }
@@ -1131,7 +1131,7 @@ int qemu_savevm_state_resume_prepare(MigrationState *s) 
        if (!se->ops || !se->ops->resume_prepare) {

            continue;

        }

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

        if (se->ops->is_active) {

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

                continue;

            }
@@ -1227,7 +1227,7 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f) 
        if (!se->ops || !se->ops->save_live_complete_postcopy) {

            continue;

        }

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

        if (se->ops->is_active) {

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

                continue;

            }
@@ -1264,7 +1264,7 @@ int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postcopy) 
            continue;

        }



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

        if (se->ops->is_active) {

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

                continue;

            }
@@ -1413,7 +1413,7 @@ void qemu_savevm_state_pending(QEMUFile *f, uint64_t threshold_size, 
        if (!se->ops || !se->ops->save_live_pending) {

            continue;

        }

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

        if (se->ops->is_active) {

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

                continue;

            }
@@ -2334,7 +2334,7 @@ static int qemu_loadvm_state_setup(QEMUFile *f) 
        if (!se->ops || !se->ops->load_setup) {

            continue;

        }

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

        if (se->ops->is_active) {

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

                continue;

            }