From 57d4a1129902ac922ebe6759bdd2a2e20481ff17 Mon Sep 17 00:00:00 2001
From: Eric Chan <eric.chan2@unsw.edu.au>
Date: Wed, 22 May 2024 22:41:03 +1000
Subject: [PATCH] Rename client_vm_num to client_num_vm

---
 .../board/odroidc4/virtio-snd.system          |  16 +--
 .../board/qemu_arm_virt/virtio-snd.system     |  16 +--
 examples/virtio/Makefile                      | 132 +++++++++---------
 .../buildroot_config                          |   0
 .../dts/disable.dts                           |   0
 .../{client_vm_1 => client_1_vm}/dts/init.dts |   0
 .../dts/linux.dts                             |   0
 .../dts/virtio.dts                            |   0
 .../{client_vm_1 => client_1_vm}/linux        | Bin
 .../{client_vm_1 => client_1_vm}/linux_config |   0
 .../rootfs.cpio.gz                            | Bin
 .../buildroot_config                          |   0
 .../dts/disable.dts                           |   0
 .../{client_vm_2 => client_2_vm}/dts/init.dts |   0
 .../dts/linux.dts                             |   0
 .../dts/virtio.dts                            |   0
 .../{client_vm_2 => client_2_vm}/linux        | Bin
 .../{client_vm_2 => client_2_vm}/linux_config |   0
 .../rootfs.cpio.gz                            | Bin
 examples/virtio/board/odroidc4/virtio.system  |   4 +-
 .../buildroot_config                          |   0
 .../{client_vm_1 => client_1_vm}/dts/init.dts |   0
 .../dts/linux.dts                             |   0
 .../dts/virtio.dts                            |   0
 .../{client_vm_1 => client_1_vm}/linux        | Bin
 .../{client_vm_1 => client_1_vm}/linux_config |   0
 .../rootfs.cpio.gz                            | Bin
 .../buildroot_config                          |   0
 .../{client_vm_2 => client_2_vm}/dts/init.dts |   0
 .../dts/linux.dts                             |   0
 .../dts/virtio.dts                            |   0
 .../{client_vm_2 => client_2_vm}/linux        | Bin
 .../{client_vm_2 => client_2_vm}/linux_config |   0
 .../rootfs.cpio.gz                            | Bin
 .../virtio/board/qemu_arm_virt/virtio.system  |   4 +-
 35 files changed, 86 insertions(+), 86 deletions(-)
 rename examples/virtio/board/odroidc4/{client_vm_1 => client_1_vm}/buildroot_config (100%)
 rename examples/virtio/board/odroidc4/{client_vm_1 => client_1_vm}/dts/disable.dts (100%)
 rename examples/virtio/board/odroidc4/{client_vm_1 => client_1_vm}/dts/init.dts (100%)
 rename examples/virtio/board/odroidc4/{client_vm_1 => client_1_vm}/dts/linux.dts (100%)
 rename examples/virtio/board/odroidc4/{client_vm_1 => client_1_vm}/dts/virtio.dts (100%)
 rename examples/virtio/board/odroidc4/{client_vm_1 => client_1_vm}/linux (100%)
 rename examples/virtio/board/odroidc4/{client_vm_1 => client_1_vm}/linux_config (100%)
 rename examples/virtio/board/odroidc4/{client_vm_1 => client_1_vm}/rootfs.cpio.gz (100%)
 rename examples/virtio/board/odroidc4/{client_vm_2 => client_2_vm}/buildroot_config (100%)
 rename examples/virtio/board/odroidc4/{client_vm_2 => client_2_vm}/dts/disable.dts (100%)
 rename examples/virtio/board/odroidc4/{client_vm_2 => client_2_vm}/dts/init.dts (100%)
 rename examples/virtio/board/odroidc4/{client_vm_2 => client_2_vm}/dts/linux.dts (100%)
 rename examples/virtio/board/odroidc4/{client_vm_2 => client_2_vm}/dts/virtio.dts (100%)
 rename examples/virtio/board/odroidc4/{client_vm_2 => client_2_vm}/linux (100%)
 rename examples/virtio/board/odroidc4/{client_vm_2 => client_2_vm}/linux_config (100%)
 rename examples/virtio/board/odroidc4/{client_vm_2 => client_2_vm}/rootfs.cpio.gz (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_1 => client_1_vm}/buildroot_config (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_1 => client_1_vm}/dts/init.dts (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_1 => client_1_vm}/dts/linux.dts (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_1 => client_1_vm}/dts/virtio.dts (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_1 => client_1_vm}/linux (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_1 => client_1_vm}/linux_config (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_1 => client_1_vm}/rootfs.cpio.gz (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_2 => client_2_vm}/buildroot_config (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_2 => client_2_vm}/dts/init.dts (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_2 => client_2_vm}/dts/linux.dts (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_2 => client_2_vm}/dts/virtio.dts (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_2 => client_2_vm}/linux (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_2 => client_2_vm}/linux_config (100%)
 rename examples/virtio/board/qemu_arm_virt/{client_vm_2 => client_2_vm}/rootfs.cpio.gz (100%)

