From e5891eee46475982f6ccc7169c2223ebefa6c264 Mon Sep 17 00:00:00 2001
From: Brian Kocoloski <bkocolos@isi.edu>
Date: Wed, 17 Apr 2024 11:43:34 -0700
Subject: [PATCH] remove serial compositons

---
 apps/Arm/vm_multi/settings.cmake  | 6 +++---
 apps/Arm/vm_multi/vm_multi.camkes | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/Arm/vm_multi/settings.cmake b/apps/Arm/vm_multi/settings.cmake
index b5438c32..7a5b8c66 100644
--- a/apps/Arm/vm_multi/settings.cmake
+++ b/apps/Arm/vm_multi/settings.cmake
@@ -11,14 +11,14 @@ if(NOT "${PLATFORM}" IN_LIST supported)
 endif()
 set(LibUSB OFF CACHE BOOL "" FORCE)
 set(VmPCISupport ON CACHE BOOL "" FORCE)
-set(VmVirtioConsole ON CACHE BOOL "" FORCE)
-set(VmVirtioNetArping OFF CACHE BOOL "" FORCE)
+#set(VmVirtioConsole ON CACHE BOOL "" FORCE)
+#set(VmVirtioNetArping OFF CACHE BOOL "" FORCE)
 set(VmVirtioNetVirtqueue ON CACHE BOOL "" FORCE)
 set(VmInitRdFile ON CACHE BOOL "" FORCE)
 if("${PLATFORM}" STREQUAL "qemu-arm-virt")
     set(QEMU_MEMORY "2048")
     set(KernelArmCPU cortex-a53 CACHE STRING "" FORCE)
-    set(qemu_sim_extra_args "-netdev tap,id=mynet0,ifname=tap0,script=no,downscript=no -device virtio-net,netdev=mynet0,mac=52:55:00:d1:55:01")
+    set(qemu_sim_extra_args "-netdev tap,id=mynet0,ifname=tap0,script=no,downscript=no -device virtio-net,netdev=mynet0,mac=52:55:00:d1:55:01,disable-modern=on,disable-legacy=off")
     set(KernelArmExportPCNTUser ON CACHE BOOL "" FORCE)
     set(KernelArmExportPTMRUser ON CACHE BOOL "" FORCE)
 endif()
diff --git a/apps/Arm/vm_multi/vm_multi.camkes b/apps/Arm/vm_multi/vm_multi.camkes
index 453b32e4..d6c2f6f1 100644
--- a/apps/Arm/vm_multi/vm_multi.camkes
+++ b/apps/Arm/vm_multi/vm_multi.camkes
@@ -42,7 +42,7 @@ assembly {
         VM_COMPOSITION_DEF(1)
         VM_COMPOSITION_DEF(2)
         /* vm0,vm1 & vm2 serial connections */
-        VM_VIRTUAL_SERIAL_COMPOSITION_DEF(0,1,2)
+        // VM_VIRTUAL_SERIAL_COMPOSITION_DEF(0,1,2)
 
         /* vm0-[vm1,vm2] connection */
         component VirtQueueInit vm1_vm0;
@@ -60,7 +60,7 @@ assembly {
         VM_CONFIGURATION_DEF(0)
         VM_CONFIGURATION_DEF(1)
         VM_CONFIGURATION_DEF(2)
-        VM_VIRTUAL_SERIAL_CONFIGURATION_DEF(0,1,2)
+        //VM_VIRTUAL_SERIAL_CONFIGURATION_DEF(0,1,2)
 
         vm0.num_extra_frame_caps = 0;
         vm0.extra_frame_map_address = 0;
@@ -92,6 +92,7 @@ assembly {
         vm0.recv1_shmem_size = 8192;
         vm0.send1_id = 1;
         vm0.send1_shmem_size = 8192;
+
         /* VM0-VM2 virtqueue configurations */
         vm0.recv2_id = 2;
         vm0.recv2_shmem_size = 8192;
@@ -116,6 +117,5 @@ assembly {
 
         vm2_vm0.init_topology = [{ "drv" : "vm0.send2", "dev" : "vm2.recv1"},
                                  { "drv" : "vm2.send1", "dev" : "vm0.recv2"}];
-
     }
 }