refactor(test): use vm.create_vcpus() instead of open coding it

Instead of doing the irqchip dance inside unit testing code, just call
vm.create_vcpus, which does it for us.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

src/vmm/src/device_manager/mmio.rs

@@ -660,6 +660,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(target_arch = "x86_64", allow(unused_mut))]
     fn test_register_virtio_device() {
         let start_addr1 = GuestAddress(0x0);
         let start_addr2 = GuestAddress(0x1000);
@@ -690,6 +691,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(target_arch = "x86_64", allow(unused_mut))]
     fn test_register_too_many_devices() {
         let start_addr1 = GuestAddress(0x0);
         let start_addr2 = GuestAddress(0x1000);
@@ -745,6 +747,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(target_arch = "x86_64", allow(unused_mut))]
     fn test_device_info() {
         let start_addr1 = GuestAddress(0x0);
         let start_addr2 = GuestAddress(0x1000);

src/vmm/src/vstate/vcpu/mod.rs

@@ -932,20 +932,12 @@ pub(crate) mod tests {
     pub(crate) fn setup_vcpu(mem_size: usize) -> (Kvm, Vm, Vcpu, GuestMemoryMmap) {
         let (kvm, mut vm, gm) = setup_vm_with_memory(mem_size);
 
-        let exit_evt = EventFd::new(libc::EFD_NONBLOCK).unwrap();
+        let (mut vcpus, _) = vm.create_vcpus(1).unwrap();
+        let mut vcpu = vcpus.remove(0);
 
         #[cfg(target_arch = "aarch64")]
-        let vcpu = {
-            let mut vcpu = Vcpu::new(1, &vm, exit_evt).unwrap();
-            vcpu.kvm_vcpu.init(&[]).unwrap();
-            vm.setup_irqchip(1).unwrap();
-            vcpu
-        };
-        #[cfg(target_arch = "x86_64")]
-        let vcpu = {
-            vm.setup_irqchip().unwrap();
-            Vcpu::new(1, &vm, exit_evt).unwrap()
-        };
+        vcpu.kvm_vcpu.init(&[]).unwrap();
+
         (kvm, vm, vcpu, gm)
     }