diff --git a/examples/virtio-snd/board/odroidc4/virtio-snd.system b/examples/virtio-snd/board/odroidc4/virtio-snd.system
index 9dbd36416..b8ae20bb8 100644
--- a/examples/virtio-snd/board/odroidc4/virtio-snd.system
+++ b/examples/virtio-snd/board/odroidc4/virtio-snd.system
@@ -43,7 +43,7 @@
     <!-- Sound data regions -->
     <memory_region name="snd_data" size="0x200_000" page_size="0x200_000" />
 
-    <protection_domain name="CLIENT_VMM_1" priority="90">
+    <protection_domain name="CLIENT_1_VMM" priority="90">
         <program_image path="client_vmm.elf" />
         <map mr="client_vm_ram_1" vaddr="0x20000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
         
@@ -69,7 +69,7 @@
         </virtual_machine>
     </protection_domain>
 
-    <protection_domain name="CLIENT_VMM_2" priority="90">
+    <protection_domain name="CLIENT_2_VMM" priority="90">
         <program_image path="client_vmm.elf" />
         <map mr="client_vm_ram_2" vaddr="0x20000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
         
@@ -251,12 +251,12 @@
     </protection_domain>
 
     <channel>
-        <end pd="CLIENT_VMM_1" id="1"/>
+        <end pd="CLIENT_1_VMM" id="1"/>
         <end pd="serial_virt_tx" id="1"/>
     </channel>
 
     <channel>
-        <end pd="CLIENT_VMM_2" id="1"/>
+        <end pd="CLIENT_2_VMM" id="1"/>
         <end pd="serial_virt_tx" id="2"/>
     </channel>
 
@@ -271,12 +271,12 @@
     </channel>
 
     <channel>
-        <end pd="CLIENT_VMM_1" id="2"/>
+        <end pd="CLIENT_1_VMM" id="2"/>
         <end pd="serial_virt_rx" id="1"/>
     </channel>
 
     <channel>
-        <end pd="CLIENT_VMM_2" id="2"/>
+        <end pd="CLIENT_2_VMM" id="2"/>
         <end pd="serial_virt_rx" id="2"/>
     </channel>
 
@@ -292,12 +292,12 @@
 
     <!-- Sound -->
     <channel>
-        <end pd="CLIENT_VMM_1" id="4"/>
+        <end pd="CLIENT_1_VMM" id="4"/>
         <end pd="sound_virt" id="1"/>
     </channel>
 
     <channel>
-        <end pd="CLIENT_VMM_2" id="4"/>
+        <end pd="CLIENT_2_VMM" id="4"/>
         <end pd="sound_virt" id="2"/>
     </channel>
 
diff --git a/examples/virtio-snd/board/qemu_arm_virt/virtio-snd.system b/examples/virtio-snd/board/qemu_arm_virt/virtio-snd.system
index b998e60f7..be1828764 100644
--- a/examples/virtio-snd/board/qemu_arm_virt/virtio-snd.system
+++ b/examples/virtio-snd/board/qemu_arm_virt/virtio-snd.system
@@ -37,7 +37,7 @@
     <!-- Sound data regions -->
     <memory_region name="snd_data" size="0x200_000" page_size="0x200_000" />
 
-    <protection_domain name="CLIENT_VMM_1" priority="90">
+    <protection_domain name="CLIENT_1_VMM" priority="90">
         <program_image path="client_vmm.elf" />
         <map mr="client_vm_ram_1" vaddr="0x40000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
         
@@ -63,7 +63,7 @@
         </virtual_machine>
     </protection_domain>
 
-    <protection_domain name="CLIENT_VMM_2" priority="90">
+    <protection_domain name="CLIENT_2_VMM" priority="90">
         <program_image path="client_vmm.elf" />
         <map mr="client_vm_ram_2" vaddr="0x40000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
         
@@ -241,12 +241,12 @@
     </protection_domain>
 
     <channel>
-        <end pd="CLIENT_VMM_1" id="1"/>
+        <end pd="CLIENT_1_VMM" id="1"/>
         <end pd="serial_virt_tx" id="1"/>
     </channel>
 
     <channel>
-        <end pd="CLIENT_VMM_2" id="1"/>
+        <end pd="CLIENT_2_VMM" id="1"/>
         <end pd="serial_virt_tx" id="2"/>
     </channel>
 
@@ -261,12 +261,12 @@
     </channel>
 
     <channel>
-        <end pd="CLIENT_VMM_1" id="2"/>
+        <end pd="CLIENT_1_VMM" id="2"/>
         <end pd="serial_virt_rx" id="1"/>
     </channel>
 
     <channel>
-        <end pd="CLIENT_VMM_2" id="2"/>
+        <end pd="CLIENT_2_VMM" id="2"/>
         <end pd="serial_virt_rx" id="2"/>
     </channel>
 
@@ -282,12 +282,12 @@
 
     <!-- Sound -->
     <channel>
-        <end pd="CLIENT_VMM_1" id="4"/>
+        <end pd="CLIENT_1_VMM" id="4"/>
         <end pd="sound_virt" id="1"/>
     </channel>
 
     <channel>
