From nobody Tue Nov 18 07:42:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608055017; cv=none; d=zohomail.com; s=zohoarc; b=gdMlDgNo7ZRz2DgB+t1c30kwgbx83BEqOzcFhZO+4kOXKfbsnV5l2FzJt0vCVPIag3eduCybIEhNFlGfGb4l+0myZ9I/vDxJocONi59iNKNX4QU57ue/eque1JWKBAvyN9uPf/iRW6ZL+3/oGDYjvAs6y0anZqRvWRiQbVluLUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608055017; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AK/ysKp67JZ+xdz7XmbgJu0fK3M0GYlcrCgTQJsTTe0=; b=OdqkT3/LH4X+exMlxUX3GTFHHb6CvjoNSE7WF6W26Yisq7+3s+sGRquTa6RQgGX6Aatj24Fn/5tXtJ6ZZMu793/u07yg5NYJjLZK5Z2dllrGdwuw/x+O8Nyi2QYH3DmniPSq0cy640vwWctiRkpo8ahylGldcdAKW726X+tQTwE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608055017269797.0941937458775; Tue, 15 Dec 2020 09:56:57 -0800 (PST) Received: from localhost ([::1]:47460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpEZA-0004n4-3z for importer@patchew.org; Tue, 15 Dec 2020 12:56:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpEXF-0002tU-CQ for qemu-devel@nongnu.org; Tue, 15 Dec 2020 12:54:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpEXC-0001Rr-Gg for qemu-devel@nongnu.org; Tue, 15 Dec 2020 12:54:53 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-560-QWpSLIk-OVCcl1_o6pGq8g-1; Tue, 15 Dec 2020 12:54:48 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 29DF2107ACE4 for ; Tue, 15 Dec 2020 17:54:47 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDA9B60C15; Tue, 15 Dec 2020 17:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608054889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AK/ysKp67JZ+xdz7XmbgJu0fK3M0GYlcrCgTQJsTTe0=; b=dfphSNaDm8vS8kNfNPX2BOW4fIouRBDMcOcjlsAJBZrrCvcwH3rfa+xpEfecFJBJURH8Me rsPGKoSbI8ybyDSiSK+mg486b0VHnNW+XuM9irkZ977dwkxOJZIVhWe/7rKdE6v7+wE/Hx 7r0kBJGqm5B3mrNXykBSYmXAFvUvlhI= X-MC-Unique: QWpSLIk-OVCcl1_o6pGq8g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/45] vl: allow -incoming defer with -preconfig Date: Tue, 15 Dec 2020 12:54:03 -0500 Message-Id: <20201215175445.1272776-4-pbonzini@redhat.com> In-Reply-To: <20201215175445.1272776-1-pbonzini@redhat.com> References: <20201215175445.1272776-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Paolo Bonzini --- softmmu/vl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index abbbb83e1a..3dfac8299b 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") !=3D = 0) { + error_report("'preconfig' supports '-incoming defer' only"); exit(EXIT_FAILURE); } =20 --=20 2.26.2