From 11ffc83365cbd2734608031b11f2e370433624ba Mon Sep 17 00:00:00 2001
From: Wei Liu <liuwe@microsoft.com>
Date: Tue, 14 Jul 2020 11:41:20 +0000
Subject: [PATCH] arch: use hypervsisor::new in test cases

Signed-off-by: Wei Liu <liuwe@microsoft.com>
---
 arch/src/aarch64/fdt.rs       |  3 +--
 arch/src/aarch64/gic.rs       |  3 +--
 arch/src/aarch64/regs.rs      |  6 ++----
 arch/src/x86_64/interrupts.rs |  3 +--
 arch/src/x86_64/regs.rs       | 12 ++++--------
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/arch/src/aarch64/fdt.rs b/arch/src/aarch64/fdt.rs
index 7fde94a2f..774bb4d6f 100644
--- a/arch/src/aarch64/fdt.rs
+++ b/arch/src/aarch64/fdt.rs
@@ -650,8 +650,7 @@ mod tests {
         .cloned()
         .collect();
 
-        let kvm = hypervisor::kvm::KvmHypervisor::new().unwrap();
-        let hv: Arc<dyn hypervisor::Hypervisor> = Arc::new(kvm);
+        let hv = hypervisor::new().unwrap();
         let vm = hv.create_vm().unwrap();
         let gic = create_gic(&vm, 1, false).unwrap();
         assert!(create_fdt(
diff --git a/arch/src/aarch64/gic.rs b/arch/src/aarch64/gic.rs
index 46825d3a2..ef03bdf39 100644
--- a/arch/src/aarch64/gic.rs
+++ b/arch/src/aarch64/gic.rs
@@ -177,8 +177,7 @@ mod tests {
 
     #[test]
     fn test_create_gic() {
-        let kvm = hypervisor::kvm::KvmHypervisor::new().unwrap();
-        let hv: Arc<dyn hypervisor::Hypervisor> = Arc::new(kvm);
+        let hv = hypervisor::new().unwrap();
         let vm = hv.create_vm().unwrap();
 
         assert!(create_gic(&vm, 1, false).is_ok());
diff --git a/arch/src/aarch64/regs.rs b/arch/src/aarch64/regs.rs
index 6c471cfa0..78dc5c025 100644
--- a/arch/src/aarch64/regs.rs
+++ b/arch/src/aarch64/regs.rs
@@ -163,8 +163,7 @@ mod tests {
 
     #[test]
     fn test_setup_regs() {
-        let kvm = hypervisor::kvm::KvmHypervisor::new().unwrap();
-        let hv: Arc<dyn hypervisor::Hypervisor> = Arc::new(kvm);
+        let hv = hypervisor::new().unwrap();
         let vm = hv.create_vm().unwrap();
         let vcpu = vm.create_vcpu(0).unwrap();
         let mut regions = Vec::new();
@@ -182,8 +181,7 @@ mod tests {
     }
     #[test]
     fn test_read_mpidr() {
-        let kvm = hypervisor::kvm::KvmHypervisor::new().unwrap();
-        let hv: Arc<dyn hypervisor::Hypervisor> = Arc::new(kvm);
+        let hv = hypervisor::new().unwrap();
         let vm = hv.create_vm().unwrap();
         let vcpu = vm.create_vcpu(0).unwrap();
         let mut kvi: kvm_bindings::kvm_vcpu_init = kvm_bindings::kvm_vcpu_init::default();
diff --git a/arch/src/x86_64/interrupts.rs b/arch/src/x86_64/interrupts.rs
index 391b6b84a..9c6573e2b 100644
--- a/arch/src/x86_64/interrupts.rs
+++ b/arch/src/x86_64/interrupts.rs
@@ -121,8 +121,7 @@ mod tests {
 
     #[test]
     fn test_setlint() {
-        let kvm = hypervisor::kvm::KvmHypervisor::new().unwrap();
-        let hv: Arc<dyn hypervisor::Hypervisor> = Arc::new(kvm);
+        let hv = hypervisor::new().unwrap();
         let vm = hv.create_vm().expect("new VM fd creation failed");
         assert!(hv.check_capability(hypervisor::kvm::Cap::Irqchip));
         // Calling get_lapic will fail if there is no irqchip before hand.
diff --git a/arch/src/x86_64/regs.rs b/arch/src/x86_64/regs.rs
index b240ba820..d06c6c5a8 100644
--- a/arch/src/x86_64/regs.rs
+++ b/arch/src/x86_64/regs.rs
@@ -365,8 +365,7 @@ mod tests {
 
     #[test]
     fn test_setup_fpu() {
-        let kvm = hypervisor::kvm::KvmHypervisor::new().unwrap();
-        let hv: Arc<dyn hypervisor::Hypervisor> = Arc::new(kvm);
+        let hv = hypervisor::new().unwrap();
         let vm = hv.create_vm().expect("new VM fd creation failed");
         let vcpu = vm.create_vcpu(0).unwrap();
         setup_fpu(&vcpu).unwrap();
@@ -391,8 +390,7 @@ mod tests {
         use hypervisor::arch::x86::msr_index;
         use hypervisor::x86_64::{MsrEntries, MsrEntry};
 
-        let kvm = hypervisor::kvm::KvmHypervisor::new().unwrap();
-        let hv: Arc<dyn hypervisor::Hypervisor> = Arc::new(kvm);
+        let hv = hypervisor::new().unwrap();
         let vm = hv.create_vm().expect("new VM fd creation failed");
         let vcpu = vm.create_vcpu(0).unwrap();
         setup_msrs(&vcpu).unwrap();
@@ -418,8 +416,7 @@ mod tests {
 
     #[test]
     fn test_setup_regs() {
-        let kvm = hypervisor::kvm::KvmHypervisor::new().unwrap();
-        let hv: Arc<dyn hypervisor::Hypervisor> = Arc::new(kvm);
+        let hv = hypervisor::new().unwrap();
         let vm = hv.create_vm().expect("new VM fd creation failed");
         let vcpu = vm.create_vcpu(0).unwrap();
 
@@ -447,8 +444,7 @@ mod tests {
 
     #[test]
     fn test_setup_sregs() {
-        let kvm = hypervisor::kvm::KvmHypervisor::new().unwrap();
-        let hv: Arc<dyn hypervisor::Hypervisor> = Arc::new(kvm);
+        let hv = hypervisor::new().unwrap();
         let vm = hv.create_vm().expect("new VM fd creation failed");
         let vcpu = vm.create_vcpu(0).unwrap();