From nobody Mon Feb 9 20:35:30 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=1576156207; cv=none; d=zohomail.com; s=zohoarc; b=TbZoX0/JUDgL0GFUDkrfZyWEm1TXLc7eREfbHKhMuKB2DHbINlYHiV6nnR7odFFewTy0JYJh2dHZRjAsx/sUQ2zaqVzXxzRO98enLsPOvu5kvsuuLvVi2kuGQ+aWZ0ZC1az81hKc7W26x8KsG/yGUTcrSeUkMSSHyJAgmP4nAgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576156207; 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=IF5qsvUc74XpoVnD59p+tpu+W3LvjPJ8O9RYhUgLrSw=; b=Y9yGPZK3QGIVHl5Epac3CE2/yQMyicDL4zwhuE95fXtDk21awi9u0cSKHvCTU6k7S6dWGVklQMLHAyjEVlX8z6cBKlyCB0GDFIUR1FnsECkzt7JWAWdjnsWDJ7Cl+dMFaG/1gb3NEGmSmdVTeOa3yf2OcbDrsMpE9jQOyOEZ0RM= 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 1576156207112586.6421932718013; Thu, 12 Dec 2019 05:10:07 -0800 (PST) Received: from localhost ([::1]:59048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOEH-0005aw-FG for importer@patchew.org; Thu, 12 Dec 2019 08:10:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58131) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy2-0002xk-0K for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy0-00063b-KM for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:17 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:43661) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy0-00061j-Cy for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:16 -0500 Received: by mail-wr1-x430.google.com with SMTP id d16so2587767wre.10 for ; Thu, 12 Dec 2019 04:53:16 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.14 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:14 -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=IF5qsvUc74XpoVnD59p+tpu+W3LvjPJ8O9RYhUgLrSw=; b=Z9ttNJs967bIEorw8CUKzOYM/V77H5O439fvdf4uWyNEwGuaMA0Ddxo4ZCSREsBziV 1LMFBIH5aSkkdgdb3dOB/JqzfrvOEU/XteUP/KmC2Nu4tMH+x9g00MIQ/1jxYxnOBHM8 UJ2DxytGe7l6U2DdPKFOBa5ANych8F+20SDob3rIoVUibSX9MmnQsasy+iXfSHQpvRpK BFvNAS3X4ll+Dqw4O3jy5Pp1DMb7p5NQum9aaJcGf4ZSJ9N9G2Mb9Fkz7DV3uvhyUZBV cbL0NrTnLEEx8J4RN7wizD8RZ2TZ5AyJjmGqk9+F/FEs17s1s2Ab7Udktxr6+/Tu9MYm GVwA== 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=IF5qsvUc74XpoVnD59p+tpu+W3LvjPJ8O9RYhUgLrSw=; b=m4AXP71lNoTdw6b+6LA/mycPV7Vy9UygVU5Bi1Vdi2JQhuLKCTLEkh2iPIC2kvmBpT lHWNsAQug0cUROy4+DzobGzOe9bXAmJhs4tFzMcFZLwWDh1iif97psL827jdPxraemQA mE/Shzm78Z6npRZtQ8RAT53r+8bNy/wQ1/OMJ6Vs2yxreB+iESuYPYjNdHYVvm9niQ1s FpQJipJyCbFX98cMgoOIj6vj+bE/qH7E94USaj6uKi3M5n4UrOfIWzuzfReuNEOTFvxH MQeM0PvTEZcYr/SWd7srmezD9mv9EqI73GNe/83rP+XVGm3qTOByDBurM3L3dV3CCu1q 0LNg== X-Gm-Message-State: APjAAAVekL+FhGHL3TKg2wQ89+P0OIyDp8DkxLpd462FXlVKsQc8BFn5 bArQCzUrrmhs/omC/RSQ5bcRxsMq X-Google-Smtp-Source: APXvYqy9sbAimR3AcS2Ca17G252wUn1EjdJdnqkPB+4onCYRcOxDeGTBv7BgnRQM7lZeznqHP3a4OQ== X-Received: by 2002:adf:d848:: with SMTP id k8mr5979763wrl.328.1576155195103; Thu, 12 Dec 2019 04:53:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 017/132] contrib/vhost-user-gpu: convert to meson Date: Thu, 12 Dec 2019 13:51:01 +0100 Message-Id: <1576155176-2464-18-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::430 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 | 5 ----- Makefile.objs | 1 - contrib/vhost-user-gpu/Makefile.objs | 10 ---------- contrib/vhost-user-gpu/meson.build | 5 +++++ meson.build | 15 +++++++++++++++ 5 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 contrib/vhost-user-gpu/Makefile.objs create mode 100644 contrib/vhost-user-gpu/meson.build diff --git a/Makefile b/Makefile index 9528391..bf24c51 100644 --- a/Makefile +++ b/Makefile @@ -176,7 +176,6 @@ HELPERS-y =3D HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =3D qemu-bridge-hel= per$(EXESUF) =20 ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy) -HELPERS-y +=3D vhost-user-gpu$(EXESUF) vhost-user-json-y +=3D contrib/vhost-user-gpu/50-qemu-gpu.json endif =20 @@ -266,7 +265,6 @@ dummy :=3D $(call unnest-vars,, \ elf2dmp-obj-y \ ivshmem-client-obj-y \ ivshmem-server-obj-y \ - vhost-user-gpu-obj-y \ qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ @@ -462,9 +460,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMM= ON_LDADDS) $(call LINK, $^) endif =20 -vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/lib= vhost-user.a $(COMMON_LDADDS) - $(call LINK, $^) - module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(call quiet-command,$(PYTHON) $< $@ \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ diff --git a/Makefile.objs b/Makefile.objs index c7f7637..cae0f1d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -109,6 +109,5 @@ qga-vss-dll-obj-y =3D qga/ elf2dmp-obj-y =3D contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-server/ -vhost-user-gpu-obj-y =3D contrib/vhost-user-gpu/ =20 ###################################################################### diff --git a/contrib/vhost-user-gpu/Makefile.objs b/contrib/vhost-user-gpu/= Makefile.objs deleted file mode 100644 index 6170c91..0000000 --- a/contrib/vhost-user-gpu/Makefile.objs +++ /dev/null @@ -1,10 +0,0 @@ -vhost-user-gpu-obj-y =3D main.o virgl.o vugbm.o - -main.o-cflags :=3D $(PIXMAN_CFLAGS) $(GBM_CFLAGS) -main.o-libs :=3D $(PIXMAN_LIBS) - -virgl.o-cflags :=3D $(VIRGL_CFLAGS) $(GBM_CFLAGS) -virgl.o-libs :=3D $(VIRGL_LIBS) - -vugbm.o-cflags :=3D $(GBM_CFLAGS) -vugbm.o-libs :=3D $(GBM_LIBS) diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build new file mode 100644 index 0000000..8778aa7 --- /dev/null +++ b/contrib/vhost-user-gpu/meson.build @@ -0,0 +1,5 @@ +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]) +endif diff --git a/meson.build b/meson.build index e38c8a9..b0f3622 100644 --- a/meson.build +++ b/meson.build @@ -52,11 +52,23 @@ if 'CONFIG_GNUTLS' in config_host gnutls =3D declare_dependency(compile_args: config_host['GNUTLS_CFLAGS']= .split(), link_args: config_host['GNUTLS_LIBS'].split(= )) endif +pixman =3D declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].s= plit(), + link_args: config_host['PIXMAN_LIBS'].split()) libiscsi =3D declare_dependency() if 'CONFIG_LIBISCSI' in config_host libiscsi =3D declare_dependency(compile_args: config_host['LIBISCSI_CFLA= GS'].split(), link_args: config_host['LIBISCSI_LIBS'].sp= lit()) endif +gbm =3D declare_dependency() +if 'CONFIG_GBM' in config_host + gbm =3D declare_dependency(compile_args: config_host['GBM_CFLAGS'].split= (), + link_args: config_host['GBM_LIBS'].split()) +endif +virgl =3D declare_dependency() +if 'CONFIG_VIRGL' in config_host + virgl =3D declare_dependency(compile_args: config_host['VIRGL_CFLAGS'].s= plit(), + link_args: config_host['VIRGL_LIBS'].split()) +endif =20 target_dirs =3D config_host['TARGET_DIRS'].split() have_user =3D false @@ -199,6 +211,9 @@ if have_tools if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') + if 'CONFIG_LINUX' in config_host + subdir('contrib/vhost-user-gpu') + endif subdir('contrib/vhost-user-input') subdir('contrib/vhost-user-scsi') endif --=20 1.8.3.1