virtio: Rename VM virtio component to virtioarm

This avoids conflicting with the new util_libs/virtio library. Signed-off-by: Andy Bui <[email protected]>
seL4 · Nov 29, 2022 · fbca670 · fbca670
1 parent 44410bd
commit fbca670
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,6 +31,7 @@ add_subdirectory(components/Firewall)
 add_subdirectory(components/StringReverse)
 add_subdirectory(components/UDPServer)
 add_subdirectory(components/Sataserver)
+add_subdirectory(libs/libvirtio camkes-arm-vm/libs/libvirtio)
 
 # Declare connectors with templates.
 # We can rely on the naming scheme being consistent to allow for easier declaration.

diff --git a/arm_vm_helpers.cmake b/arm_vm_helpers.cmake
@@ -138,7 +138,7 @@ function(DeclareCAmkESARMVM init_component)
     )
 
     if(VmVirtioNetArping OR VmVirtioNetVirtqueue OR VmVirtioConsole)
-        DeclareCAmkESComponent(${init_component} LIBS virtio vswitch)
+        DeclareCAmkESComponent(${init_component} LIBS virtioarm vswitch)
     endif()
 
     # Append the USB driver library if building for exynos

diff --git a/components/VM_Arm/src/modules/virtio_con.c b/components/VM_Arm/src/modules/virtio_con.c
@@ -20,7 +20,7 @@
 #include <sel4vmmplatsupport/arch/vpci.h>
 
 #include <platsupport/serial.h>
-#include <virtio/virtio_console.h>
+#include <virtioarm/virtio_console.h>
 
 static virtio_con_t *virtio_con = NULL;
 extern void *serial_getchar_buf;

diff --git a/components/VM_Arm/src/modules/virtio_net_arping.c b/components/VM_Arm/src/modules/virtio_net_arping.c
@@ -15,7 +15,7 @@
 #include <camkes/dataport.h>
 
 #include <sel4vmmplatsupport/drivers/virtio_net.h>
-#include <virtio/virtio_net.h>
+#include <virtioarm/virtio_net.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

diff --git a/components/VM_Arm/src/modules/virtio_net_virtqueue.c b/components/VM_Arm/src/modules/virtio_net_virtqueue.c
@@ -17,7 +17,7 @@
 #include <virtqueue.h>
 #include <vswitch.h>
 #include <camkes/virtqueue.h>
-#include <virtio/virtio_net.h>
+#include <virtioarm/virtio_net.h>
 
 static virtio_net_t *virtio_net = NULL;
 static vswitch_t virtio_vswitch;

diff --git a/libs/libvirtio/CMakeLists.txt b/libs/libvirtio/CMakeLists.txt
@@ -12,8 +12,8 @@ add_compile_options(-std=gnu99)
 
 set(sources src/virtio_net.c src/virtio_console.c)
 
-add_library(virtio STATIC EXCLUDE_FROM_ALL ${sources})
+add_library(virtioarm STATIC EXCLUDE_FROM_ALL ${sources})
 
-target_include_directories(virtio PUBLIC include plat_include/${KernelPlatform})
+target_include_directories(virtioarm PUBLIC include plat_include/${KernelPlatform})
 
-target_link_libraries(virtio muslc sel4 sel4camkes sel4vm sel4vmmplatsupport sel4_autoconf)
+target_link_libraries(virtioarm muslc sel4 sel4camkes sel4vm sel4vmmplatsupport sel4_autoconf)
diff --git a/libs/libvirtio/include/virtio/virtio.h → libs/libvirtio/include/virtioarm/virtio.h b/libs/libvirtio/include/virtio/virtio.h → libs/libvirtio/include/virtioarm/virtio.h
diff --git a/...libvirtio/include/virtio/virtio_console.h → ...virtio/include/virtioarm/virtio_console.h b/...libvirtio/include/virtio/virtio_console.h → ...virtio/include/virtioarm/virtio_console.h
diff --git a/libs/libvirtio/include/virtio/virtio_net.h → .../libvirtio/include/virtioarm/virtio_net.h b/libs/libvirtio/include/virtio/virtio_net.h → .../libvirtio/include/virtioarm/virtio_net.h
diff --git a/...plat_include/exynos5/virtio/virtio_plat.h → ...t_include/exynos5/virtioarm/virtio_plat.h b/...plat_include/exynos5/virtio/virtio_plat.h → ...t_include/exynos5/virtioarm/virtio_plat.h
diff --git a/...nclude/qemu-arm-virt/virtio/virtio_plat.h → ...ude/qemu-arm-virt/virtioarm/virtio_plat.h b/...nclude/qemu-arm-virt/virtio/virtio_plat.h → ...ude/qemu-arm-virt/virtioarm/virtio_plat.h
diff --git a/...tio/plat_include/tx2/virtio/virtio_plat.h → .../plat_include/tx2/virtioarm/virtio_plat.h b/...tio/plat_include/tx2/virtio/virtio_plat.h → .../plat_include/tx2/virtioarm/virtio_plat.h
diff --git a/libs/libvirtio/src/virtio_console.c b/libs/libvirtio/src/virtio_console.c
@@ -16,9 +16,9 @@
 #include <sel4vmmplatsupport/device.h>
 #include <sel4vmmplatsupport/arch/vpci.h>
 
-#include <virtio/virtio.h>
-#include <virtio/virtio_plat.h>
-#include <virtio/virtio_console.h>
+#include <virtioarm/virtio.h>
+#include <virtioarm/virtio_plat.h>
+#include <virtioarm/virtio_console.h>
 
 typedef struct virtio_con_cookie {
     virtio_con_t *virtio_con;

diff --git a/libs/libvirtio/src/virtio_net.c b/libs/libvirtio/src/virtio_net.c
@@ -23,9 +23,9 @@
 #include <sel4vmmplatsupport/device.h>
 #include <sel4vmmplatsupport/arch/vpci.h>
 
-#include <virtio/virtio.h>
-#include <virtio/virtio_net.h>
-#include <virtio/virtio_plat.h>
+#include <virtioarm/virtio.h>
+#include <virtioarm/virtio_net.h>
+#include <virtioarm/virtio_plat.h>
 
 typedef struct virtio_net_cookie {
     virtio_net_t *virtio_net;