From nobody Tue Feb 10 15:45:53 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597684076; cv=none; d=zohomail.com; s=zohoarc; b=kfGoGD912qN8nvcWUWYu3Y3qrNgQbt4DeUw71P8YE/AwvGF2ZCzRDZhG9AnuGhq0fBJHmXQDAxCApoASo6y6U9bw/vD57P9nvcOjmf6N4VE+OKaNVxH/nmdNXwPgkyUgl+R/BiCdc7h+/fzJ4egq9Dg9Otu/ufuAt1ggCsQyDfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597684076; 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=rQj9GTIn5cWLBAfzKEFV9zDy5qEmbI6P53ZkPnnFQjI=; b=kn875T8c/HM1RQWSqbfGiQXQq8eYI4wdUjqoChGyd8QmoQVMqXTVMl46UJ2fbXIJCd/Bi2Viu8HrwEN7grqDoqxOXjPWpQ1sATpRW3oUhS6B5kaY6A2pS78rtc7PO9QZRmwYGBCYG3n3EF95szxLL2fnv7U7cIGMU4IonJ6H8HE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1597684076056162.7154451088029; Mon, 17 Aug 2020 10:07:56 -0700 (PDT) Received: from localhost ([::1]:58046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gJH-00007P-95 for importer@patchew.org; Mon, 17 Aug 2020 10:40:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gGY-00038Y-7p for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:38 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gGW-000624-Pi for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:37:37 -0400 Received: by mail-wr1-x443.google.com with SMTP id a15so15232147wrh.10 for ; Mon, 17 Aug 2020 07:37:36 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:37:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rQj9GTIn5cWLBAfzKEFV9zDy5qEmbI6P53ZkPnnFQjI=; b=GHwJzBhLxvN6UcWH4Z8oI1fTPJYlHL9yj8yKmbOUmxdVPmaRI0y/9CeX3cP5b5eYaR ZdOFCsYe+6NFs9xlK7Js49B2wDN90OKmurqQpNdLOnJDOYN+6lvOvRzpVrqgGb89kKHJ FEndBsK3ZNf2A3SHIMc9rf3A/ERmMzYznX02MufEM2+b3Xkj0i/ZbFJpRN+5Kes4p2U4 Yj8nmH9+JdqRuZ27YjAxUdTnSnPAy/RYvQpS5XF25hXFViPIoHRnbd2XuiGbOWZbbved 7TgO7iZhCWzLyWPyeBE+6y5G8sdxZvV+DDQkMChmFezYRHZ+sSSZAj+1AxMV7BFwzMIi nUHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rQj9GTIn5cWLBAfzKEFV9zDy5qEmbI6P53ZkPnnFQjI=; b=i56p+z+RCCht2K6HyOaJRi6xlDQSSZBJB73velTAIETfkBD8fRYTwhc6X/GEaTgHOL Cal2neGTFv0qs7YIX1GaLA/wPTvdppT3BTD5Rfwdg7jnt9MI67wH7cC/ie+WGo5ib3fT VCugmk8I8Bn6J4mpfag8S5zO+7xJLc40aGALHxNg9MFrsQubgXJuMmOkjCPzNjlW2zg3 i1UrFwAjawTs/ct+yUBpWutTrk+6vfTBmVkgyTEPLYl+X6P8/ysBXZJ0Un+xRZ1+9m33 jEd6KMncjZJ+2P+f9X+tODWhwvUhQ+1e1Jny/nHOa+uSj5P0ErlDzk0jF7daGlCjRZTV vsCA== X-Gm-Message-State: AOAM530PbXzY4lqGQIKwdViViSlaShv0yiuxIoOoYctwTdVNodXLZfyE ZxpWyGTsnTpDeynKTpUk1u7adbv0Vgk= X-Google-Smtp-Source: ABdhPJxPip/B2KuRuh3proc42ILhNhX0/nMSkFfT4RMnIkN1xKw5RPayaBWnyfTvKlZpGkZMEWLZhg== X-Received: by 2002:adf:fb87:: with SMTP id a7mr16895687wrr.390.1597675055246; Mon, 17 Aug 2020 07:37:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 008/150] tests/vm: check for Python YAML parser in the Makefile Date: Mon, 17 Aug 2020 16:35:01 +0200 Message-Id: <20200817143723.343284-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 1c17a0f27f..625c14c500 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 a599d1994d..257e2edbb3 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 2.26.2