-        <end pd="CLIENT_VMM_2" id="4"/>
+        <end pd="CLIENT_2_VMM" id="4"/>
         <end pd="sound_virt" id="2"/>
     </channel>
 
diff --git a/examples/virtio/Makefile b/examples/virtio/Makefile
index 5c69d2abd..5bc6608cc 100644
--- a/examples/virtio/Makefile
+++ b/examples/virtio/Makefile
@@ -60,13 +60,13 @@ BLK_DRIVER_VM_DIR := board/$(BOARD)/blk_driver_vm
 BLK_DRIVER_VM_DTS_DIR := $(BLK_DRIVER_VM_DIR)/dts
 BLK_DRIVER_VM_ROOTFS_TMP_DIR := $(BUILD_DIR)/blk_driver_vm_rootfs
 
-CLIENT_VM_1_DIR := board/$(BOARD)/client_vm_1
-CLIENT_VM_1_DTS_DIR := $(CLIENT_VM_1_DIR)/dts
-CLIENT_VM_1_ROOTFS_TMP_DIR := $(BUILD_DIR)/client_vm_1_rootfs
+CLIENT_1_VM_DIR := board/$(BOARD)/client_1_vm
+CLIENT_1_VM_DTS_DIR := $(CLIENT_1_VM_DIR)/dts
+CLIENT_1_VM_ROOTFS_TMP_DIR := $(BUILD_DIR)/client_1_vm_rootfs
 
-CLIENT_VM_2_DIR := board/$(BOARD)/client_vm_2
-CLIENT_VM_2_DTS_DIR := $(CLIENT_VM_2_DIR)/dts
-CLIENT_VM_2_ROOTFS_TMP_DIR := $(BUILD_DIR)/client_vm_2_rootfs
+CLIENT_2_VM_DIR := board/$(BOARD)/client_2_vm
+CLIENT_2_VM_DTS_DIR := $(CLIENT_2_VM_DIR)/dts
+CLIENT_2_VM_ROOTFS_TMP_DIR := $(BUILD_DIR)/client_2_vm_rootfs
 
 
 BLK_DRIVER_VM_LINUX := $(BLK_DRIVER_VM_DIR)/linux
@@ -83,30 +83,30 @@ BLK_DRIVER_VM_DTS_OVERLAYS := ${BLK_DRIVER_VM_DTS_OVERLAYS_${BOARD}}
 BLK_DRIVER_VM_DTB := $(BUILD_DIR)/blk_driver_vm.dtb
 
 
