Commit 7c76235a authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Juan Quintela
Browse files

Avoid crashing on multiple -incoming 



Passing multiple -incoming options used to crash qemu (due to
an invalid state transition incoming->incoming).  Instead we now
take the last -incoming option, e.g.:

qemu-system-x86_64 -nographic -incoming tcp::4444 -incoming defer

ends up doing the defer.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 087c4c94

vl.c

+3 −1
Original line number Diff line number Diff line
@@ -3618,8 +3618,10 @@ int main(int argc, char **argv, char **envp) 
                }

                break;

            case QEMU_OPTION_incoming:

                incoming = optarg;

                if (!incoming) {

                    runstate_set(RUN_STATE_INMIGRATE);

                }

                incoming = optarg;

                break;

            case QEMU_OPTION_nodefaults:

                has_defaults = 0;