From nobody Tue Dec 16 08:39:16 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=1597079661; cv=none; d=zohomail.com; s=zohoarc; b=Dlwgj1DvKgYE9NCwIltaDHhheZGe2+hZ14pqRFvTxxF0v17859fzsY+0DHHJkMHWqYMmLNxj8wlqozO5ebmhOgi+wBB4jHkoJkGmJFT5zTtOu5zi3QHpjiXhfkkLIz/j7z+2qt7malVQc53g06JpqADQ67yiMs5Yi7WsUeug8Wk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597079661; h=Content-Type:Content-Transfer-Encoding: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=GVUx8s3GrxgCUDYrC6d7HIRDaaT67UUg72N6J3lfv5Y=; b=RgPRDz0re79Eoh3v4xpuEnnRYVQPniFXl2fQhqf7dLtOcuEY2+V5ijUkzaxnj0HWyDNfYqUB5WnfFd+QyTRK5H7p7BcTIqTdedSS0iRMXlcHUcW9xaF9qu2vRRCpFS26+YDlgKhWUlkNcfVVgOIT6u856mcSULac/qDe25CchuM= 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 1597079661319346.62524409543937; Mon, 10 Aug 2020 10:14:21 -0700 (PDT) Received: from localhost ([::1]:48866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5BNL-0005ZK-Jh for importer@patchew.org; Mon, 10 Aug 2020 13:14:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5BIi-0005WB-JR for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:32 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:51850 helo=us-smtp-delivery-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 1k5BIf-0002i1-7l for qemu-devel@nongnu.org; Mon, 10 Aug 2020 13:09:32 -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-556-YHR-jA_nPkWhT2YsJ1lY2g-1; Mon, 10 Aug 2020 13:09:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B480219057A0 for ; Mon, 10 Aug 2020 17:09:25 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0695D5F1E9 for ; Mon, 10 Aug 2020 17:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597079368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GVUx8s3GrxgCUDYrC6d7HIRDaaT67UUg72N6J3lfv5Y=; b=X2Hmhk2wUnAGrvXjS61TFJHDcV4l6rqX3B1Mq34lYGovgvWMA7FnVC91WqfYBam3bvuZCU 9Ex/gMKfwoisRsRjzVCX+ad/TBiUtERpdiEbFG72KMXsiI55bEwrsF+3gGry7VyKANVzdX /s0mRfGbSZTIG/cqR6RwY3K5Qn6wthg= X-MC-Unique: YHR-jA_nPkWhT2YsJ1lY2g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 008/147] tests/vm: check for Python YAML parser in the Makefile Date: Mon, 10 Aug 2020 19:06:46 +0200 Message-Id: <1597079345-42801-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> References: <1597079345-42801-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Type: text/plain; charset="utf-8" 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=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/10 03:29:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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=-1, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) No need to do it in the configure file if it is only used for a help messag= e. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 9 --------- tests/vm/Makefile.include | 4 +++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 1c17a0f..625c14c 100755 --- a/configure +++ b/configure @@ -959,13 +959,6 @@ do fi done =20 -# Check for existence of python3 yaml, needed to -# import yaml config files into vm-build. -python_yaml=3D"no" -if $(python3 -c "import yaml" 2> /dev/null); then - python_yaml=3D"yes" -fi - : ${smbd=3D${SMBD-/usr/sbin/smbd}} =20 # Default objcc to clang if available, otherwise use CC @@ -6844,7 +6837,6 @@ if test "$docs" !=3D "no"; then echo "sphinx-build $sphinx_build" fi echo "genisoimage $genisoimage" -echo "python_yaml $python_yaml" echo "slirp support $slirp $(echo_version $slirp $slirp_version)" if test "$slirp" !=3D "no" ; then echo "smbd $smbd" @@ -7945,7 +7937,6 @@ echo "PYTHON=3D$python" >> $config_host_mak echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak echo "SPHINX_WERROR=3D$sphinx_werror" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak -echo "PYTHON_YAML=3D$python_yaml" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=3D$iasl" >> $config_host_mak diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index a599d19..257e2ed 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -17,6 +17,8 @@ IMAGE_FILES :=3D $(patsubst %, $(IMAGES_DIR)/%.img, $(IMA= GES)) =20 .PRECIOUS: $(IMAGE_FILES) =20 +HAVE_PYTHON_YAML =3D $(shell $(PYTHON) -c "import yaml" 2> /dev/null && ec= ho yes) + # 'vm-help' target was historically named 'vm-test' vm-help vm-test: @echo "vm-help: Test QEMU in preconfigured virtual machines" @@ -56,7 +58,7 @@ endif @echo " QEMU_LOCAL=3D1 - Use QEMU binary local to this= build." @echo " QEMU=3D/path/to/qemu - Change path to QEMU binary" @echo " QEMU_IMG=3D/path/to/qemu-img - Change path to qemu-img tool" -ifeq ($(PYTHON_YAML),yes) +ifeq ($(HAVE_PYTHON_YAML),yes) @echo " QEMU_CONFIG=3D/path/conf.yml - Change path to VM configurati= on .yml file." else @echo " (install python3-yaml to enable support for yaml file to confi= gure a VM.)" --=20 1.8.3.1