diff mbox series

migration: savevm: fix error code with migration blockers

Message ID b991a4d0e6c4253bc08b2794c6084be55fc72e1d.1554851834.git.crobinso@redhat.com
State Accepted
Commit aded9dfa74a83f8b235df1bd3a874e48e197c78e
Headers show
Series migration: savevm: fix error code with migration blockers | expand

Commit Message

Cole Robinson April 9, 2019, 11:19 p.m. UTC
The only caller that checks the error code is looking for != 0,
so returning false is incorrect.

Fixes: 5aaac467938 "migration: savevm: consult migration blockers"

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
 migration/savevm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.21.0

Comments

Dr. David Alan Gilbert April 10, 2019, 8:34 a.m. UTC | #1
* Cole Robinson (crobinso@redhat.com) wrote:
> The only caller that checks the error code is looking for != 0,

> so returning false is incorrect.

> 

> Fixes: 5aaac467938 "migration: savevm: consult migration blockers"

> 

> Signed-off-by: Cole Robinson <crobinso@redhat.com>


Thanks, this was in 3.1.0 so isn't a 4.0 regression, so it'll have
to wait for 4.1.


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


> ---

>  migration/savevm.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/migration/savevm.c b/migration/savevm.c

> index 34bcad3807..a3dae4cf02 100644

> --- a/migration/savevm.c

> +++ b/migration/savevm.c

> @@ -2544,7 +2544,7 @@ int save_snapshot(const char *name, Error **errp)

>      AioContext *aio_context;

>  

>      if (migration_is_blocked(errp)) {

> -        return false;

> +        return ret;

>      }

>  

>      if (!replay_can_snapshot()) {

> -- 

> 2.21.0

> 

--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Juan Quintela April 10, 2019, 9:06 a.m. UTC | #2
Cole Robinson <crobinso@redhat.com> wrote:
> The only caller that checks the error code is looking for != 0,

> so returning false is incorrect.

>

> Fixes: 5aaac467938 "migration: savevm: consult migration blockers"

>

> Signed-off-by: Cole Robinson <crobinso@redhat.com>


Reviewed-by: Juan Quintela <quintela@redhat.com>
Dr. David Alan Gilbert May 14, 2019, 2:01 p.m. UTC | #3
* Cole Robinson (crobinso@redhat.com) wrote:
> The only caller that checks the error code is looking for != 0,

> so returning false is incorrect.

> 

> Fixes: 5aaac467938 "migration: savevm: consult migration blockers"

> 

> Signed-off-by: Cole Robinson <crobinso@redhat.com>


Queued

> ---

>  migration/savevm.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/migration/savevm.c b/migration/savevm.c

> index 34bcad3807..a3dae4cf02 100644

> --- a/migration/savevm.c

> +++ b/migration/savevm.c

> @@ -2544,7 +2544,7 @@ int save_snapshot(const char *name, Error **errp)

>      AioContext *aio_context;

>  

>      if (migration_is_blocked(errp)) {

> -        return false;

> +        return ret;

>      }

>  

>      if (!replay_can_snapshot()) {

> -- 

> 2.21.0

> 

> 

--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff mbox series

Patch

diff --git a/migration/savevm.c b/migration/savevm.c
index 34bcad3807..a3dae4cf02 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2544,7 +2544,7 @@  int save_snapshot(const char *name, Error **errp)
     AioContext *aio_context;
 
     if (migration_is_blocked(errp)) {
-        return false;
+        return ret;
     }
 
     if (!replay_can_snapshot()) {