From nobody Mon Feb 9 18:19:54 2026 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=1562775525; cv=none; d=zoho.com; s=zohoarc; b=c5/mOnI6TcVTUAYjAMJPvuuHMitWZcI5wrPkDghr4s8sEH/Z/fTz+gWTQP9P9VIHvYkiZG5gIir4HaKUOkKCIF5V84YDurWGrLitr7BlIWbbDjXUNL6/4SitCAaNqzG781HZX2r4EM0Yd6j0swV6XEThOfigv6s6LFx7oSsJkfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562775525; h=Cc: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=dX31/pShFtHDFUD8cp02Xwwr4WggC1YB603YwzepdnU=; b=DxlAdzqAx5FLx+I3mUIozCVx7SiG2SMh3Fe4OVL7ephILHXwaD0L3xcaZ43EX3fn6hp3aj1yzOmcY5nQkESB3UpD7+Sp8FgSo2d13DEj96xi2GVyHHsanMcEe8Oz5A0OT6x5/lKIrdEKjAt3HfCQ5WiWLH/8VlU3knfEo6rbQlU= 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 1562775525352611.091428075847; Wed, 10 Jul 2019 09:18:45 -0700 (PDT) Received: from localhost ([::1]:35232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlFIl-00088N-DM for importer@patchew.org; Wed, 10 Jul 2019 12:18:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55413) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlFF4-00068V-73 for qemu-devel@nongnu.org; Wed, 10 Jul 2019 12:14:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlFEy-0007az-0L for qemu-devel@nongnu.org; Wed, 10 Jul 2019 12:14:46 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:39961) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlFEv-0007V1-6F for qemu-devel@nongnu.org; Wed, 10 Jul 2019 12:14:41 -0400 Received: by mail-wm1-x344.google.com with SMTP id v19so2871945wmj.5 for ; Wed, 10 Jul 2019 09:14:39 -0700 (PDT) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id w14sm2573747wrk.44.2019.07.10.09.14.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jul 2019 09:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=dX31/pShFtHDFUD8cp02Xwwr4WggC1YB603YwzepdnU=; b=b9UydPK/r5BSMWvuNIm/4K45jIz7h7bp+GUlbr4D6o60SxBa2Jy/k+jSU0EonhEZBJ K14BPjuLPxB61OhdkNzOMJG2hpWlVSvjIYOrSUEKCtEri7IFEidGkt+uYnBjXShgv8LM Sa5xPk2pe73NmN08aD9yY/Usht3UbxJx2Gljytf3DaLzQqARogq0ylgzrdzfIrNij2OQ OPSauLqDvcQMZwOmR4UbkiZ6pxi4x+GSTX1F+H2tidX0HPKRdV5W4sE+JzshzSpOH/iR fvZ3M0T0TbvWAbIHck7kK0Xj0XUXz41hwqMlrxdFI3f05Py010RkP5B/VgsISOVVDZc8 qLqQ== 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:cc:subject:date:message-id :in-reply-to:references; bh=dX31/pShFtHDFUD8cp02Xwwr4WggC1YB603YwzepdnU=; b=G1PTomeh+hanD8cLdhZajsxiMXph/pqx8HvAdSUHlHF9OjGV3kSmaq7n9iOpMpguR0 3ESADdgS7o/t4/EZKvg3LUOh0uwoLGQEsCrWqHztwiIvjRobBUoBrcLF95hJPzvpbp2m RhHXdwXaAl0Jvtzibu9u9kcJePcimSbzsfz9yxbP/xEo7a/8SLjhm07rm7BfDsIl7663 J+n5/UVb3Pf64t+dFXCPPd/Ybf9n9rx1ihI/4MXNPmDxZ1TrXNfwNeJ/YerK06zmBRmv mMbhlHq94KU7SPmKLRQOdA8JWPbG4bYTSaGuu14DoTzUO2cDoFUO+9veRCCNrTRbZoM+ 5AAA== X-Gm-Message-State: APjAAAWBgCxUNDZMLKoAE/Txulpwp1ETUrl9RqZI65g5TKmGMU7Ajebe FujNGYpv3G2+Wiqm0Av2QN6m20zkQII= X-Google-Smtp-Source: APXvYqyxiyKE8F6uM75BCSCklkAIr8h2+89qiI4YDUYWAGCiHQzsZGVsOCDFZKdMt5EaE2uKOPRRMw== X-Received: by 2002:a7b:c247:: with SMTP id b7mr6385347wmj.13.1562775278857; Wed, 10 Jul 2019 09:14:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 10 Jul 2019 18:14:27 +0200 Message-Id: <1562775267-1222-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562775267-1222-1-git-send-email-pbonzini@redhat.com> References: <1562775267-1222-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::344 Subject: [Qemu-devel] [PATCH 8/8] rdmacm-mux: convert to Meson 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , berrange@redhat.com, armbru@redhat.com 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" 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 --- .gitignore | 1 + Makefile | 5 ----- Makefile.objs | 1 - contrib/rdmacm-mux/Makefile.objs | 3 --- contrib/rdmacm-mux/meson.build | 6 ++++++ meson.build | 2 ++ 6 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 contrib/rdmacm-mux/Makefile.objs create mode 100644 contrib/rdmacm-mux/meson.build diff --git a/.gitignore b/.gitignore index eff317c..656db05 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ /qemu-version.h.tmp /module_block.h /scsi/qemu-pr-helper +/contrib/rdmacm-mux/rdmacm-mux /contrib/vhost-user-scsi/vhost-user-scsi /contrib/vhost-user-blk/vhost-user-blk /fsdev/virtfs-proxy-helper diff --git a/Makefile b/Makefile index dd88634..a11df79 100644 --- a/Makefile +++ b/Makefile @@ -322,7 +322,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 \ @@ -510,10 +509,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 1ea1d20..ca77ad1 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -114,7 +114,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 3df744a..0000000 --- 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 0000000..8451756 --- /dev/null +++ b/contrib/rdmacm-mux/meson.build @@ -0,0 +1,6 @@ +if config_host['CONFIG_PVRDMA'] =3D=3D 'y' + # 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]) +endif diff --git a/meson.build b/meson.build index 2d29418..b778dda 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,5 @@ project('qemu', 'c', meson_version: '>=3D0.50.999') +cc =3D meson.get_compiler('c') =20 kconfig =3D import('unstable-kconfig') ss =3D import('sourceset') @@ -148,5 +149,6 @@ libqemuutil =3D static_library('qemuutil', # Other build targets =20 subdir('contrib/libvhost-user') +subdir('contrib/rdmacm-mux') subdir('contrib/vhost-user-blk') subdir('contrib/vhost-user-scsi') --=20 1.8.3.1