-CLIENT_VM_1_LINUX := $(CLIENT_VM_1_DIR)/linux
-CLIENT_VM_1_INITRD := $(CLIENT_VM_1_DIR)/rootfs.cpio.gz
-CLIENT_VM_1_INITRD_MODIFIED := $(BUILD_DIR)/client_vm_1_rootfs.cpio.gz
-CLIENT_VM_1_BASE_DTS := $(CLIENT_VM_1_DTS_DIR)/linux.dts
-CLIENT_VM_1_DTS_OVERLAYS_qemu_arm_virt :=	$(CLIENT_VM_1_DTS_DIR)/init.dts \
-											$(CLIENT_VM_1_DTS_DIR)/virtio.dts
-CLIENT_VM_1_DTS_OVERLAYS_odroidc4 :=	$(CLIENT_VM_1_DTS_DIR)/init.dts \
-										$(CLIENT_VM_1_DTS_DIR)/virtio.dts\
-										$(CLIENT_VM_1_DTS_DIR)/disable.dts
-CLIENT_VM_1_DTS_OVERLAYS := ${CLIENT_VM_1_DTS_OVERLAYS_${BOARD}}
-CLIENT_VM_1_DTB := $(BUILD_DIR)/client_vm_1.dtb
-
-
-CLIENT_VM_2_LINUX := $(CLIENT_VM_2_DIR)/linux
-CLIENT_VM_2_INITRD := $(CLIENT_VM_2_DIR)/rootfs.cpio.gz
-CLIENT_VM_2_INITRD_MODIFIED := $(BUILD_DIR)/client_vm_2_rootfs.cpio.gz
-CLIENT_VM_2_BASE_DTS := $(CLIENT_VM_2_DTS_DIR)/linux.dts
-CLIENT_VM_2_DTS_OVERLAYS_qemu_arm_virt :=	$(CLIENT_VM_2_DTS_DIR)/init.dts \
-											$(CLIENT_VM_2_DTS_DIR)/virtio.dts
-CLIENT_VM_2_DTS_OVERLAYS_odroidc4 :=	$(CLIENT_VM_2_DTS_DIR)/init.dts \
-										$(CLIENT_VM_2_DTS_DIR)/virtio.dts \
-										$(CLIENT_VM_2_DTS_DIR)/disable.dts
-CLIENT_VM_2_DTS_OVERLAYS := ${CLIENT_VM_2_DTS_OVERLAYS_${BOARD}}
-CLIENT_VM_2_DTB := $(BUILD_DIR)/client_vm_2.dtb
+CLIENT_1_VM_LINUX := $(CLIENT_1_VM_DIR)/linux
+CLIENT_1_VM_INITRD := $(CLIENT_1_VM_DIR)/rootfs.cpio.gz
+CLIENT_1_VM_INITRD_MODIFIED := $(BUILD_DIR)/client_1_vm_rootfs.cpio.gz
+CLIENT_1_VM_BASE_DTS := $(CLIENT_1_VM_DTS_DIR)/linux.dts
+CLIENT_1_VM_DTS_OVERLAYS_qemu_arm_virt :=	$(CLIENT_1_VM_DTS_DIR)/init.dts \
+											$(CLIENT_1_VM_DTS_DIR)/virtio.dts
+CLIENT_1_VM_DTS_OVERLAYS_odroidc4 :=	$(CLIENT_1_VM_DTS_DIR)/init.dts \
+										$(CLIENT_1_VM_DTS_DIR)/virtio.dts\
+										$(CLIENT_1_VM_DTS_DIR)/disable.dts
+CLIENT_1_VM_DTS_OVERLAYS := ${CLIENT_1_VM_DTS_OVERLAYS_${BOARD}}
+CLIENT_1_VM_DTB := $(BUILD_DIR)/client_1_vm.dtb
+
+
+CLIENT_2_VM_LINUX := $(CLIENT_2_VM_DIR)/linux
+CLIENT_2_VM_INITRD := $(CLIENT_2_VM_DIR)/rootfs.cpio.gz
+CLIENT_2_VM_INITRD_MODIFIED := $(BUILD_DIR)/client_2_vm_rootfs.cpio.gz
+CLIENT_2_VM_BASE_DTS := $(CLIENT_2_VM_DTS_DIR)/linux.dts
+CLIENT_2_VM_DTS_OVERLAYS_qemu_arm_virt :=	$(CLIENT_2_VM_DTS_DIR)/init.dts \
+											$(CLIENT_2_VM_DTS_DIR)/virtio.dts
+CLIENT_2_VM_DTS_OVERLAYS_odroidc4 :=	$(CLIENT_2_VM_DTS_DIR)/init.dts \
+										$(CLIENT_2_VM_DTS_DIR)/virtio.dts \
+										$(CLIENT_2_VM_DTS_DIR)/disable.dts
+CLIENT_2_VM_DTS_OVERLAYS := ${CLIENT_2_VM_DTS_OVERLAYS_${BOARD}}
+CLIENT_2_VM_DTB := $(BUILD_DIR)/client_2_vm.dtb
 
 SDDF_UTIL := $(SDDF_DIR)/util
 
@@ -128,15 +128,15 @@ BLK_DRIVER_VM_USERLEVEL_INIT_qemu_arm_virt := qemu_blk_driver_init
 BLK_DRIVER_VM_USERLEVEL_INIT_odroidc4 := blk_driver_init
 BLK_DRIVER_VM_USERLEVEL_INIT := ${BLK_DRIVER_VM_USERLEVEL_INIT_${BOARD}}
 
-CLIENT_VM_1_USERLEVEL :=
-CLIENT_VM_1_USERLEVEL_INIT_qemu_arm_virt := qemu_blk_client_init
-CLIENT_VM_1_USERLEVEL_INIT_odroidc4 := blk_client_init
-CLIENT_VM_1_USERLEVEL_INIT := ${CLIENT_VM_1_USERLEVEL_INIT_${BOARD}}
+CLIENT_1_VM_USERLEVEL :=
+CLIENT_1_VM_USERLEVEL_INIT_qemu_arm_virt := qemu_blk_client_init
+CLIENT_1_VM_USERLEVEL_INIT_odroidc4 := blk_client_init
+CLIENT_1_VM_USERLEVEL_INIT := ${CLIENT_1_VM_USERLEVEL_INIT_${BOARD}}
 
-CLIENT_VM_2_USERLEVEL :=
-CLIENT_VM_2_USERLEVEL_INIT_qemu_arm_virt := qemu_blk_client_init
-CLIENT_VM_2_USERLEVEL_INIT_odroidc4 := blk_client_init
-CLIENT_VM_2_USERLEVEL_INIT := ${CLIENT_VM_2_USERLEVEL_INIT_${BOARD}}
+CLIENT_2_VM_USERLEVEL :=
+CLIENT_2_VM_USERLEVEL_INIT_qemu_arm_virt := qemu_blk_client_init
+CLIENT_2_VM_USERLEVEL_INIT_odroidc4 := blk_client_init
+CLIENT_2_VM_USERLEVEL_INIT := ${CLIENT_2_VM_USERLEVEL_INIT_${BOARD}}
 
 IMAGE_FILE = $(BUILD_DIR)/loader.img
 REPORT_FILE = $(BUILD_DIR)/report.txt
@@ -155,7 +155,7 @@ VMM_OBJS := printf.o \
 			tcb.o \
 			vcpu.o
 
-CLIENT_VMM_1_OBJS := $(VMM_OBJS) \
+CLIENT_1_VMM_OBJS := $(VMM_OBJS) \
 					client_images_1.o \
 					client_vmm.o \
 					console.o \
