From ee2b9a4e6d68da2d3f94b0de247b91dd244d7a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= <benjamin@zephyrproject.org>
Date: Fri, 4 Jul 2025 10:56:53 +0200
Subject: [PATCH] drivers: virtio: move virtio headers to zephyr/drivers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Virtio headers are moved to zephyr/drivers/ as they have no reason to be
top-level headers since virtio is a driver class.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
---
 MAINTAINERS.yml                                 | 3 ++-
 drivers/entropy/entropy_virtio.c                | 4 ++--
 drivers/virtio/virtio_common.c                  | 4 ++--
 drivers/virtio/virtio_mmio.c                    | 4 ++--
 drivers/virtio/virtio_pci.c                     | 4 ++--
 drivers/virtio/virtqueue.c                      | 2 +-
 include/zephyr/{virtio => drivers}/virtio.h     | 2 +-
 include/zephyr/{ => drivers}/virtio/virtqueue.h | 0
 8 files changed, 12 insertions(+), 11 deletions(-)
 rename include/zephyr/{virtio => drivers}/virtio.h (99%)
 rename include/zephyr/{ => drivers}/virtio/virtqueue.h (100%)

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 2489046843b..b0d5ab3c6a9 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -2266,7 +2266,8 @@ Release Notes:
   files:
     - drivers/virtio/
     - dts/bindings/virtio/
-    - include/zephyr/virtio/
+    - include/zephyr/drivers/virtio.h
+    - include/zephyr/drivers/virtio/
   labels:
     - "area: VIRTIO"
 
diff --git a/drivers/entropy/entropy_virtio.c b/drivers/entropy/entropy_virtio.c
index 8e21db662bf..d00db2a9ecc 100644
--- a/drivers/entropy/entropy_virtio.c
+++ b/drivers/entropy/entropy_virtio.c
@@ -5,8 +5,8 @@
  */
 
 #include <zephyr/drivers/entropy.h>
-#include <zephyr/virtio/virtio.h>
-#include <zephyr/virtio/virtqueue.h>
+#include <zephyr/drivers/virtio.h>
+#include <zephyr/drivers/virtio/virtqueue.h>
 #include <zephyr/logging/log.h>
 
 #define VIRTIO_ENTROPY_QUEUE_IDX 0
diff --git a/drivers/virtio/virtio_common.c b/drivers/virtio/virtio_common.c
index c90ae660212..44012370239 100644
--- a/drivers/virtio/virtio_common.c
+++ b/drivers/virtio/virtio_common.c
@@ -6,8 +6,8 @@
 
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/virtio/virtio.h>
-#include <zephyr/virtio/virtqueue.h>
+#include <zephyr/drivers/virtio.h>
+#include <zephyr/drivers/virtio/virtqueue.h>
 #include "virtio_common.h"
 
 LOG_MODULE_REGISTER(virtio_common, CONFIG_VIRTIO_LOG_LEVEL);
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index cd8b3392ef2..14eb15b03a0 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -10,8 +10,8 @@
 #include <zephyr/spinlock.h>
 #include <zephyr/sys/barrier.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/virtio/virtio.h>
-#include <zephyr/virtio/virtqueue.h>
+#include <zephyr/drivers/virtio.h>
+#include <zephyr/drivers/virtio/virtqueue.h>
 #include "virtio_common.h"
 
 #define DT_DRV_COMPAT virtio_mmio
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index e3a0ec1a683..d63e3f51a40 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -11,8 +11,8 @@
 #include <zephyr/spinlock.h>
 #include <zephyr/sys/barrier.h>
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/virtio/virtio.h>
-#include <zephyr/virtio/virtqueue.h>
+#include <zephyr/drivers/virtio.h>
+#include <zephyr/drivers/virtio/virtqueue.h>
 #include "virtio_common.h"
 #include "assert.h"
 
diff --git a/drivers/virtio/virtqueue.c b/drivers/virtio/virtqueue.c
index 96b55d5246c..4ff78caa8f0 100644
--- a/drivers/virtio/virtqueue.c
+++ b/drivers/virtio/virtqueue.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/virtio/virtqueue.h>
+#include <zephyr/drivers/virtio/virtqueue.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
diff --git a/include/zephyr/virtio/virtio.h b/include/zephyr/drivers/virtio.h
similarity index 99%
rename from include/zephyr/virtio/virtio.h
rename to include/zephyr/drivers/virtio.h
index c68770b610e..a763e5e5f24 100644
--- a/include/zephyr/virtio/virtio.h
+++ b/include/zephyr/drivers/virtio.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_VIRTIO_VIRTIO_H_
 #define ZEPHYR_VIRTIO_VIRTIO_H_
 #include <zephyr/device.h>
-#include "virtqueue.h"
+#include "virtio/virtqueue.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/zephyr/virtio/virtqueue.h b/include/zephyr/drivers/virtio/virtqueue.h
similarity index 100%
rename from include/zephyr/virtio/virtqueue.h
rename to include/zephyr/drivers/virtio/virtqueue.h