From nobody Mon Feb 9 19:07:26 2026 Delivered-To: importer@patchew.org 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; 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=1576156308; cv=none; d=zohomail.com; s=zohoarc; b=QxrU0H7wkdGmndENpV2bO4e4zykdEl/r/S+xPG1of3Cx8Ao+BDQxiaQh5V0oopt5HYrH3iTQCxiGNUW7/Upj1EWrOPI/+Q0ZXnHMIn/TWfovtEPvDMqKOyF5zHauNtPG2zlROVGKvEd+/vNHjOEKqUn4fbFD5W/lAnQv8hHETUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576156308; 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=o0zqfdZ8p5g/pfdlVwgBoMj3GcdSJMfztzyAKgF38iE=; b=g/S+GinfC2K3u5Qi6VFMQaD/aNjAjZ8leppcYnvfBK8nzgsw3Z59Ny5/eMr1XbOoV3rQl/jVf3ICQaz0zosgUTyuqBkMRnUwXv6KGzd07aJO1WKjMasmjW9f+BVSahdQwy6J7uQfe5PppdR5LoyPtWzbHNfqWftbtwDZ9oo4+qY= 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 1576156308886212.9006410610823; Thu, 12 Dec 2019 05:11:48 -0800 (PST) Received: from localhost ([::1]:59068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOFv-00079d-4F for importer@patchew.org; Thu, 12 Dec 2019 08:11:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60686) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyF-0003Im-Hu for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyE-0006UO-6N for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:31 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:54265) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyD-0006T4-Vx for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:30 -0500 Received: by mail-wm1-x335.google.com with SMTP id n9so2244661wmd.3 for ; Thu, 12 Dec 2019 04:53:29 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:28 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=o0zqfdZ8p5g/pfdlVwgBoMj3GcdSJMfztzyAKgF38iE=; b=n469trpLtiVxcZfHiZo3wgL4eoEOwvEPTdTWFmb+v0n5WXWR4UfjCtRW/9P+kB+l4P DQiBWclHgnxLHgTFbaJTACRhqtLeNSsjiBANYdt/CIS8uMkJu4L5TMq6hK25cgwtKDJR mQiA/nfALyJEKQlckAiNvkfTxj9aZCaIe8QAWlsdqP7+tODM28phO7liZctoy9D6ByHo QleYFJ5TRnJPHq7DSVTdKNuuia9c+qdD4NGpbVmrvobLgjERAzFu4Y/f0qvi5kZdg6PZ 9HTGKOwbasb8kP/8lk5spUcrmepS7yZ9g+Xu3u8AymUX2Kl2COozEuT9Q8jBgxTAXXjJ ipJQ== 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:mime-version:content-transfer-encoding; bh=o0zqfdZ8p5g/pfdlVwgBoMj3GcdSJMfztzyAKgF38iE=; b=Hcr0DfVD4TF4HCk9abo0diST8PHiDrTZhgJgGHAFpWLxq7+yxeuGNiO09a6xFS6buo OBnHCl5ImcunPys0g9zpPt03Id+IaJ670/qjEbZOcQs0Hj+49nCaXbi9Pk5oFV88A5W/ Cmr4suKHlJz7PAZ140hHGywaNCCF9O7E9xNFRrzTVHVINzPjP2UQd47dcaV6tOTNSSqC YQs1vU/2smlhI+QfGKxI//a7LqoxbquaBZKqlP/Ce6Q7Te2BrQM4e64PSTyhmtTqB0lg GwMZjS6ADN568FxjGj0SQDvIWBngj1qrENF96XE4EjWzbk2QQw2HB8LpEiyCkyo/P4tP 00Jg== X-Gm-Message-State: APjAAAW/JKKTJBcdNoBSE+5F5zs0F4DKqqiBfbgrj58bnaC6E3YSODlg /0dY/tAfQqZfYYDGqTut2F6jioHw X-Google-Smtp-Source: APXvYqw6SNzzN++v1Il9p61CAVIoov3uVoVy3Ec04r6CSTIIPog0oDYI/8Ii9cGIBpWEa4KisXIJEg== X-Received: by 2002:a05:600c:2290:: with SMTP id 16mr6817055wmf.93.1576155208811; Thu, 12 Dec 2019 04:53:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 031/132] meson: configure 50-qemu-gpu.json Date: Thu, 12 Dec 2019 13:51:15 +0100 Message-Id: <1576155176-2464-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 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) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- Makefile | 7 +------ contrib/vhost-user-gpu/meson.build | 5 +++++ rules.mak | 7 ------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 7588467..0a6615c 100644 --- a/Makefile +++ b/Makefile @@ -118,13 +118,8 @@ $(call set-vpath, $(SRC_PATH)) =20 LIBS+=3D-lz $(LIBS_TOOLS) =20 -vhost-user-json-y =3D HELPERS-y =3D =20 -ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy) -vhost-user-json-y +=3D contrib/vhost-user-gpu/50-qemu-gpu.json -endif - ifdef BUILD_DOCS DOCS=3Dqemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 DOCS+=3Ddocs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/= interop/qemu-qmp-ref.7 @@ -217,7 +212,7 @@ dummy :=3D $(call unnest-vars,, \ =20 include $(SRC_PATH)/tests/Makefile.include =20 -all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-= all modules $(vhost-user-json-y) +all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-= all modules =20 config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build index 8778aa7..7303b6d 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -2,4 +2,9 @@ if 'CONFIG_VIRGL' in config_host and 'CONFIG_GBM' in config= _host executable('vhost-user-gpu', files('main.c', 'virgl.c', 'vugbm.c'), link_with: libvhost_user, dependencies: [qemuutil, pixman, gbm, virgl]) + + configure_file(input: '50-qemu-gpu.json.in', + output: '50-qemu-gpu.json', + configuration: config_host, + install_dir: config_host['qemu_datadir'] / 'vhost-user') endif diff --git a/rules.mak b/rules.mak index fa9960c..5289184 100644 --- a/rules.mak +++ b/rules.mak @@ -393,10 +393,3 @@ TEXI2MAN =3D $(call quiet-command, \ $(call TEXI2MAN) %.8: $(call TEXI2MAN) - -GEN_SUBST =3D $(call quiet-command, \ - sed -e "s!@libexecdir@!$(libexecdir)!g" < $< > $@, \ - "GEN","$@") - -%.json: %.json.in - $(call GEN_SUBST) --=20 1.8.3.1