From nobody Sun Nov 16 14:28:25 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=1600532624; cv=none; d=zohomail.com; s=zohoarc; b=bCEpJIPOZRj6yTz4KcQ+Xtv1J10YmNno3lhqjnVDg0UAUBhhcG0trlmOworSB+NRFCpki31mTeGRVPw1sHcU3/5RSiZuO+l/n77QO4pkqZN2x6HwCNgyYs8uq0bmV8AmCAK6g0HQ1MSDsJ7Gj2FUUYbNxcSouTKKCH53Dl5h43Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600532624; 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=MRi8i2BMvdEMR0cbJOTYElma8z7sCzMIKwz0QIwztLg=; b=nMXCauskxqHCIBDV6ZP1oPnX2oBBgBHZfOBfWghBdHJ9Z/ooCoCkm7TFjt4NNc+IHklfD/9uHdnWpRvhZThXuZj9R27I5xHdKLDGj0JGShalMgSNJ1g6KyIreV8WEUvjo1qGVXPUldFXMsvKQSoswemuEJseKNgc21N07/mGWms= 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 1600532624343170.92392978699775; Sat, 19 Sep 2020 09:23:44 -0700 (PDT) Received: from localhost ([::1]:38206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJfeI-0000TF-Rx for importer@patchew.org; Sat, 19 Sep 2020 12:23:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJfHH-0005Ro-6C for qemu-devel@nongnu.org; Sat, 19 Sep 2020 11:59:58 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:42435 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJfH3-0007Nu-AW for qemu-devel@nongnu.org; Sat, 19 Sep 2020 11:59:54 -0400 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-531-zXcoKIFlON-OWQsqw_wnlQ-1; Sat, 19 Sep 2020 11:59:37 -0400 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 8E65D8712D9 for ; Sat, 19 Sep 2020 15:59:36 +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 897D860C84; Sat, 19 Sep 2020 15:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600531179; 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=MRi8i2BMvdEMR0cbJOTYElma8z7sCzMIKwz0QIwztLg=; b=H4RnOgr6mb2r0Dg5bu3Ikg60rRqbCXw6XkhYGrqdn5qz/uwfCnTv/biu7WdzL9x98yTqEO 9hhSAXKqtO7cHku3UeXJNXZ4AsIYhKhlXz1Zz7hMPYU8FD2t/ekDK3YKYZxXM3D3sLZz27 zersCtgJha9O6i9ZItSN3A6nDpAQz74= X-MC-Unique: zXcoKIFlON-OWQsqw_wnlQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/57] configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI Date: Sat, 19 Sep 2020 11:58:39 -0400 Message-Id: <20200919155916.1046398-21-pbonzini@redhat.com> In-Reply-To: <20200919155916.1046398-1-pbonzini@redhat.com> References: <20200919155916.1046398-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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/19 11:59:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.996, 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_H2=-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: Stefan Hajnoczi 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" From: Stefan Hajnoczi The QEMU_GA_MSI_ENABLED config-host.mak variable is emitted by ./configure. meson.build actually checks for CONFIG_QGA_MSI_ENABLED: summary_info +=3D {'QGA MSI support': config_host.has_key('CONFIG_QGA_M= SI_ENABLED')} Rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI for consistency with CONFIG_QGA_VSS. Also use 'y' instead of 'yes' for consistency. This fixes the feature summary printed by meson.build. Signed-off-by: Stefan Hajnoczi Message-Id: <20200914095231.621068-4-stefanha@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 2 +- configure | 2 +- meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7c60b9dcb8..42d90cb597 100644 --- a/Makefile +++ b/Makefile @@ -285,7 +285,7 @@ endif ifdef CONFIG_WIN32 @echo 'Windows targets:' $(call print-help,installer,Build NSIS-based installer for QEMU) -ifdef QEMU_GA_MSI_ENABLED +ifdef CONFIG_QGA_MSI $(call print-help,msi,Build MSI-based installer for qemu-ga) endif @echo '' diff --git a/configure b/configure index 7662b3bf6f..6201e7c732 100755 --- a/configure +++ b/configure @@ -6572,7 +6572,7 @@ if test "$mingw32" =3D "yes" ; then echo "CONFIG_QGA_NTDDSCSI=3Dy" >> $config_host_mak fi if test "$guest_agent_msi" =3D "yes"; then - echo "QEMU_GA_MSI_ENABLED=3Dyes" >> $config_host_mak + echo "CONFIG_QGA_MSI=3Dy" >> $config_host_mak echo "QEMU_GA_MSI_MINGW_DLL_PATH=3D${QEMU_GA_MSI_MINGW_DLL_PATH}" >> $= config_host_mak echo "QEMU_GA_MSI_WITH_VSS=3D${QEMU_GA_MSI_WITH_VSS}" >> $config_host_= mak echo "QEMU_GA_MSI_ARCH=3D${QEMU_GA_MSI_ARCH}" >> $config_host_mak diff --git a/meson.build b/meson.build index 8bf696558f..5ab9a4dd1e 100644 --- a/meson.build +++ b/meson.build @@ -1488,7 +1488,7 @@ if targetos =3D=3D 'windows' endif summary_info +=3D {'QGA VSS support': config_host.has_key('CONFIG_QGA_= VSS')} summary_info +=3D {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_= NTDDSCSI')} - summary_info +=3D {'QGA MSI support': config_host.has_key('CONFIG_QGA_= MSI_ENABLED')} + summary_info +=3D {'QGA MSI support': config_host.has_key('CONFIG_QGA_= MSI')} endif summary_info +=3D {'seccomp support': config_host.has_key('CONFIG_SECCOM= P')} summary_info +=3D {'coroutine backend': config_host['CONFIG_COROUTINE_BACK= END']} --=20 2.26.2