[v3] cleanup qemu_init and make sense of command line processing

[PATCH 28/36] vl: allow -incoming defer with -preconfig

Posted by Paolo Bonzini 5 years, 2 months ago

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 <pbonzini@redhat.com>
---
 softmmu/vl.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/softmmu/vl.c b/softmmu/vl.c
index aa11fc4871..0ba1fcdb3d 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3200,9 +3200,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);
     }
 
-- 
2.26.2

Re: [PATCH 28/36] vl: allow -incoming defer with -preconfig

Posted by Igor Mammedov 5 years, 2 months ago

On Mon, 23 Nov 2020 09:14:27 -0500
Paolo Bonzini <pbonzini@redhat.com> 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 <pbonzini@redhat.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  softmmu/vl.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index aa11fc4871..0ba1fcdb3d 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -3200,9 +3200,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);
>      }
>