From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 57B4B45BFE; Mon, 28 Oct 2024 16:48:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB28642759; Mon, 28 Oct 2024 16:48:34 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B4AB842670 for ; Mon, 28 Oct 2024 16:48:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730130511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c6IR9YVlPFxjHLZbh/wvOGlrkZeQk9IFx+RWtL75Gb0=; b=WtaWng1pa+jEUBEgHdd8TifEm4zLbHc7bEO6orZbctuxjQsI2MkG0ND6z2nyOxaGcNmwwo ATsI346wEKM1eZl/SdnXfem+n6hCQNGCa8ShlSSSYaPNTbNaOQXOyNEbjMWJ6hjwq0rqRX qyQACaOw7x0R03LFwnVfE/CJkP0l4g0= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-427-EH90DXw7My-Q2pCUX6nxTw-1; Mon, 28 Oct 2024 11:48:30 -0400 X-MC-Unique: EH90DXw7My-Q2pCUX6nxTw-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D59741955F43; Mon, 28 Oct 2024 15:48:28 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.22]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2352F19560A2; Mon, 28 Oct 2024 15:48:25 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, david.marchand@redhat.com, techboard@dpdk.org, stephen@networkplumber.org, ferruh.yigit@amd.com, thomas@monjalon.net, mb@smartsharesystems.com Cc: Maxime Coquelin Subject: [PATCH v3 3/3] vduse: use imported VDUSE uAPI header Date: Mon, 28 Oct 2024 16:48:13 +0100 Message-ID: <20241028154813.290420-4-maxime.coquelin@redhat.com> In-Reply-To: <20241028154813.290420-1-maxime.coquelin@redhat.com> References: <20241028154813.290420-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch makes use of the imported VDUSE headers. The VDUSE support is now systematically built on Linux systems, even if the build system does not support its ioctl(). Signed-off-by: Maxime Coquelin Acked-by: Morten Brørup --- lib/vhost/meson.build | 5 +---- lib/vhost/vduse.c | 2 +- lib/vhost/vduse.h | 22 ---------------------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build index 41b622a9be..5c2528ff8c 100644 --- a/lib/vhost/meson.build +++ b/lib/vhost/meson.build @@ -23,16 +23,13 @@ sources = files( 'iotlb.c', 'socket.c', 'vdpa.c', + 'vduse.c', 'vhost.c', 'vhost_crypto.c', 'vhost_user.c', 'virtio_net.c', 'virtio_net_ctrl.c', ) -if cc.has_header('linux/vduse.h') - sources += files('vduse.c') - cflags += '-DVHOST_HAS_VDUSE' -endif headers = files( 'rte_vdpa.h', 'rte_vhost.h', diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c index 8ba58555f9..eaf3146b95 100644 --- a/lib/vhost/vduse.c +++ b/lib/vhost/vduse.c @@ -8,7 +8,7 @@ #include -#include +#include #include #include diff --git a/lib/vhost/vduse.h b/lib/vhost/vduse.h index 0d8f3f1205..47ca97a064 100644 --- a/lib/vhost/vduse.h +++ b/lib/vhost/vduse.h @@ -9,29 +9,7 @@ #define VDUSE_NET_SUPPORTED_FEATURES VIRTIO_NET_SUPPORTED_FEATURES -#ifdef VHOST_HAS_VDUSE - int vduse_device_create(const char *path, bool compliant_ol_flags); int vduse_device_destroy(const char *path); -#else - -static inline int -vduse_device_create(const char *path, bool compliant_ol_flags) -{ - RTE_SET_USED(compliant_ol_flags); - - VHOST_CONFIG_LOG(path, ERR, "VDUSE support disabled at build time"); - return -1; -} - -static inline int -vduse_device_destroy(const char *path) -{ - VHOST_CONFIG_LOG(path, ERR, "VDUSE support disabled at build time"); - return -1; -} - -#endif /* VHOST_HAS_VDUSE */ - #endif /* _VDUSE_H */ -- 2.46.2