mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vl: allow -incoming defer with -preconfig

Browse Source 
Now that there is no RUN_STATE_PRECONFIG anymore that can conflict with
RUN_STATE_INMIGRATE, we can allow -incoming defer with -preconfig.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-27 09:15:53 -04:00
parent b4e1a34211
commit 8fafaa04c3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
softmmu/vl.c
View File

@ -2986,9 +2986,8 @@ static void qemu_validate_options(void)
"mutually exclusive");
exit(EXIT_FAILURE);
}
if (incoming && preconfig_requested) {
error_report("'preconfig' and 'incoming' options are "
"mutually exclusive");
if (incoming && preconfig_requested && strcmp(incoming, "defer") != 0) {
error_report("'preconfig' supports '-incoming defer' only");
exit(EXIT_FAILURE);
}