migration: equation is more proper than and to check LOADVM_QUIT
PATCH 1/1 migration: equation is more proper than and to check LOADVM_QUIT
LOADVM_QUIT allows a command to quit all layers of nested loadvm loops, while current return value check is not that proper even it works now.
Current return value check "ret & LOADVM_QUIT" would return true if bit[0] is 1. This would be true when ret is -1 which is used to indicate an error of handling a command.
Since there is only one place return LOADVM_QUIT and no other combination of return value, use "ret == LOADVM_QUIT" would be more proper.
--- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
migration/savevm.c +1 -1
@@ -2429,7 +2429,7 @@ retry:case QEMU_VM_COMMAND : ret =loadvm_process_command (f);trace_qemu_loadvm_state_section_command (ret); -if ((ret <0 ) || (ret &LOADVM_QUIT )) { +if ((ret <0 ) || (ret ==LOADVM_QUIT )) { goto out; }break ;
Signature · 1 line
2.17.1
Quoted 10 lines · * Wei Yang ([email protected]) wrote:
LOADVM_QUITallows a command to quit all layers of nested loadvm loops, while current return value check is not that proper even it works now.Current return value check "ret &
LOADVM_QUIT" would return true if bit[0] is 1. This would be true when ret is -1 which is used to indicate an error of handling a command.Since there is only one place return
LOADVM_QUITand no other combination of return value, use "ret ==LOADVM_QUIT" would be more proper.
Yes, when I first wrote this it was more complex with a few flags, and they all got removed.
Quoted 1 line
Signed-off-by Wei Yang <[email protected]>
Quoted 20 lines
--- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)migration/savevm.c +1
-1@@ -2429,7 +2429,7 @@ retry:case QEMU_VM_COMMAND : ret =loadvm_process_command (f);trace_qemu_loadvm_state_section_command (ret); -if ((ret <0 ) || (ret &LOADVM_QUIT )) { +if ((ret <0 ) || (ret ==LOADVM_QUIT )) { goto out; }break ;Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 8 lines · Dr. David Alan Gilbert
Quoted 7 lines · * Wei Yang ([email protected]) wrote:
LOADVM_QUITallows a command to quit all layers of nested loadvm loops, while current return value check is not that proper even it works now.Current return value check "ret &
LOADVM_QUIT" would return true if bit[0] is 1. This would be true when ret is -1 which is used to indicate an error of handling a command.
Quoted 7 lines
Quoted 3 lines
Since there is only one place return
LOADVM_QUITand no other combination of return value, use "ret ==LOADVM_QUIT" would be more proper.Yes, when I first wrote this it was more complex with a few flags, and they all got removed.
Ah, life is much easier now :-)
Quoted 26 lines
Quoted 1 line
Signed-off-by Wei Yang <[email protected]>Reviewed-by Dr. David Alan Gilbert <[email protected]>Quoted 20 lines
--- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)migration/savevm.c +1
-1@@ -2429,7 +2429,7 @@ retry:case QEMU_VM_COMMAND : ret =loadvm_process_command (f);trace_qemu_loadvm_state_section_command (ret); -if ((ret <0 ) || (ret &LOADVM_QUIT )) { +if ((ret <0 ) || (ret ==LOADVM_QUIT )) { goto out; }break ;Signature · 1 line
2.17.1--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 7 lines · * Wei Yang ([email protected]) wrote:
LOADVM_QUITallows a command to quit all layers of nested loadvm loops, while current return value check is not that proper even it works now.Current return value check "ret &
LOADVM_QUIT" would return true if bit[0] is 1. This would be true when ret is -1 which is used to indicate an error of handling a command.
Quoted 5 lines
Since there is only one place return
LOADVM_QUITand no other combination of return value, use "ret ==LOADVM_QUIT" would be more proper.Signed-off-by Wei Yang <[email protected]>
Queued
Quoted 21 lines
--- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)migration/savevm.c +1
-1@@ -2429,7 +2429,7 @@ retry:case QEMU_VM_COMMAND : ret =loadvm_process_command (f);trace_qemu_loadvm_state_section_command (ret); -if ((ret <0 ) || (ret &LOADVM_QUIT )) { +if ((ret <0 ) || (ret ==LOADVM_QUIT )) { goto out; }break ;Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK