From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 27 Oct 2020 13:15:53 +0000 (-0400)
Subject: vl: allow -incoming defer with -preconfig
X-Git-Tag: v6.0.0-rc0~176^2~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fafaa04c30d4d67d3d13fc4027cb57da5a2f162;p=thirdparty%2Fqemu.git

vl: allow -incoming defer with -preconfig

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>
---

diff --git a/softmmu/vl.c b/softmmu/vl.c
index abbbb83e1a4..3dfac8299bb 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -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);
     }