migration: cleanup check on ops in savevm.handlers iterations
PATCH v2 1/1 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.
---
v2: rebase on latest upstream
--- migration/savevm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
migration/savevm.c +6 -6
@@ -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 ; }
Signature · 1 line
2.17.1
Quoted 11 lines · Wei Yang
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.cto check ops only once in those iterations.Signed-off-by Wei Yang <[email protected]>
Nice cleanup.
Quoted 8 lines · Juan Quintela
Quoted 7 lines · Wei Yang
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.
Quoted 8 lines
Quoted 4 lines
This patch clean all the related part in
savevm.cto check ops only once in those iterations.Signed-off-by Wei Yang <[email protected]>Reviewed-by Juan Quintela <[email protected]>Nice cleanup.
Thanks
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 11 lines · * Wei Yang ([email protected]) wrote:
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.cto check ops only once in those iterations.Signed-off-by Wei Yang <[email protected]>
Queued
Quoted 69 lines
---
v2: rebase on latest upstream--- migration/savevm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)migration/savevm.c +6
-6@@ -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 ; }Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK