drivers: virtio: move virtio headers to zephyr/drivers

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

@@ -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"
 

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

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);

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

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"
 

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>

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" {