OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: cleanup check on ops in savevm.handlers iterations

Browse Source 
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: Wei Yang <richardw.yang@linux.intel.com>

Message-Id: <20190819032804.8579-1-richardw.yang@linux.intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Wei Yang 2019-08-19 11:28:04 +08:00 committed by Dr. David Alan Gilbert
parent 2f4aefd320
commit cea3b4c083
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
migration/savevm.c
View File

@ -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;
}