@@ -165,7 +165,7 @@ CLIENT_VMM_1_OBJS := $(VMM_OBJS) \
 					sddf_blk_fsmalloc.o \
 					sddf_printf.o sddf_putchar_debug.o \
 
-CLIENT_VMM_2_OBJS := $(VMM_OBJS) \
+CLIENT_2_VMM_OBJS := $(VMM_OBJS) \
 					client_images_2.o \
 					client_vmm.o \
 					console.o \
@@ -259,29 +259,29 @@ $(BLK_DRIVER_VM_INITRD_MODIFIED): $(addprefix $(BUILD_DIR)/, $(BLK_DRIVER_VM_USE
 							--startup $(addprefix $(BUILD_DIR)/, $(BLK_DRIVER_VM_USERLEVEL_INIT)) \
 							--home $(addprefix $(BUILD_DIR)/, $(BLK_DRIVER_VM_USERLEVEL))
 	
-$(CLIENT_VM_1_INITRD_MODIFIED): $(addprefix $(BUILD_DIR)/, $(CLIENT_VM_1_USERLEVEL)) \
-								$(addprefix $(BUILD_DIR)/, $(CLIENT_VM_1_USERLEVEL_INIT))
-	$(VMM_TOOLS)/packrootfs $(CLIENT_VM_1_INITRD) $(CLIENT_VM_1_ROOTFS_TMP_DIR) -o $(CLIENT_VM_1_INITRD_MODIFIED) \
-							--startup $(addprefix $(BUILD_DIR)/, $(CLIENT_VM_1_USERLEVEL_INIT)) \
-							--home $(addprefix $(BUILD_DIR)/, $(CLIENT_VM_1_USERLEVEL))
+$(CLIENT_1_VM_INITRD_MODIFIED): $(addprefix $(BUILD_DIR)/, $(CLIENT_1_VM_USERLEVEL)) \
+								$(addprefix $(BUILD_DIR)/, $(CLIENT_1_VM_USERLEVEL_INIT))
+	$(VMM_TOOLS)/packrootfs $(CLIENT_1_VM_INITRD) $(CLIENT_1_VM_ROOTFS_TMP_DIR) -o $(CLIENT_1_VM_INITRD_MODIFIED) \
+							--startup $(addprefix $(BUILD_DIR)/, $(CLIENT_1_VM_USERLEVEL_INIT)) \
+							--home $(addprefix $(BUILD_DIR)/, $(CLIENT_1_VM_USERLEVEL))
 	
-$(CLIENT_VM_2_INITRD_MODIFIED): $(addprefix $(BUILD_DIR)/, $(CLIENT_VM_2_USERLEVEL)) \
-								$(addprefix $(BUILD_DIR)/, $(CLIENT_VM_2_USERLEVEL_INIT))
-	$(VMM_TOOLS)/packrootfs $(CLIENT_VM_2_INITRD) $(CLIENT_VM_2_ROOTFS_TMP_DIR) -o $(CLIENT_VM_2_INITRD_MODIFIED) \
-							--startup $(addprefix $(BUILD_DIR)/, $(CLIENT_VM_2_USERLEVEL_INIT)) \
-							--home $(addprefix $(BUILD_DIR)/, $(CLIENT_VM_2_USERLEVEL))
+$(CLIENT_2_VM_INITRD_MODIFIED): $(addprefix $(BUILD_DIR)/, $(CLIENT_2_VM_USERLEVEL)) \
+								$(addprefix $(BUILD_DIR)/, $(CLIENT_2_VM_USERLEVEL_INIT))
+	$(VMM_TOOLS)/packrootfs $(CLIENT_2_VM_INITRD) $(CLIENT_2_VM_ROOTFS_TMP_DIR) -o $(CLIENT_2_VM_INITRD_MODIFIED) \
+							--startup $(addprefix $(BUILD_DIR)/, $(CLIENT_2_VM_USERLEVEL_INIT)) \
+							--home $(addprefix $(BUILD_DIR)/, $(CLIENT_2_VM_USERLEVEL))
 
 $(BLK_DRIVER_VM_DTB): $(BLK_DRIVER_VM_BASE_DTS) $(BLK_DRIVER_VM_DTS_OVERLAYS)
 	$(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/blk_driver_vm.dts
 	$(DTC) -q -I dts -O dtb $(BUILD_DIR)/blk_driver_vm.dts > $@
 
-$(CLIENT_VM_1_DTB): $(CLIENT_VM_1_BASE_DTS) $(CLIENT_VM_1_DTS_OVERLAYS)
-	$(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/client_vm_1.dts
-	$(DTC) -q -I dts -O dtb $(BUILD_DIR)/client_vm_1.dts > $@
+$(CLIENT_1_VM_DTB): $(CLIENT_1_VM_BASE_DTS) $(CLIENT_1_VM_DTS_OVERLAYS)
+	$(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/client_1_vm.dts
+	$(DTC) -q -I dts -O dtb $(BUILD_DIR)/client_1_vm.dts > $@
 
-$(CLIENT_VM_2_DTB): $(CLIENT_VM_2_BASE_DTS) $(CLIENT_VM_2_DTS_OVERLAYS)
-	$(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/client_vm_2.dts
-	$(DTC) -q -I dts -O dtb $(BUILD_DIR)/client_vm_2.dts > $@
+$(CLIENT_2_VM_DTB): $(CLIENT_2_VM_BASE_DTS) $(CLIENT_2_VM_DTS_OVERLAYS)
+	$(VMM_TOOLS)/dtscat $^ > $(BUILD_DIR)/client_2_vm.dts
+	$(DTC) -q -I dts -O dtb $(BUILD_DIR)/client_2_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_MODIFIED)
 	$(CC) -c -g3 -x assembler-with-cpp \
@@ -291,19 +291,19 @@ $(BUILD_DIR)/blk_driver_images.o: $(VMM_TOOLS)/package_guest_images.S $(BLK_DRIV
 					-target aarch64-none-elf \
 					$< -o $@
 
-$(BUILD_DIR)/client_images_1.o: $(VMM_TOOLS)/package_guest_images.S $(CLIENT_VM_1_LINUX) $(CLIENT_VM_1_DTB) $(CLIENT_VM_1_INITRD_MODIFIED)
+$(BUILD_DIR)/client_images_1.o: $(VMM_TOOLS)/package_guest_images.S $(CLIENT_1_VM_LINUX) $(CLIENT_1_VM_DTB) $(CLIENT_1_VM_INITRD_MODIFIED)
 	$(CC) -c -g3 -x assembler-with-cpp \
-					-DGUEST_KERNEL_IMAGE_PATH=\"$(CLIENT_VM_1_LINUX)\" \
-					-DGUEST_DTB_IMAGE_PATH=\"$(CLIENT_VM_1_DTB)\" \
-					-DGUEST_INITRD_IMAGE_PATH=\"$(CLIENT_VM_1_INITRD_MODIFIED)\" \
+					-DGUEST_KERNEL_IMAGE_PATH=\"$(CLIENT_1_VM_LINUX)\" \
+					-DGUEST_DTB_IMAGE_PATH=\"$(CLIENT_1_VM_DTB)\" \
+					-DGUEST_INITRD_IMAGE_PATH=\"$(CLIENT_1_VM_INITRD_MODIFIED)\" \
 					-target aarch64-none-elf \
 					$< -o $@
 
-$(BUILD_DIR)/client_images_2.o: $(VMM_TOOLS)/package_guest_images.S $(CLIENT_VM_2_LINUX) $(CLIENT_VM_2_DTB) $(CLIENT_VM_2_INITRD_MODIFIED)
+$(BUILD_DIR)/client_images_2.o: $(VMM_TOOLS)/package_guest_images.S $(CLIENT_2_VM_LINUX) $(CLIENT_2_VM_DTB) $(CLIENT_2_VM_INITRD_MODIFIED)
 	$(CC) -c -g3 -x assembler-with-cpp \
-					-DGUEST_KERNEL_IMAGE_PATH=\"$(CLIENT_VM_2_LINUX)\" \
-					-DGUEST_DTB_IMAGE_PATH=\"$(CLIENT_VM_2_DTB)\" \
-					-DGUEST_INITRD_IMAGE_PATH=\"$(CLIENT_VM_2_INITRD_MODIFIED)\" \
+					-DGUEST_KERNEL_IMAGE_PATH=\"$(CLIENT_2_VM_LINUX)\" \
+					-DGUEST_DTB_IMAGE_PATH=\"$(CLIENT_2_VM_DTB)\" \
+					-DGUEST_INITRD_IMAGE_PATH=\"$(CLIENT_2_VM_INITRD_MODIFIED)\" \
 					-target aarch64-none-elf \
 					$< -o $@
 
@@ -340,10 +340,10 @@ $(BUILD_DIR)/sddf_blk_%.o: $(SDDF_BLK_COMPONENTS)/%.c Makefile
 $(BUILD_DIR)/sddf_blk_%.o: $(SDDF_BLK_UTIL)/%.c Makefile
 	$(CC) -c $(CFLAGS) $< -o $@
 
-$(BUILD_DIR)/client_vmm_1.elf: $(addprefix $(BUILD_DIR)/, $(CLIENT_VMM_1_OBJS))
+$(BUILD_DIR)/client_1_vmm.elf: $(addprefix $(BUILD_DIR)/, $(CLIENT_1_VMM_OBJS))
 	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
 
-$(BUILD_DIR)/client_vmm_2.elf: $(addprefix $(BUILD_DIR)/, $(CLIENT_VMM_2_OBJS))
+$(BUILD_DIR)/client_2_vmm.elf: $(addprefix $(BUILD_DIR)/, $(CLIENT_2_VMM_OBJS))
 	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
 
 $(BUILD_DIR)/blk_driver_vmm.elf: $(addprefix $(BUILD_DIR)/, $(BLK_DRIVER_VMM_OBJS))
diff --git a/examples/virtio/board/odroidc4/client_vm_1/buildroot_config b/examples/virtio/board/odroidc4/client_1_vm/buildroot_config
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_1/buildroot_config
rename to examples/virtio/board/odroidc4/client_1_vm/buildroot_config
diff --git a/examples/virtio/board/odroidc4/client_vm_1/dts/disable.dts b/examples/virtio/board/odroidc4/client_1_vm/dts/disable.dts
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_1/dts/disable.dts
rename to examples/virtio/board/odroidc4/client_1_vm/dts/disable.dts
diff --git a/examples/virtio/board/odroidc4/client_vm_1/dts/init.dts b/examples/virtio/board/odroidc4/client_1_vm/dts/init.dts
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_1/dts/init.dts
rename to examples/virtio/board/odroidc4/client_1_vm/dts/init.dts
diff --git a/examples/virtio/board/odroidc4/client_vm_1/dts/linux.dts b/examples/virtio/board/odroidc4/client_1_vm/dts/linux.dts
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_1/dts/linux.dts
rename to examples/virtio/board/odroidc4/client_1_vm/dts/linux.dts
diff --git a/examples/virtio/board/odroidc4/client_vm_1/dts/virtio.dts b/examples/virtio/board/odroidc4/client_1_vm/dts/virtio.dts
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_1/dts/virtio.dts
rename to examples/virtio/board/odroidc4/client_1_vm/dts/virtio.dts
diff --git a/examples/virtio/board/odroidc4/client_vm_1/linux b/examples/virtio/board/odroidc4/client_1_vm/linux
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_1/linux
rename to examples/virtio/board/odroidc4/client_1_vm/linux
diff --git a/examples/virtio/board/odroidc4/client_vm_1/linux_config b/examples/virtio/board/odroidc4/client_1_vm/linux_config
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_1/linux_config
rename to examples/virtio/board/odroidc4/client_1_vm/linux_config
diff --git a/examples/virtio/board/odroidc4/client_vm_1/rootfs.cpio.gz b/examples/virtio/board/odroidc4/client_1_vm/rootfs.cpio.gz
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_1/rootfs.cpio.gz
rename to examples/virtio/board/odroidc4/client_1_vm/rootfs.cpio.gz
diff --git a/examples/virtio/board/odroidc4/client_vm_2/buildroot_config b/examples/virtio/board/odroidc4/client_2_vm/buildroot_config
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_2/buildroot_config
rename to examples/virtio/board/odroidc4/client_2_vm/buildroot_config
diff --git a/examples/virtio/board/odroidc4/client_vm_2/dts/disable.dts b/examples/virtio/board/odroidc4/client_2_vm/dts/disable.dts
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_2/dts/disable.dts
rename to examples/virtio/board/odroidc4/client_2_vm/dts/disable.dts
diff --git a/examples/virtio/board/odroidc4/client_vm_2/dts/init.dts b/examples/virtio/board/odroidc4/client_2_vm/dts/init.dts
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_2/dts/init.dts
rename to examples/virtio/board/odroidc4/client_2_vm/dts/init.dts
diff --git a/examples/virtio/board/odroidc4/client_vm_2/dts/linux.dts b/examples/virtio/board/odroidc4/client_2_vm/dts/linux.dts
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_2/dts/linux.dts
rename to examples/virtio/board/odroidc4/client_2_vm/dts/linux.dts
diff --git a/examples/virtio/board/odroidc4/client_vm_2/dts/virtio.dts b/examples/virtio/board/odroidc4/client_2_vm/dts/virtio.dts
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_2/dts/virtio.dts
rename to examples/virtio/board/odroidc4/client_2_vm/dts/virtio.dts
diff --git a/examples/virtio/board/odroidc4/client_vm_2/linux b/examples/virtio/board/odroidc4/client_2_vm/linux
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_2/linux
rename to examples/virtio/board/odroidc4/client_2_vm/linux
diff --git a/examples/virtio/board/odroidc4/client_vm_2/linux_config b/examples/virtio/board/odroidc4/client_2_vm/linux_config
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_2/linux_config
rename to examples/virtio/board/odroidc4/client_2_vm/linux_config
diff --git a/examples/virtio/board/odroidc4/client_vm_2/rootfs.cpio.gz b/examples/virtio/board/odroidc4/client_2_vm/rootfs.cpio.gz
similarity index 100%
rename from examples/virtio/board/odroidc4/client_vm_2/rootfs.cpio.gz
rename to examples/virtio/board/odroidc4/client_2_vm/rootfs.cpio.gz
diff --git a/examples/virtio/board/odroidc4/virtio.system b/examples/virtio/board/odroidc4/virtio.system
index 8ee142e7c..f27a30bf6 100644
--- a/examples/virtio/board/odroidc4/virtio.system
+++ b/examples/virtio/board/odroidc4/virtio.system
@@ -17,7 +17,7 @@
     <memory_region name="bus3" size="0x100000" phys_addr="0xffd00000" />
 
     <protection_domain name="CLIENT_VMM-1" priority="100">
-        <program_image path="client_vmm_1.elf" />
+        <program_image path="client_1_vmm.elf" />
         <map mr="client_vm_ram_1" vaddr="0x20000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
         
         <!-- sDDF related regions for virtIO console -->
@@ -43,7 +43,7 @@
     </protection_domain>
 
     <protection_domain name="CLIENT_VMM-2" priority="100">
-        <program_image path="client_vmm_2.elf" />
+        <program_image path="client_2_vmm.elf" />
         <map mr="client_vm_ram_2" vaddr="0x20000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
         
         <!-- sDDF related regions for virtIO console -->
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_1/buildroot_config b/examples/virtio/board/qemu_arm_virt/client_1_vm/buildroot_config
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_1/buildroot_config
rename to examples/virtio/board/qemu_arm_virt/client_1_vm/buildroot_config
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_1/dts/init.dts b/examples/virtio/board/qemu_arm_virt/client_1_vm/dts/init.dts
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_1/dts/init.dts
rename to examples/virtio/board/qemu_arm_virt/client_1_vm/dts/init.dts
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_1/dts/linux.dts b/examples/virtio/board/qemu_arm_virt/client_1_vm/dts/linux.dts
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_1/dts/linux.dts
rename to examples/virtio/board/qemu_arm_virt/client_1_vm/dts/linux.dts
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_1/dts/virtio.dts b/examples/virtio/board/qemu_arm_virt/client_1_vm/dts/virtio.dts
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_1/dts/virtio.dts
rename to examples/virtio/board/qemu_arm_virt/client_1_vm/dts/virtio.dts
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_1/linux b/examples/virtio/board/qemu_arm_virt/client_1_vm/linux
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_1/linux
rename to examples/virtio/board/qemu_arm_virt/client_1_vm/linux
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_1/linux_config b/examples/virtio/board/qemu_arm_virt/client_1_vm/linux_config
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_1/linux_config
rename to examples/virtio/board/qemu_arm_virt/client_1_vm/linux_config
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_1/rootfs.cpio.gz b/examples/virtio/board/qemu_arm_virt/client_1_vm/rootfs.cpio.gz
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_1/rootfs.cpio.gz
rename to examples/virtio/board/qemu_arm_virt/client_1_vm/rootfs.cpio.gz
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_2/buildroot_config b/examples/virtio/board/qemu_arm_virt/client_2_vm/buildroot_config
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_2/buildroot_config
rename to examples/virtio/board/qemu_arm_virt/client_2_vm/buildroot_config
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_2/dts/init.dts b/examples/virtio/board/qemu_arm_virt/client_2_vm/dts/init.dts
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_2/dts/init.dts
rename to examples/virtio/board/qemu_arm_virt/client_2_vm/dts/init.dts
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_2/dts/linux.dts b/examples/virtio/board/qemu_arm_virt/client_2_vm/dts/linux.dts
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_2/dts/linux.dts
rename to examples/virtio/board/qemu_arm_virt/client_2_vm/dts/linux.dts
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_2/dts/virtio.dts b/examples/virtio/board/qemu_arm_virt/client_2_vm/dts/virtio.dts
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_2/dts/virtio.dts
rename to examples/virtio/board/qemu_arm_virt/client_2_vm/dts/virtio.dts
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_2/linux b/examples/virtio/board/qemu_arm_virt/client_2_vm/linux
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_2/linux
rename to examples/virtio/board/qemu_arm_virt/client_2_vm/linux
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_2/linux_config b/examples/virtio/board/qemu_arm_virt/client_2_vm/linux_config
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_2/linux_config
rename to examples/virtio/board/qemu_arm_virt/client_2_vm/linux_config
diff --git a/examples/virtio/board/qemu_arm_virt/client_vm_2/rootfs.cpio.gz b/examples/virtio/board/qemu_arm_virt/client_2_vm/rootfs.cpio.gz
similarity index 100%
rename from examples/virtio/board/qemu_arm_virt/client_vm_2/rootfs.cpio.gz
rename to examples/virtio/board/qemu_arm_virt/client_2_vm/rootfs.cpio.gz
diff --git a/examples/virtio/board/qemu_arm_virt/virtio.system b/examples/virtio/board/qemu_arm_virt/virtio.system
index 49b3ff7dd..a86e2a7ea 100644
--- a/examples/virtio/board/qemu_arm_virt/virtio.system
+++ b/examples/virtio/board/qemu_arm_virt/virtio.system
@@ -13,7 +13,7 @@
     <memory_region name="virtio_blk" size="0x4000" phys_addr="0xa000000" />
 
     <protection_domain name="CLIENT_VMM-1" priority="100">
-        <program_image path="client_vmm_1.elf" />
+        <program_image path="client_1_vmm.elf" />
         <map mr="client_vm_ram_1" vaddr="0x40000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
         
         <!-- sDDF related regions for virtIO console -->
@@ -39,7 +39,7 @@
     </protection_domain>
 
     <protection_domain name="CLIENT_VMM-2" priority="100">
-        <program_image path="client_vmm_2.elf" />
+        <program_image path="client_2_vmm.elf" />
         <map mr="client_vm_ram_2" vaddr="0x40000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
         
         <!-- sDDF related regions for virtIO console -->