From nobody Tue Feb 10 15:46:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1597760799; cv=none; d=zohomail.com; s=zohoarc; b=WT2CQnpLa85MwDgGSQ0mgZ9itNciZG/BRjoE/p9BGAwGEVsCRZhGyOBIKmI7TNlghat6hGDN6pbOkF+FEPhzojJeR1tLuJ6etvs2uQSg9JMvrUXSHRm87SO9VT+36ujgAnF99HbYL3oXJu2eIlDQtQLor+SS50k7nramejBvIbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597760799; 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=H4TDwZi9VKlkZG4it2OTsij/omVvRReOeV/c6drBDuQ=; b=FfuTzfAsuhDEzUuPy2ten1mlZLi3Y2plXRB1gueZoAoRhaQItw+jyKX1in6hO3QnwzXA7siQLEyA+4eSvB5IJjQZO1iu8X+/MD7ApnZbRmgyTH7sN/7gzm7JkYBkHzcvKfIbfgfyFe8dH7gZMjOWY+V3SdyLNyZ8W7K6bFxxJPs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1597760799051244.17339601281947; Tue, 18 Aug 2020 07:26:39 -0700 (PDT) Received: from localhost ([::1]:41520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k82ZR-0005rO-Q7 for importer@patchew.org; Tue, 18 Aug 2020 10:26:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k82KU-0003d2-AG for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:11:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51407) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k82KL-0007Mj-9e for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:11:09 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-28-NujQR-zcMeK4Ght8uUE23g-1; Tue, 18 Aug 2020 10:10:58 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04C48801AE5 for ; Tue, 18 Aug 2020 14:10:57 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5970BA63 for ; Tue, 18 Aug 2020 14:10:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597759860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H4TDwZi9VKlkZG4it2OTsij/omVvRReOeV/c6drBDuQ=; b=LPC86hiHsXhc2v2GI4sx+hgAL1HI3C3aJouU251J4DNLK9EjcR1ICDzVD26uErPoXK74oO 20pUFrFGsvv/NCvOxwLEQm+0KodYSjslIjJUkTmks8a3gjtE/ueNHlZo4v8UjGQVtQKplU eOtPkYUWdGyhliFumkAJtDDCYbSIns0= X-MC-Unique: NujQR-zcMeK4Ght8uUE23g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 033/150] contrib/rdmacm-mux: convert to Meson Date: Tue, 18 Aug 2020 10:08:28 -0400 Message-Id: <20200818141025.21608-34-pbonzini@redhat.com> In-Reply-To: <20200818141025.21608-1-pbonzini@redhat.com> References: <20200818141025.21608-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/18 02:02:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We can use config-host.mak to decide whether the tool has to be built, apart from that the conversion is straightforward. Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- Makefile.objs | 1 - contrib/rdmacm-mux/Makefile.objs | 3 --- contrib/rdmacm-mux/meson.build | 8 ++++++++ meson.build | 2 ++ 5 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 contrib/rdmacm-mux/Makefile.objs create mode 100644 contrib/rdmacm-mux/meson.build diff --git a/Makefile b/Makefile index fa7bc837f1..0a5bc1f424 100644 --- a/Makefile +++ b/Makefile @@ -302,7 +302,6 @@ dummy :=3D $(call unnest-vars,, \ elf2dmp-obj-y \ ivshmem-client-obj-y \ ivshmem-server-obj-y \ - rdmacm-mux-obj-y \ vhost-user-input-obj-y \ vhost-user-gpu-obj-y \ qga-vss-dll-obj-y \ @@ -524,10 +523,6 @@ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COM= MON_LDADDS) $(call LINK, $^) endif =20 -rdmacm-mux$(EXESUF): LIBS +=3D "-libumad" -rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) - $(call LINK, $^) - vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/lib= vhost-user.a $(COMMON_LDADDS) $(call LINK, $^) =20 diff --git a/Makefile.objs b/Makefile.objs index ab798b08a7..0f80b63554 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -106,7 +106,6 @@ 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/ -rdmacm-mux-obj-y =3D contrib/rdmacm-mux/ vhost-user-input-obj-y =3D contrib/vhost-user-input/ vhost-user-gpu-obj-y =3D contrib/vhost-user-gpu/ =20 diff --git a/contrib/rdmacm-mux/Makefile.objs b/contrib/rdmacm-mux/Makefile= .objs deleted file mode 100644 index 3df744af89..0000000000 --- a/contrib/rdmacm-mux/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -ifdef CONFIG_PVRDMA -rdmacm-mux-obj-y =3D main.o -endif diff --git a/contrib/rdmacm-mux/meson.build b/contrib/rdmacm-mux/meson.build new file mode 100644 index 0000000000..1a01bb9262 --- /dev/null +++ b/contrib/rdmacm-mux/meson.build @@ -0,0 +1,8 @@ +if 'CONFIG_PVRDMA' in config_host + # if not found, CONFIG_PVRDMA should not be set + libumad =3D cc.find_library('ibumad', required: true) + executable('rdmacm-mux', files('main.c'), + dependencies: [glib, libumad], + build_by_default: targetos =3D=3D 'linux', + install: false) +endif diff --git a/meson.build b/meson.build index 70f3f82989..bddb97f416 100644 --- a/meson.build +++ b/meson.build @@ -257,6 +257,8 @@ qemuutil =3D declare_dependency(link_with: libqemuutil, # Other build targets =20 if have_tools + subdir('contrib/rdmacm-mux') + if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') --=20 2.26.2