From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E464EC2D0C9 for ; Thu, 12 Dec 2019 13:01:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B245F2173E for ; Thu, 12 Dec 2019 13:01:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ePExnukR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B245F2173E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifO5W-0003S0-6K for qemu-devel@archiver.kernel.org; Thu, 12 Dec 2019 08:01:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57593) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNxz-0002sw-37 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNxx-0005y9-So for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:14 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39306) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNxx-0005wf-Lq for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:13 -0500 Received: by mail-wr1-x442.google.com with SMTP id y11so2611913wrt.6 for ; Thu, 12 Dec 2019 04:53:13 -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; bh=Ms4rgwqzwz2bjSXIt0fRvL5jyMoo90zVMU5D17dr7RM=; b=ePExnukRvuDRQTWBu+5WeKGpZOytzaeDBT9PDtwcp2sCWdO3dprGtt6Zucza1d6A5K 9CVQCKxX1fP0Zjd6GidnfQMGQNt4wKEpdGNtjoes9Z3jepMCYgjapc8Yi0dpmyq5pGon 8+6K/bz0hkcW/Byx9Wqyhlco3eAF/VIpDDWW+b3Amxes3xtNNy/vpDBCN7J70h7ag0tE RGkO1F9cnPgDBO34lb7GTwEHJQ0LF+aemn0/PiXmcj8HsS98aUTJlW5ew/TwJYn98Bvz 5SW1q5zze1EbJmgW4bsVmdLT+Vb2fdHmTKJxITNUj3OTT3Vv6C/zRfE2b5CbzDxtSZbt g67g== 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; bh=Ms4rgwqzwz2bjSXIt0fRvL5jyMoo90zVMU5D17dr7RM=; b=eDS1gueL/1/bzJN2VQn1Q0L9dQS4wpF6VcrQPTqThE8tUZ9PZoq8AXcs0eS7i9SQcw gwui/Snz1ydJK7Dg8EeMOPvfo8CZkcOLxYQXLuZ4e2PuePhusU7tWMstupxtqWRuI2fB MWl8ULvRjRb1BozYU0gIFteo4YONG662YEGmAJPb3tTLz3TPjzZfprQHZNE7M4rJDiPY at9C5k4PSbtYnSxGJSVUCoLk2NPGiKfQGfjButYh/h3y0vuRmQ4x4wM6BBci8QmKdUN3 uAutABvwSien2ov0TPGeimqgpi8vkXFG8Grmj+YcfDgipaUauxwnsT+18Uc+C85ZYv+W urCQ== X-Gm-Message-State: APjAAAUO1/s4plz1T1JwRYmuFtoiaNrOAnHP1MFfyX/bi7KWNcVIvFTS lh81Lhmtl47Gk/TD/VYKOcn+feed X-Google-Smtp-Source: APXvYqxI0BcajM5RvVZkT9WlT6FmeaGUcfXD/pcbuHiqrgm+UUSO8BKe7JpCy9yAHr4XbzLjh1Gyvw== X-Received: by 2002:adf:fc03:: with SMTP id i3mr6323606wrr.306.1576155192423; Thu, 12 Dec 2019 04:53:12 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 014/132] contrib/vhost-user-scsi: convert to Meson Date: Thu, 12 Dec 2019 13:50:58 +0100 Message-Id: <1576155176-2464-15-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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The libiscsi pkg-config information is extracted from config-host.mak and used to link vhost-user-blk. Signed-off-by: Paolo Bonzini --- Makefile | 3 --- Makefile.objs | 3 --- contrib/vhost-user-scsi/Makefile.objs | 1 - contrib/vhost-user-scsi/meson.build | 5 +++++ meson.build | 6 ++++++ 5 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 contrib/vhost-user-scsi/Makefile.objs create mode 100644 contrib/vhost-user-scsi/meson.build diff --git a/Makefile b/Makefile index f15c097..3971171 100644 --- a/Makefile +++ b/Makefile @@ -267,7 +267,6 @@ dummy := $(call unnest-vars,, \ ivshmem-client-obj-y \ ivshmem-server-obj-y \ rdmacm-mux-obj-y \ - vhost-user-scsi-obj-y \ vhost-user-input-obj-y \ vhost-user-gpu-obj-y \ qga-vss-dll-obj-y \ @@ -464,8 +463,6 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS) ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) $(call LINK, $^) endif -vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS) - $(call LINK, $^) rdmacm-mux$(EXESUF): LIBS += "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) diff --git a/Makefile.objs b/Makefile.objs index ba422dd..30804f0 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -109,9 +109,6 @@ qga-vss-dll-obj-y = qga/ elf2dmp-obj-y = contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/ -vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS) -vhost-user-scsi.o-libs := $(LIBISCSI_LIBS) -vhost-user-scsi-obj-y = contrib/vhost-user-scsi/ rdmacm-mux-obj-y = contrib/rdmacm-mux/ vhost-user-input-obj-y = contrib/vhost-user-input/ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ diff --git a/contrib/vhost-user-scsi/Makefile.objs b/contrib/vhost-user-scsi/Makefile.objs deleted file mode 100644 index e83a38a..0000000 --- a/contrib/vhost-user-scsi/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -vhost-user-scsi-obj-y = vhost-user-scsi.o diff --git a/contrib/vhost-user-scsi/meson.build b/contrib/vhost-user-scsi/meson.build new file mode 100644 index 0000000..0bdd5a5 --- /dev/null +++ b/contrib/vhost-user-scsi/meson.build @@ -0,0 +1,5 @@ +if 'CONFIG_LIBISCSI' in config_host + executable('vhost-user-scsi', files('vhost-user-scsi.c'), + link_with: libvhost_user, + dependencies: [qemuutil, libiscsi]) +endif diff --git a/meson.build b/meson.build index 4f2fc33..7ad5458 100644 --- a/meson.build +++ b/meson.build @@ -52,6 +52,11 @@ if 'CONFIG_GNUTLS' in config_host gnutls = declare_dependency(compile_args: config_host['GNUTLS_CFLAGS'].split(), link_args: config_host['GNUTLS_LIBS'].split()) endif +libiscsi = declare_dependency() +if 'CONFIG_LIBISCSI' in config_host + libiscsi = declare_dependency(compile_args: config_host['LIBISCSI_CFLAGS'].split(), + link_args: config_host['LIBISCSI_LIBS'].split()) +endif target_dirs = config_host['TARGET_DIRS'].split() have_user = false @@ -192,5 +197,6 @@ if have_tools if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') + subdir('contrib/vhost-user-scsi') endif endif -- 1.8.3.1