On Tue, 27 Oct 2020 14:21:44 -0400 Paolo Bonzini <[email protected]> wrote:
> Now that there is no RUN_STATE_PRECONFIG anymore that can conflict with > RUN_STATE_INMIGRATE, we can allow -incoming defer with -preconfig. > > Signed-off-by: Paolo Bonzini <[email protected]> > --- > softmmu/vl.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/softmmu/vl.c b/softmmu/vl.c > index 98666c0612..b0cb539da9 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -3199,9 +3199,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) { why limit it only to 'defer'? > + error_report("'preconfig' supports '-incoming defer' only"); > exit(EXIT_FAILURE); > } >
