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: Wei Yang <richardw.yang@linux.intel.com>
---
 migration/savevm.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/migration/savevm.c b/migration/savevm.c
index 1415001d1c..5f0ca7fac2 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1157,15 +1157,13 @@ 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)) {
-                continue;
-            }
+        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)) {
-                continue;
-            }
+        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
-- 
2.19.1

* Wei Yang (richardw.yang@linux.intel.com) wrote:
> 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: Wei Yang <richardw.yang@linux.intel.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  migration/savevm.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/migration/savevm.c b/migration/savevm.c
> index 1415001d1c..5f0ca7fac2 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -1157,15 +1157,13 @@ 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)) {
> -                continue;
> -            }
> +        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)) {
> -                continue;
> -            }
> +        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
> -- 
> 2.19.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

* Wei Yang (richardw.yang@linux.intel.com) wrote:
> 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: Wei Yang <richardw.yang@linux.intel.com>

Queued

> ---
>  migration/savevm.c | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/migration/savevm.c b/migration/savevm.c
> index 1415001d1c..5f0ca7fac2 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -1157,15 +1157,13 @@ 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)) {
> -                continue;
> -            }
> +        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)) {
> -                continue;
> -            }
> +        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
> -- 
> 2.19.1
> 
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK