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 BA0B045963; Wed, 11 Sep 2024 21:32:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E713B40E43; Wed, 11 Sep 2024 21:32:49 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id D76B240654 for ; Wed, 11 Sep 2024 21:32:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726083166; 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=Kd3bqVal8p1+n1jXaa4RySdKKwylb8wef1Cx5iSAOkM=; b=UX/pSqdtKEU6+6mr2AJ807S0Rb4D/C3ctUrnfGBOWq8pm1liF+wM76R2YA6+IxBfiT5Hje tszD35AV4oedD8FJfNyq21llkcmwIy5aQ7M7Awlh9qbUkfhFrNWU5txTKHYDj3UwwP3LFQ Gj98RkraUietkjei0Qlne1nteNBjv44= 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-218-tIeIiDF7PLycNxp0bVjtUQ-1; Wed, 11 Sep 2024 15:32:42 -0400 X-MC-Unique: tIeIiDF7PLycNxp0bVjtUQ-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 E08371953945; Wed, 11 Sep 2024 19:32:39 +0000 (UTC) Received: from max-p1.redhat.com (unknown [10.39.208.29]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7E438195605A; Wed, 11 Sep 2024 19:32:37 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, techboard@dpdk.org, david.marchand@redhat.com, thomas@monjalon.net, mb@smartsharesystems.com, stephen@networkplumber.org Cc: Maxime Coquelin Subject: [RFC v3 3/3] vduse: use imported VDUSE uAPI header Date: Wed, 11 Sep 2024 21:32:24 +0200 Message-ID: <20240911193224.1966122-4-maxime.coquelin@redhat.com> In-Reply-To: <20240911193224.1966122-1-maxime.coquelin@redhat.com> References: <20240911193224.1966122-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 --- 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 c66602905c..a41ff2024c 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.0