From nobody Mon Feb 9 17:06:47 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=1576155752; cv=none; d=zohomail.com; s=zohoarc; b=KUOQid4ALHHQxwy1RaBL754X/i1JUnIHjoEmGPlusmMio0LDPPJJQTqVyT/Ud+eWy46VyXt/ffcHat4ikSigZjZPBmgUa4iCkgWKdhCQL3pN+vKNvbAioYS42KFzbB/q7Be1zy+ot5pMIOy+/dF7Kcq++Oe9byyFybGNjIzYe8Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576155752; 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=0NYMHi2w3AJtsFgwdAsi8gZ85gux6X8ozW51ZPtCtxA=; b=J7OBG53siua672uFZxuvRqc2ucaUIjklWtQ72rs6uAg/UwPCcRpOE9X06FV6A/08vgbDsqi3oi3b6Aw+UXd1on9YScv8/hTY7402JStou/pz8fi1n2MkKXooO1Y0uoCeYh0d1qepvxGPbMMlH5gu2w1vSbaWN+mqyWfOK4jbIOM= 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 1576155752839224.06671430659208; Thu, 12 Dec 2019 05:02:32 -0800 (PST) Received: from localhost ([::1]:58962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO6w-0004y0-Sv for importer@patchew.org; Thu, 12 Dec 2019 08:02:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58309) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNy3-0002z6-0B for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNy1-000656-HD for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:18 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:38404) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNy1-00063j-9g for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:17 -0500 Received: by mail-wr1-x42b.google.com with SMTP id y17so2619327wrh.5 for ; Thu, 12 Dec 2019 04:53:17 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:15 -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=0NYMHi2w3AJtsFgwdAsi8gZ85gux6X8ozW51ZPtCtxA=; b=e1i3W34x4XDuLiSB9FJr6lRMBBfHtLNmHH7GvwHAdLcSeGlU4+A87P+9bLl5zVfNjc HSjVgGqTGlFbDSJUmXPhwLd0uWYlwSx3JeGiizI1vLwL98feKqF4gL+sx2LOaouyCP/4 h28zy6lTo19bcspWPIOAUqHZM9nZfLEcbC/wsvL/EBzV5Nl7HO2MVR3vsmVIwMdZCXlR n0nLGjctk4s2l4a8D5PK1GcIt3pYNKFMoj3e6I6bbkraHy+ExcLg9RQ/lt80FLelkiaN HSkpPeu+K648qkz/tSgH7JdG9jGqrQyu2AxYL1qRtC0lAEzDnsFmaj9GO26G/WKd3aZE PDMw== 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=0NYMHi2w3AJtsFgwdAsi8gZ85gux6X8ozW51ZPtCtxA=; b=UkHA21HHY06BZZHFXhRysE5ZrkMAmfgsELZizOPxqOQBfQjKzR/97kSuzuiCxNYKnq st0fqGeXpuMr7rfaUi4auyOocUQP0bRoDgCZXqbcZQQf+lX9MskNWy14GYQ1Nh30D9GY f4zksrET8eD7Aa3+Px3Z4D8gw1Ukt/LbEvrfjEmMqzGNYNtXYhv6/h6nVOExZIDdBl2R QxcjMQGV2BJLk/Vw+4Kz7LPBoa73y8Nll9w8G/T4r24uoCK4Cjq8nk6bjmZQk29Uv3sk uFsLIofP8wD/sD6fS7rtlmNz2diG8bXw7aKxj0iG2eVP9bbHZLYhS3pgmH8sDfA5R5lt I/ig== X-Gm-Message-State: APjAAAWEbB+3JrAoTlX30UmYijmQ4peoyfLiCSG41o4v3V/OIdGAiuBD ec0ReGmAJ5O20sUfrtMveeaVdXDY X-Google-Smtp-Source: APXvYqzGL2nZHskZvfD7qg/CqNJtfVf6E4vU3KVl2k5rBbq2GBfD8l1RuUxXSJXCnTUfvnptKM39fQ== X-Received: by 2002:adf:90e7:: with SMTP id i94mr5993891wri.47.1576155196042; Thu, 12 Dec 2019 04:53:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 018/132] contrib/ivshmem: convert to meson Date: Thu, 12 Dec 2019 13:51:02 +0100 Message-Id: <1576155176-2464-19-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::42b 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 | 9 --------- Makefile.objs | 2 -- configure | 3 --- contrib/ivshmem-client/Makefile.objs | 1 - contrib/ivshmem-client/meson.build | 3 +++ contrib/ivshmem-server/Makefile.objs | 1 - contrib/ivshmem-server/meson.build | 3 +++ meson.build | 6 ++++++ 8 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 contrib/ivshmem-client/Makefile.objs create mode 100644 contrib/ivshmem-client/meson.build delete mode 100644 contrib/ivshmem-server/Makefile.objs create mode 100644 contrib/ivshmem-server/meson.build diff --git a/Makefile b/Makefile index bf24c51..d697aab 100644 --- a/Makefile +++ b/Makefile @@ -263,8 +263,6 @@ dummy :=3D $(call unnest-vars,, \ chardev-obj-y \ qga-obj-y \ elf2dmp-obj-y \ - ivshmem-client-obj-y \ - ivshmem-server-obj-y \ qga-vss-dll-obj-y \ block-obj-y \ block-obj-m \ @@ -453,13 +451,6 @@ endif elf2dmp$(EXESUF): $(elf2dmp-obj-y) $(call LINK, $^) =20 -ifdef CONFIG_IVSHMEM -ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS) - $(call LINK, $^) -ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) - $(call LINK, $^) -endif - 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 cae0f1d..919961f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -107,7 +107,5 @@ qga-vss-dll-obj-y =3D qga/ ###################################################################### # contrib elf2dmp-obj-y =3D contrib/elf2dmp/ -ivshmem-client-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-client/ -ivshmem-server-obj-$(CONFIG_IVSHMEM) =3D contrib/ivshmem-server/ =20 ###################################################################### diff --git a/configure b/configure index c27d06f..d59c831 100755 --- a/configure +++ b/configure @@ -6065,9 +6065,6 @@ if test "$want_tools" =3D "yes" ; then if [ "$linux" =3D "yes" -o "$bsd" =3D "yes" -o "$solaris" =3D "yes" ] ; = then tools=3D"qemu-nbd\$(EXESUF) $tools" fi - if [ "$ivshmem" =3D "yes" ]; then - tools=3D"ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" - fi if [ "$curl" =3D "yes" ]; then tools=3D"elf2dmp\$(EXESUF) $tools" fi diff --git a/contrib/ivshmem-client/Makefile.objs b/contrib/ivshmem-client/= Makefile.objs deleted file mode 100644 index bfab2d2..0000000 --- a/contrib/ivshmem-client/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -ivshmem-client-obj-y =3D ivshmem-client.o main.o diff --git a/contrib/ivshmem-client/meson.build b/contrib/ivshmem-client/me= son.build new file mode 100644 index 0000000..92ad844 --- /dev/null +++ b/contrib/ivshmem-client/meson.build @@ -0,0 +1,3 @@ +executable('ivshmem-client', files('ivshmem-client.c', 'main.c'), + dependencies: glib, + install: true) diff --git a/contrib/ivshmem-server/Makefile.objs b/contrib/ivshmem-server/= Makefile.objs deleted file mode 100644 index c060dd3..0000000 --- a/contrib/ivshmem-server/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -ivshmem-server-obj-y =3D ivshmem-server.o main.o diff --git a/contrib/ivshmem-server/meson.build b/contrib/ivshmem-server/me= son.build new file mode 100644 index 0000000..6dbe240 --- /dev/null +++ b/contrib/ivshmem-server/meson.build @@ -0,0 +1,3 @@ +executable('ivshmem-server', files('ivshmem-server.c', 'main.c'), + dependencies: [qemuutil, rt], + install: true) diff --git a/meson.build b/meson.build index b0f3622..e2eee80 100644 --- a/meson.build +++ b/meson.build @@ -54,6 +54,7 @@ if 'CONFIG_GNUTLS' in config_host endif pixman =3D declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].s= plit(), link_args: config_host['PIXMAN_LIBS'].split()) +rt =3D cc.find_library('rt', required: false) libiscsi =3D declare_dependency() if 'CONFIG_LIBISCSI' in config_host libiscsi =3D declare_dependency(compile_args: config_host['LIBISCSI_CFLA= GS'].split(), @@ -217,4 +218,9 @@ if have_tools subdir('contrib/vhost-user-input') subdir('contrib/vhost-user-scsi') endif + + if 'CONFIG_IVSHMEM' in config_host + subdir('contrib/ivshmem-client') + subdir('contrib/ivshmem-server') + endif endif --=20 1.8.3.1