Change semihosting to conditional compilation

Author: jinwjinl

kernel/src/arch/aarch64/virt/exit.rs

@@ -14,6 +14,7 @@
 
 use super::{guest, hyper, vcpu::Vcpu, vgic};
 use core::arch::asm;
+#[cfg(test)]
 use semihosting::println;
 
 static mut GUEST_SHUTDOWN: bool = false;
@@ -78,7 +79,6 @@ pub fn handle_vm_exit(vcpu: &mut Vcpu) -> bool {
         VmExitReason::Hvc => handle_hvc(vcpu, &exit_info),
         VmExitReason::Svc => handle_svc(vcpu, &exit_info),
         VmExitReason::DataAbortLowerEL => {
-            semihosting::println!("[EXIT] Data Abort from Guest (Stage-2 Fault)");
             let iss = esr & 0x1FFFFFF;
             let dfsc = iss & 0x3F;
             let is_write = (iss & (1 << 6)) != 0;
@@ -106,6 +106,7 @@ pub fn handle_vm_exit(vcpu: &mut Vcpu) -> bool {
                         vgic::flush(vcpu.id());
                         return true;
                     } else {
+                        #[cfg(test)]
                         semihosting::println!("[EXIT]   Unhandled Stage-2 Address!");
                     }
                 }
@@ -142,6 +143,7 @@ pub fn handle_vm_exit(vcpu: &mut Vcpu) -> bool {
             }
         }
         VmExitReason::Unknown(ec) => {
+            #[cfg(test)]
             semihosting::println!("[EXIT]  Unknown Exit Reason: EC = {:#x}", ec);
             false
         }
@@ -184,6 +186,7 @@ fn handle_hvc(vcpu: &mut Vcpu, info: &VmExitInfo) -> bool {
                     }
                 }
                 _ => {
+                    #[cfg(test)]
                     semihosting::println!("[EXIT] HVC#0: Ignored PSCI call: {:#x}", psci_func_id);
                     context.regs[0] = 0xFFFF_FFFF;
                 }
@@ -196,6 +199,7 @@ fn handle_hvc(vcpu: &mut Vcpu, info: &VmExitInfo) -> bool {
             true
         }
         _ => {
+            #[cfg(test)]
             semihosting::println!("[EXIT]   Unknown HVC Number");
             true
         }

kernel/src/arch/aarch64/virt/mmu_s2.rs

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 use crate::arch::aarch64::registers::{vtcr_el2::VTCR_EL2, vttbr_el2::VTTBR_EL2};
-use semihosting::println;
 use tock_registers::interfaces::*;
 
 // Structure of Page Table.

kernel/src/arch/aarch64/virt/mod.rs

@@ -25,10 +25,12 @@ pub use crate::arch::aarch64::psci::hvc_call;
 use blueos_hal::PlatPeri;
 pub use exit::{VmExitInfo, VmExitReason};
 pub use hyper::{get_current_el, hyp_init};
-use semihosting::println;
 pub use vcpu::{Vcpu, VcpuManager, VcpuState};
 pub use vgic::init;
 
+#[cfg(test)]
+use semihosting::println;
+
 // PL011 UART addresses for QEMU Virt
 const UART0_DR: *mut u32 = 0x0900_0000 as *mut u32;
 const UART0_FR: *mut u32 = 0x0900_0018 as *mut u32;
@@ -84,6 +86,7 @@ pub extern "C" fn hyper_trap_irq(_context: &mut crate::arch::aarch64::Context) -
             core::arch::asm!("msr ICC_EOIR1_EL1, {}", in(reg) iar);
         }
     } else {
+        #[cfg(test)]
         semihosting::println!("[EL2] Unhandled Guest IRQ: {}", intid);
         // For uninterruptible/unknown interrupts,
         // we must manually downgrade and deactivate them;
@@ -150,6 +153,7 @@ pub fn virt_boot_linux() {
     if result == 0 {
         let uart = crate::boards::get_device!(console_uart);
         uart.enable();
+        #[cfg(test)]
         semihosting::println!("Linux shutdown!!!");
     }
 }