From 218ec563fc5e31d5d378703ac20a4cc6acfac7f2 Mon Sep 17 00:00:00 2001
From: Wei Liu <liuwe@microsoft.com>
Date: Tue, 28 Jul 2020 17:01:48 +0000
Subject: [PATCH] vmm: fix warnings when KVM is not enabled

Some imports are only used by KVM. Some variables and code become dead
or unused when KVM is not enabled.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
---
 vmm/src/device_manager.rs | 7 ++++---
 vmm/src/vm.rs             | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs
index bc79791f5..042f50533 100644
--- a/vmm/src/device_manager.rs
+++ b/vmm/src/device_manager.rs
@@ -57,13 +57,13 @@ use std::fs::{File, OpenOptions};
 use std::io::{self, sink, stdout, Seek, SeekFrom};
 use std::num::Wrapping;
 use std::os::unix::fs::OpenOptionsExt;
-#[cfg(feature = "pci_support")]
+#[cfg(all(feature = "pci_support", feature = "kvm"))]
 use std::os::unix::io::FromRawFd;
 use std::path::PathBuf;
 use std::result;
 use std::sync::{Arc, Mutex};
 use tempfile::NamedTempFile;
-#[cfg(feature = "pci_support")]
+#[cfg(all(feature = "pci_support", feature = "kvm"))]
 use vfio_ioctls::{VfioContainer, VfioDevice, VfioDmaMapping};
 #[cfg(feature = "pci_support")]
 use virtio_devices::transport::VirtioPciDevice;
@@ -92,7 +92,7 @@ use vmm_sys_util::eventfd::EventFd;
 #[cfg(any(feature = "mmio_support", target_arch = "aarch64"))]
 const MMIO_LEN: u64 = 0x1000;
 
-#[cfg(feature = "pci_support")]
+#[cfg(all(feature = "pci_support", feature = "kvm"))]
 const VFIO_DEVICE_NAME_PREFIX: &str = "_vfio";
 
 #[cfg(target_arch = "x86_64")]
@@ -2406,6 +2406,7 @@ impl DeviceManager {
     }
 
     #[cfg(feature = "pci_support")]
+    #[cfg_attr(not(feature = "kvm"), allow(unused_variables))]
     fn add_passthrough_device(
         &mut self,
         pci: &mut PciBus,
diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs
index 6d4cc44db..538e4ff4f 100644
--- a/vmm/src/vm.rs
+++ b/vmm/src/vm.rs
@@ -251,6 +251,7 @@ pub struct Vm {
     cpu_manager: Arc<Mutex<cpu::CpuManager>>,
     memory_manager: Arc<Mutex<MemoryManager>>,
     #[cfg(target_arch = "x86_64")]
+    #[cfg_attr(not(feature = "kvm"), allow(dead_code))]
     // The hypervisor abstracted virtual machine.
     vm: Arc<dyn hypervisor::Vm>,
     #[cfg(target_arch = "x86_64")]