From da627c376bd1e7051179c2ea3af775636338d63c Mon Sep 17 00:00:00 2001 From: Eric Chan Date: Thu, 18 Jan 2024 14:01:55 +1100 Subject: [PATCH] reshuffle files for clarity --- examples/virtio/Makefile | 19 +++++++++--------- .../blk_driver_vm/userlevel}/cmdq_test.c | 0 .../client_vm_1/buildroot_config | 0 .../{client_vm => }/client_vm_1/dts/init.dts | 0 .../{client_vm => }/client_vm_1/dts/linux.dts | 0 .../client_vm_1/dts/virtio.dts | 0 .../{client_vm => }/client_vm_1/linux | Bin .../{client_vm => }/client_vm_1/linux_config | 0 .../client_vm_1/rootfs.cpio.gz | Bin .../client_vm_1/userlevel}/cmdq_test.c | 0 .../client_vm_1/userlevel}/postmark.c | 0 .../client_vm_1/userlevel}/virtio_blk_test.c | 0 .../client_vm_2/buildroot_config | 0 .../{client_vm => }/client_vm_2/dts/init.dts | 0 .../{client_vm => }/client_vm_2/dts/linux.dts | 0 .../client_vm_2/dts/virtio.dts | 0 .../{client_vm => }/client_vm_2/linux | Bin .../{client_vm => }/client_vm_2/linux_config | 0 .../client_vm_2/rootfs.cpio.gz | Bin .../client_vm_2/userlevel}/cmdq_test.c | 0 {scripts => tools}/dtscat | 0 21 files changed, 9 insertions(+), 10 deletions(-) rename examples/virtio/{userlevel/blk_driver_vm => board/qemu_arm_virt/blk_driver_vm/userlevel}/cmdq_test.c (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_1/buildroot_config (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_1/dts/init.dts (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_1/dts/linux.dts (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_1/dts/virtio.dts (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_1/linux (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_1/linux_config (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_1/rootfs.cpio.gz (100%) rename examples/virtio/{userlevel/client_vm/client_vm_1 => board/qemu_arm_virt/client_vm_1/userlevel}/cmdq_test.c (100%) rename examples/virtio/{userlevel/client_vm/client_vm_1 => board/qemu_arm_virt/client_vm_1/userlevel}/postmark.c (100%) rename examples/virtio/{userlevel/client_vm/client_vm_1 => board/qemu_arm_virt/client_vm_1/userlevel}/virtio_blk_test.c (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_2/buildroot_config (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_2/dts/init.dts (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_2/dts/linux.dts (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_2/dts/virtio.dts (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_2/linux (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_2/linux_config (100%) rename examples/virtio/board/qemu_arm_virt/{client_vm => }/client_vm_2/rootfs.cpio.gz (100%) rename examples/virtio/{userlevel/client_vm/client_vm_2 => board/qemu_arm_virt/client_vm_2/userlevel}/cmdq_test.c (100%) rename {scripts => tools}/dtscat (100%) diff --git a/examples/virtio/Makefile b/examples/virtio/Makefile index 18e269d85..a0d852253 100644 --- a/examples/virtio/Makefile +++ b/examples/virtio/Makefile @@ -63,18 +63,17 @@ CURRENT_DIR := $(shell pwd) # BLK_DRIVER_VM_DIR := board/$(BOARD)/blk_driver_vm # BLK_DRIVER_VM_DTS_DIR := $(BLK_DRIVER_VM_DIR)/dts -# BLK_DRIVER_VM_USERLEVEL_DIR := userlevel/blk_driver_vm +# BLK_DRIVER_VM_USERLEVEL_DIR := $(BLK_DRIVER_VM_DIR)/userlevel # BLK_DRIVER_VM_ROOTFS_TMP_DIR := $(BUILD_DIR)/blk_driver_vm_rootfs -CLIENT_VM_DIR := board/$(BOARD)/client_vm -CLIENT_VM_USERLEVEL_DIR := userlevel/client_vm -CLIENT_VM_1_DIR := $(CLIENT_VM_DIR)/client_vm_1 +CLIENT_VM_1_DIR := board/$(BOARD)/client_vm_1 CLIENT_VM_1_DTS_DIR := $(CLIENT_VM_1_DIR)/dts -CLIENT_VM_1_USERLEVEL_DIR := $(CLIENT_VM_USERLEVEL_DIR)/client_vm_1 +CLIENT_VM_1_USERLEVEL_DIR := $(CLIENT_VM_1_DIR)/userlevel CLIENT_VM_1_ROOTFS_TMP_DIR := $(BUILD_DIR)/client_vm_1_rootfs -CLIENT_VM_2_DIR := $(CLIENT_VM_DIR)/client_vm_2 + +CLIENT_VM_2_DIR := board/$(BOARD)/client_vm_2 CLIENT_VM_2_DTS_DIR := $(CLIENT_VM_2_DIR)/dts -CLIENT_VM_2_USERLEVEL_DIR := $(CLIENT_VM_USERLEVEL_DIR)/client_vm_2 +CLIENT_VM_2_USERLEVEL_DIR := $(CLIENT_VM_2_DIR)/userlevel CLIENT_VM_2_ROOTFS_TMP_DIR := $(BUILD_DIR)/client_vm_2_rootfs # BLK_DRIVER_VM_LINUX := $(BLK_DRIVER_VM_DIR)/linux @@ -237,7 +236,7 @@ client_vm_2_userlevel: $(addprefix $(BUILD_DIR)/, $(CLIENT_VM_2_USERLEVEL_ELFS)) (cd $(CLIENT_VM_2_ROOTFS_TMP_DIR) && find . | cpio -o -H newc -R root:root 2> /dev/null | gzip > $(CURRENT_DIR)/$(CLIENT_VM_2_INITRD_OVERLAYED)) # $(BLK_DRIVER_VM_DTB): $(BLK_DRIVER_VM_BASE_DTS) $(BLK_DRIVER_VM_DTS_OVERLAYS) -# sh ../../scripts/dtscat $^ > $(BUILD_DIR)/blk_driver_vm.dts +# sh $(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/blk_driver_vm.dts # $(DTC) -q -I dts -O dtb $(BUILD_DIR)/blk_driver_vm.dts > $@ # $(BUILD_DIR)/blk_driver_images.o: $(VMM_TOOLS)/package_guest_images.S $(BLK_DRIVER_VM_LINUX) $(BLK_DRIVER_VM_DTB) $(BLK_DRIVER_VM_INITRD_OVERLAYED) @@ -249,11 +248,11 @@ client_vm_2_userlevel: $(addprefix $(BUILD_DIR)/, $(CLIENT_VM_2_USERLEVEL_ELFS)) # $< -o $@ $(CLIENT_VM_1_DTB): $(CLIENT_VM_1_BASE_DTS) $(CLIENT_VM_1_DTS_OVERLAYS) - sh ../../scripts/dtscat $^ > $(BUILD_DIR)/client_vm_1.dts + sh $(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/client_vm_1.dts $(DTC) -q -I dts -O dtb $(BUILD_DIR)/client_vm_1.dts > $@ $(CLIENT_VM_2_DTB): $(CLIENT_VM_2_BASE_DTS) $(CLIENT_VM_2_DTS_OVERLAYS) - sh ../../scripts/dtscat $^ > $(BUILD_DIR)/client_vm_2.dts + sh $(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/client_vm_2.dts $(DTC) -q -I dts -O dtb $(BUILD_DIR)/client_vm_2.dts > $@ $(BUILD_DIR)/client_images_1.o: $(VMM_TOOLS)/package_guest_images.S $(CLIENT_VM_1_LINUX) $(CLIENT_VM_1_DTB) $(CLIENT_VM_1_INITRD_OVERLAYED) diff --git a/examples/virtio/userlevel/blk_driver_vm/cmdq_test.c b/examples/virtio/board/qemu_arm_virt/blk_driver_vm/userlevel/cmdq_test.c similarity index 100% rename from examples/virtio/userlevel/blk_driver_vm/cmdq_test.c rename to examples/virtio/board/qemu_arm_virt/blk_driver_vm/userlevel/cmdq_test.c diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/buildroot_config b/examples/virtio/board/qemu_arm_virt/client_vm_1/buildroot_config similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/buildroot_config rename to examples/virtio/board/qemu_arm_virt/client_vm_1/buildroot_config diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/dts/init.dts b/examples/virtio/board/qemu_arm_virt/client_vm_1/dts/init.dts similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/dts/init.dts rename to examples/virtio/board/qemu_arm_virt/client_vm_1/dts/init.dts diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/dts/linux.dts b/examples/virtio/board/qemu_arm_virt/client_vm_1/dts/linux.dts similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/dts/linux.dts rename to examples/virtio/board/qemu_arm_virt/client_vm_1/dts/linux.dts diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/dts/virtio.dts b/examples/virtio/board/qemu_arm_virt/client_vm_1/dts/virtio.dts similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/dts/virtio.dts rename to examples/virtio/board/qemu_arm_virt/client_vm_1/dts/virtio.dts diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/linux b/examples/virtio/board/qemu_arm_virt/client_vm_1/linux similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/linux rename to examples/virtio/board/qemu_arm_virt/client_vm_1/linux diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/linux_config b/examples/virtio/board/qemu_arm_virt/client_vm_1/linux_config similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/linux_config rename to examples/virtio/board/qemu_arm_virt/client_vm_1/linux_config diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/rootfs.cpio.gz b/examples/virtio/board/qemu_arm_virt/client_vm_1/rootfs.cpio.gz similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_1/rootfs.cpio.gz rename to examples/virtio/board/qemu_arm_virt/client_vm_1/rootfs.cpio.gz diff --git a/examples/virtio/userlevel/client_vm/client_vm_1/cmdq_test.c b/examples/virtio/board/qemu_arm_virt/client_vm_1/userlevel/cmdq_test.c similarity index 100% rename from examples/virtio/userlevel/client_vm/client_vm_1/cmdq_test.c rename to examples/virtio/board/qemu_arm_virt/client_vm_1/userlevel/cmdq_test.c diff --git a/examples/virtio/userlevel/client_vm/client_vm_1/postmark.c b/examples/virtio/board/qemu_arm_virt/client_vm_1/userlevel/postmark.c similarity index 100% rename from examples/virtio/userlevel/client_vm/client_vm_1/postmark.c rename to examples/virtio/board/qemu_arm_virt/client_vm_1/userlevel/postmark.c diff --git a/examples/virtio/userlevel/client_vm/client_vm_1/virtio_blk_test.c b/examples/virtio/board/qemu_arm_virt/client_vm_1/userlevel/virtio_blk_test.c similarity index 100% rename from examples/virtio/userlevel/client_vm/client_vm_1/virtio_blk_test.c rename to examples/virtio/board/qemu_arm_virt/client_vm_1/userlevel/virtio_blk_test.c diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/buildroot_config b/examples/virtio/board/qemu_arm_virt/client_vm_2/buildroot_config similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/buildroot_config rename to examples/virtio/board/qemu_arm_virt/client_vm_2/buildroot_config diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/dts/init.dts b/examples/virtio/board/qemu_arm_virt/client_vm_2/dts/init.dts similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/dts/init.dts rename to examples/virtio/board/qemu_arm_virt/client_vm_2/dts/init.dts diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/dts/linux.dts b/examples/virtio/board/qemu_arm_virt/client_vm_2/dts/linux.dts similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/dts/linux.dts rename to examples/virtio/board/qemu_arm_virt/client_vm_2/dts/linux.dts diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/dts/virtio.dts b/examples/virtio/board/qemu_arm_virt/client_vm_2/dts/virtio.dts similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/dts/virtio.dts rename to examples/virtio/board/qemu_arm_virt/client_vm_2/dts/virtio.dts diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/linux b/examples/virtio/board/qemu_arm_virt/client_vm_2/linux similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/linux rename to examples/virtio/board/qemu_arm_virt/client_vm_2/linux diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/linux_config b/examples/virtio/board/qemu_arm_virt/client_vm_2/linux_config similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/linux_config rename to examples/virtio/board/qemu_arm_virt/client_vm_2/linux_config diff --git a/examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/rootfs.cpio.gz b/examples/virtio/board/qemu_arm_virt/client_vm_2/rootfs.cpio.gz similarity index 100% rename from examples/virtio/board/qemu_arm_virt/client_vm/client_vm_2/rootfs.cpio.gz rename to examples/virtio/board/qemu_arm_virt/client_vm_2/rootfs.cpio.gz diff --git a/examples/virtio/userlevel/client_vm/client_vm_2/cmdq_test.c b/examples/virtio/board/qemu_arm_virt/client_vm_2/userlevel/cmdq_test.c similarity index 100% rename from examples/virtio/userlevel/client_vm/client_vm_2/cmdq_test.c rename to examples/virtio/board/qemu_arm_virt/client_vm_2/userlevel/cmdq_test.c diff --git a/scripts/dtscat b/tools/dtscat similarity index 100% rename from scripts/dtscat rename to tools/dtscat