From nobody Fri May 3 07:15:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=1565075272; cv=none; d=zoho.com; s=zohoarc; b=RjrgoOAmDunMIATEG/IxJyhMaIXFQDo323K0ka8tRR0PCQhzk3U4MPnJVVRq7oHXf/qALA1CXMqcny/pxq+99SR6ZlKAomgftYrDrOXeCMwGOoHWK7W7Qk5a7TbVKhoAb0fF6BndOEitSncGNyuXlUqjPmtsGCwgPvnyzsM4oXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565075272; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=oqNyddmJ8F1AiMMSUZkMF5QKSdRh9MnwV5yqwAOZnYU=; b=DjPzrnwaoHgeC/r0AvMXhsLdEmrRfRIKo+rSk5hrAbOvyFQNll3CIT7krX/wp41al1QNeR5QfC6uyMe6kskg2OPL790AYZUlJuwP+8Dzefr4mGDqmKkvGa68ekI5zVVq2seYSXS/Q4/3vtYR46PglN0aS4iS5K7ie/LxiYGyB8o= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1565075272414570.14213280629; Tue, 6 Aug 2019 00:07:52 -0700 (PDT) Received: from localhost ([::1]:59336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hutZX-0003xn-GQ for importer@patchew.org; Tue, 06 Aug 2019 03:07:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39101) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hutZ2-00036y-Cx for qemu-devel@nongnu.org; Tue, 06 Aug 2019 03:07:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hutZ1-0008UF-Gt for qemu-devel@nongnu.org; Tue, 06 Aug 2019 03:07:20 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:54099) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hutZ1-0008Ts-8D for qemu-devel@nongnu.org; Tue, 06 Aug 2019 03:07:19 -0400 Received: by mail-wm1-x341.google.com with SMTP id x15so77032045wmj.3 for ; Tue, 06 Aug 2019 00:07:19 -0700 (PDT) Received: from 640k.localdomain.com ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id t13sm103637009wrr.0.2019.08.06.00.07.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Aug 2019 00:07:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=oqNyddmJ8F1AiMMSUZkMF5QKSdRh9MnwV5yqwAOZnYU=; b=Lw/kKQf5eSbn4xX6IeL3LSttPESHipjI/17puzNU9RcamCbWSYdPzlZexscPxrP4Jr 4h2qV2oTwZBe2gCdBLetT+IquUxEqaU10fiu6tMtJWM7C3vnICvLSMFyKHh+xFuTL7+H BaSzd9c9+mL/KgLvavQFbtdeU4aARYEKvkYyOHqfbhQysRaO+hv7k/O7jooemHW5Zn1T w04pqVCEaG6OUNrLAQmwIdQKk/NK5DKeqPVip1dTsQ1yxKmPO9GcSzEgHDJRyw48ppYT /ZqLkeVDIxAHzx4edpOqu/+Zzf55DnqAzJwTn2ILFE5EHFAvKdULVF3GTKYBfZ6162mL Wp8g== 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:subject:date:message-id :in-reply-to:references; bh=oqNyddmJ8F1AiMMSUZkMF5QKSdRh9MnwV5yqwAOZnYU=; b=AUiF65Cm88AunEu78BdpHKjjQFW1+kXESpW2Ra32/gdlgemW2URGTEgjiLBOxmmEsc +C3aQqqH2SV3UQiFgjxlZaWVdSgXNVGlXr9fYYdWJVM3p+DU6ZDs+rDWsTNt29x5iopO HTxse+kAXrHqbhn615Q/j1pLs9s2rGKIYoek7HlXCDGmSH3ysLy9uwkYcoP/5zyhzRD7 +oJQG98HRxEy7U3gcz/OTqtc6V/5i/SvrEzox0Lw81n+63pQ4Qu+f4MsGx/6eRL/7cpN 15B1o8fu5T6sSY0fjWDqWogiwjl9ar0578Zm5k49ZHzlrUKEcOwRukgB6JEryGUGreBl RB6A== X-Gm-Message-State: APjAAAVo0Pkr/TeRf6yLjZ25p1xSMLsSgHchol7TeUUMv48niLciWqQa TVPX11Qs2zXqwfPU1UgCrqcaaDvF X-Google-Smtp-Source: APXvYqw0eoxdrj7p4QCqQDD7lRepjqi+sTpQO9bAgi34Ra9GS0zxydjHwTeQlyjrLM9tVQ0bdUmTcQ== X-Received: by 2002:a1c:c5c2:: with SMTP id v185mr2966258wmf.161.1565075237892; Tue, 06 Aug 2019 00:07:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Aug 2019 09:07:12 +0200 Message-Id: <1565075233-10882-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1565075233-10882-1-git-send-email-pbonzini@redhat.com> References: <1565075233-10882-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 1/2] qemu-ga: clean up TOOLS variable 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: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" qemu-ga is included in the TOOLS variable without the .exe suffix, and this= is then worked around twice in the Makefile. Do the right thing in configure instead. Signed-off-by: Paolo Bonzini --- Makefile | 4 ++-- configure | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cfb18f1..e532043 100644 --- a/Makefile +++ b/Makefile @@ -669,7 +669,7 @@ clean: ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \ -exec rm {} + rm -f $(edk2-decompressed) - rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga$(EXESUF) TAGS csc= ope.* *.pod *~ */*~ + rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */= *~ rm -f fsdev/*.pod scsi/*.pod rm -f qemu-img-cmds.h rm -f ui/shader/*-vert.h ui/shader/*-frag.h @@ -832,7 +832,7 @@ ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x= 256 512x512 install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-local= statedir \ $(if $(INSTALL_BLOBS),$(edk2-decompressed)) ifneq ($(TOOLS),) - $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)= $(bindir)) + $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) endif ifneq ($(CONFIG_MODULES),) $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" diff --git a/configure b/configure index 5c79145..8e17f44 100755 --- a/configure +++ b/configure @@ -6118,7 +6118,7 @@ if [ "$guest_agent" !=3D "no" ]; then if [ "$softmmu" =3D no -a "$want_tools" =3D no ] ; then guest_agent=3Dno elif [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" -o= "$mingw32" =3D "yes" ] ; then - tools=3D"qemu-ga $tools" + tools=3D"qemu-ga\$(EXESUF) $tools" guest_agent=3Dyes elif [ "$guest_agent" !=3D yes ]; then guest_agent=3Dno --=20 1.8.3.1 From nobody Fri May 3 07:15:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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=1565075307; cv=none; d=zoho.com; s=zohoarc; b=QT3xFhURT0RqMACxNOzbdwMwR99WYXOhL6TSI39rsemYido9Zhmg2EgheIwSYeH2vZLGgKsts6vajgmcAFbwowkjuZw+RJwk7VgKL3aSZ2SwZMo3XYZgpJJRuCsLjccbcRSI6t4gyAzOOzLltcsW8sp5Pepk4AKd5QmdBfslkl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565075307; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=B7jGggRJo9D2VuMgtcdSGsa/EIgx9yxFf4WgNNIcVso=; b=AhFh+n0d7eTiX/C7vG8MqEwDPnQSt86h/bKArkPXdqZq9vlGP+xN7zjPQBKzQ7MRlqSjAfrVx0HIg9Q8l4J3W3WOeRQuddgJRUiStcGMGn13jHyt55GhrUme8ln+QMfK0DJMtRGvhscZai3eRi+6w4rI3YppOHcQo8YPTulz1LM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1565075307058510.4458365941001; Tue, 6 Aug 2019 00:08:27 -0700 (PDT) Received: from localhost ([::1]:59344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1huta6-0005Eu-2O for importer@patchew.org; Tue, 06 Aug 2019 03:08:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39118) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hutZ3-00037C-4L for qemu-devel@nongnu.org; Tue, 06 Aug 2019 03:07:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hutZ2-0008UZ-7W for qemu-devel@nongnu.org; Tue, 06 Aug 2019 03:07:21 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:44121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hutZ2-0008U9-1s for qemu-devel@nongnu.org; Tue, 06 Aug 2019 03:07:20 -0400 Received: by mail-wr1-x441.google.com with SMTP id p17so86713433wrf.11 for ; Tue, 06 Aug 2019 00:07:19 -0700 (PDT) Received: from 640k.localdomain.com ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id t13sm103637009wrr.0.2019.08.06.00.07.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Aug 2019 00:07:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=B7jGggRJo9D2VuMgtcdSGsa/EIgx9yxFf4WgNNIcVso=; b=lsWVHAC3Q2t2jyz2+q+JukaX2sHSa+sHt0jVvfuulN/5tV25ibQs6G1slFuP/w+cMH CO808+hHEQ2nT8oPVg/G5+n4u/xG5/0QFqiddSYMiPpm5VK7VYnSirVktMfDtKo0jKuu Mw4EeZqSDNkbdVhM4BpJ7gLMmsNb3ru8fFA28qnr+i0Tf34+vKDSLzf+8HoJmxNGshvo YrKAauLZxffLO2CSGD8/0GxcCZ50f8PdVTe5e9IAslqmZkjRGp424r+LF8VtKMHcTnYT Q6eZw8hPcvuz9lNNGQRtLyGgazX2IhGlx+24GS1oxLmTuJB6M0EMQejUCD5sYxXAEG0M lT2g== 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:subject:date:message-id :in-reply-to:references; bh=B7jGggRJo9D2VuMgtcdSGsa/EIgx9yxFf4WgNNIcVso=; b=CCKwwVvoJbVnvMAgi+arMN/2LDHoHnAWuXbzrtlavGjAeKsTEjlzmFOv+TOt/HhHBw h3sQ08dx7zAIIWyLq+g9LjUpNJUj1ScVu0voBPXOaSILm+AtpAzIcnlwDauqqV3I+ks6 xJDiycSgrGwqk9+Z7g32WTKq39Psdjpttduu7fa5Ob4h1AXuZ6+h6p2iS1sN7HxJ1+PJ KGjzne724Th2KsNYsr/46VriyOV/9Fds+waU5bg02dnJ2lK03afug6QuPnKOC6wPfmkC YiF3cNmolE3LUJ6GKDlzeLuT6z9oYf6ULpK02SOOl6iaCKGsFo2HOICZMLLFZHvYjYxw V12g== X-Gm-Message-State: APjAAAV23Q0K0MXqjgiJzzzG/XxIdXToTngISqjYrj+EVNVOi4cwRno/ KeYHr0DbdkU0w1f6GSkdQsKRJCo8 X-Google-Smtp-Source: APXvYqw81DTuoMoXw1uqJa3h5fW6gblVW4wBSmoRoxaMdXJHildTU2uc6Ulv6bmQwp5BLu+xEDYg+A== X-Received: by 2002:a5d:4602:: with SMTP id t2mr2718168wrq.340.1565075238788; Tue, 06 Aug 2019 00:07:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Aug 2019 09:07:13 +0200 Message-Id: <1565075233-10882-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1565075233-10882-1-git-send-email-pbonzini@redhat.com> References: <1565075233-10882-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 2/2] configure: define CONFIG_TOOLS here 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: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Defining CONFIG_TOOLS on the basis of $(TOOLS) has the disadvantage of including it also if e.g. qemu-ga is requested. The correct information is available in configure, define it there. This also has the benefit of not installing the manpages for block layer tools if the only "tool" being built is the guest agent. Signed-off-by: Paolo Bonzini --- Makefile | 5 ++--- configure | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e532043..dfd158c 100644 --- a/Makefile +++ b/Makefile @@ -87,8 +87,7 @@ endif =20 include $(SRC_PATH)/rules.mak =20 -# notempy and lor are defined in rules.mak -CONFIG_TOOLS :=3D $(call notempty,$(TOOLS)) +# lor is defined in rules.mak CONFIG_BLOCK :=3D $(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)) =20 # Create QEMU_PKGVERSION and FULL_VERSION strings @@ -797,7 +796,7 @@ ifdef CONFIG_POSIX $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" $(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7" -ifneq ($(TOOLS),) +ifeq ($(CONFIG_TOOLS),y) $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" $(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8" diff --git a/configure b/configure index 8e17f44..c5a5b44 100755 --- a/configure +++ b/configure @@ -6597,6 +6597,9 @@ fi if test "$profiler" =3D "yes" ; then echo "CONFIG_PROFILER=3Dy" >> $config_host_mak fi +if test "$want_tools" =3D "yes" ; then + echo "CONFIG_TOOLS=3Dy" >> $config_host_mak +fi if test "$slirp" !=3D "no"; then echo "CONFIG_SLIRP=3Dy" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=3D\"$smbd\"" >> $config_host_mak --=20 1.8.3.1