mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-06 19:19:41 +00:00
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: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
087c4c9419
commit
7c76235a3e
4
vl.c
4
vl.c
|
@ -3618,8 +3618,10 @@ int main(int argc, char **argv, char **envp)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case QEMU_OPTION_incoming:
|
case QEMU_OPTION_incoming:
|
||||||
|
if (!incoming) {
|
||||||
|
runstate_set(RUN_STATE_INMIGRATE);
|
||||||
|
}
|
||||||
incoming = optarg;
|
incoming = optarg;
|
||||||
runstate_set(RUN_STATE_INMIGRATE);
|
|
||||||
break;
|
break;
|
||||||
case QEMU_OPTION_nodefaults:
|
case QEMU_OPTION_nodefaults:
|
||||||
has_defaults = 0;
|
has_defaults = 0;
|
||||||
|
|
Loading…
Reference in a new issue