mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: "Jason Wang" <jasowang@redhat.com>,
	"Xuan Zhuo" <xuanzhuo@linux.alibaba.com>,
	"Eugenio Pérez" <eperezma@redhat.com>,
	virtualization@lists.linux.dev
Subject: [PATCH 11/14] tools/virtio: switch to kernel's virtio_config.h
Date: Thu, 4 Dec 2025 13:46:25 -0500	[thread overview]
Message-ID: <8e5c85dc8aad001f161f7e2d8799ffbccfc31381.1764873799.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1764873799.git.mst@redhat.com>

Drops stubs in virtio_config.h, use the kernel's version instead - we
are now activly developing it, so the stub became too hard to maintain.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tools/virtio/linux/virtio_config.h | 102 +----------------------------
 1 file changed, 1 insertion(+), 101 deletions(-)

diff --git a/tools/virtio/linux/virtio_config.h b/tools/virtio/linux/virtio_config.h
index 42a564f22f2d..a0cd3f9a3111 100644
--- a/tools/virtio/linux/virtio_config.h
+++ b/tools/virtio/linux/virtio_config.h
@@ -1,101 +1 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LINUX_VIRTIO_CONFIG_H
-#define LINUX_VIRTIO_CONFIG_H
-#include <linux/virtio_byteorder.h>
-#include <linux/virtio.h>
-#include <uapi/linux/virtio_config.h>
-
-struct virtio_config_ops {
-	int (*disable_vq_and_reset)(struct virtqueue *vq);
-	int (*enable_vq_after_reset)(struct virtqueue *vq);
-};
-
-/*
- * __virtio_test_bit - helper to test feature bits. For use by transports.
- *                     Devices should normally use virtio_has_feature,
- *                     which includes more checks.
- * @vdev: the device
- * @fbit: the feature bit
- */
-static inline bool __virtio_test_bit(const struct virtio_device *vdev,
-				     unsigned int fbit)
-{
-	return vdev->features & (1ULL << fbit);
-}
-
-/**
- * __virtio_set_bit - helper to set feature bits. For use by transports.
- * @vdev: the device
- * @fbit: the feature bit
- */
-static inline void __virtio_set_bit(struct virtio_device *vdev,
-				    unsigned int fbit)
-{
-	vdev->features |= (1ULL << fbit);
-}
-
-/**
- * __virtio_clear_bit - helper to clear feature bits. For use by transports.
- * @vdev: the device
- * @fbit: the feature bit
- */
-static inline void __virtio_clear_bit(struct virtio_device *vdev,
-				      unsigned int fbit)
-{
-	vdev->features &= ~(1ULL << fbit);
-}
-
-#define virtio_has_feature(dev, feature) \
-	(__virtio_test_bit((dev), feature))
-
-/**
- * virtio_has_dma_quirk - determine whether this device has the DMA quirk
- * @vdev: the device
- */
-static inline bool virtio_has_dma_quirk(const struct virtio_device *vdev)
-{
-	/*
-	 * Note the reverse polarity of the quirk feature (compared to most
-	 * other features), this is for compatibility with legacy systems.
-	 */
-	return !virtio_has_feature(vdev, VIRTIO_F_ACCESS_PLATFORM);
-}
-
-static inline bool virtio_is_little_endian(struct virtio_device *vdev)
-{
-	return virtio_has_feature(vdev, VIRTIO_F_VERSION_1) ||
-		virtio_legacy_is_little_endian();
-}
-
-/* Memory accessors */
-static inline u16 virtio16_to_cpu(struct virtio_device *vdev, __virtio16 val)
-{
-	return __virtio16_to_cpu(virtio_is_little_endian(vdev), val);
-}
-
-static inline __virtio16 cpu_to_virtio16(struct virtio_device *vdev, u16 val)
-{
-	return __cpu_to_virtio16(virtio_is_little_endian(vdev), val);
-}
-
-static inline u32 virtio32_to_cpu(struct virtio_device *vdev, __virtio32 val)
-{
-	return __virtio32_to_cpu(virtio_is_little_endian(vdev), val);
-}
-
-static inline __virtio32 cpu_to_virtio32(struct virtio_device *vdev, u32 val)
-{
-	return __cpu_to_virtio32(virtio_is_little_endian(vdev), val);
-}
-
-static inline u64 virtio64_to_cpu(struct virtio_device *vdev, __virtio64 val)
-{
-	return __virtio64_to_cpu(virtio_is_little_endian(vdev), val);
-}
-
-static inline __virtio64 cpu_to_virtio64(struct virtio_device *vdev, u64 val)
-{
-	return __cpu_to_virtio64(virtio_is_little_endian(vdev), val);
-}
-
-#endif
+#include "../../include/linux/virtio_config.h"
-- 
MST


  parent reply	other threads:[~2025-12-04 18:46 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-04 18:45 [PATCH 00/14] tools/virtio: cleanups, fixes Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 01/14] tools/virtio: fix up compiler.h stub Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 02/14] virtio: make it self-contained Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 03/14] tools/virtio: use kernel's virtio.h Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 04/14] tools/virtio: add struct module forward declaration Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 05/14] tools/virtio: stub DMA mapping functions Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 06/14] tools/virtio: add dev_WARN_ONCE and is_vmalloc_addr stubs Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 07/14] tools/virtio: add ucopysize.h stub Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 08/14] tools/virtio: pass KCFLAGS to module build Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 09/14] tools/virtio: add struct cpumask to cpumask.h Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 10/14] tools/virtio: stub might_sleep and synchronize_rcu Michael S. Tsirkin
2025-12-04 18:46 ` Michael S. Tsirkin [this message]
2025-12-04 18:46 ` [PATCH 12/14] virtio_features: make it self-contained Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 13/14] tools/virtio: fix up oot build Michael S. Tsirkin
2025-12-04 18:46 ` [PATCH 14/14] tools/virtio: add device, device_driver stubs Michael S. Tsirkin
2025-12-09 13:09 ` [PATCH 00/14] tools/virtio: cleanups, fixes Michael S. Tsirkin
2025-12-10  6:24   ` Jason Wang
2025-12-10  7:01     ` Michael S. Tsirkin
2025-12-11  7:12     ` Michael S. Tsirkin
2025-12-11  7:22       ` Jason Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8e5c85dc8aad001f161f7e2d8799ffbccfc31381.1764873799.git.mst@redhat.com \
    --to=mst@redhat.com \
    --cc=eperezma@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=virtualization@lists.linux.dev \
    --cc=xuanzhuo@linux.alibaba.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®