External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-02 19:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Make the "mmio" only build generate no errors

Browse Source 
Rerrange "use" statements and make rename variables and fields to
indicate they might be unused.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2019-09-16 15:04:24 +01:00 committed by Sebastien Boeuf
parent 4df5ebea12
commit 3bc11a4a2e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vmm/src/device_manager.rs
View File

@ -13,7 +13,7 @@ use crate::config::ConsoleOutputMode;
use crate::vm::VmInfo; use crate::vm::VmInfo;
use devices::ioapic; use devices::ioapic;
use kvm_bindings::{kvm_msi, kvm_userspace_memory_region}; use kvm_bindings::kvm_userspace_memory_region;
use kvm_ioctls::*; use kvm_ioctls::*;
use libc::O_TMPFILE; use libc::O_TMPFILE;
use libc::{EFD_NONBLOCK, TIOCGWINSZ}; use libc::{EFD_NONBLOCK, TIOCGWINSZ};
@ -166,7 +166,7 @@ struct BusInfo<'a> {
} }
struct InterruptInfo<'a> { struct InterruptInfo<'a> {
msi_capable: bool, _msi_capable: bool,
ioapic: &'a Option<Arc<Mutex<ioapic::Ioapic>>>, ioapic: &'a Option<Arc<Mutex<ioapic::Ioapic>>>,
} }
@ -289,7 +289,7 @@ impl DeviceManager {
pub fn new( pub fn new(
vm_info: &VmInfo, vm_info: &VmInfo,
allocator: &mut SystemAllocator, allocator: &mut SystemAllocator,
msi_capable: bool, _msi_capable: bool,
userspace_ioapic: bool, userspace_ioapic: bool,
mut mem_slots: u32, mut mem_slots: u32,
_exit_evt: &EventFd, _exit_evt: &EventFd,
@ -316,7 +316,7 @@ impl DeviceManager {
}; };
let interrupt_info = InterruptInfo { let interrupt_info = InterruptInfo {
msi_capable, _msi_capable,
ioapic: &ioapic, ioapic: &ioapic,
}; };
@ -803,6 +803,7 @@ impl DeviceManager {
Ok(devices) Ok(devices)
} }
#[cfg(feature = "pci_support")]
fn create_kvm_device(vm: &Arc<VmFd>) -> DeviceManagerResult<DeviceFd> { fn create_kvm_device(vm: &Arc<VmFd>) -> DeviceManagerResult<DeviceFd> {
let mut vfio_dev = kvm_bindings::kvm_create_device { let mut vfio_dev = kvm_bindings::kvm_create_device {
type_: kvm_bindings::kvm_device_type_KVM_DEV_TYPE_VFIO, type_: kvm_bindings::kvm_device_type_KVM_DEV_TYPE_VFIO,
@ -866,7 +867,7 @@ impl DeviceManager {
buses: &mut BusInfo, buses: &mut BusInfo,
interrupt_info: &InterruptInfo, interrupt_info: &InterruptInfo,
) -> DeviceManagerResult<()> { ) -> DeviceManagerResult<()> {
let msix_num = if interrupt_info.msi_capable { let msix_num = if interrupt_info._msi_capable {
// Allows support for one MSI-X vector per queue. It also adds 1 // Allows support for one MSI-X vector per queue. It also adds 1
// as we need to take into account the dedicated vector to notify // as we need to take into account the dedicated vector to notify
// about a virtio config change. // about a virtio config change.
@ -889,11 +890,12 @@ impl DeviceManager {
.map_err(DeviceManagerError::RegisterIoevent)?; .map_err(DeviceManagerError::RegisterIoevent)?;
} }
if interrupt_info.msi_capable { if interrupt_info._msi_capable {
let vm_fd_clone = vm_fd.clone(); let vm_fd_clone = vm_fd.clone();
let msi_cb = Arc::new(Box::new(move |p: InterruptParameters| { let msi_cb = Arc::new(Box::new(move |p: InterruptParameters| {
if let Some(entry) = p.msix { if let Some(entry) = p.msix {
use kvm_bindings::kvm_msi;
let msi_queue = kvm_msi { let msi_queue = kvm_msi {
address_lo: entry.msg_addr_lo, address_lo: entry.msg_addr_lo,
address_hi: entry.msg_addr_hi, address_hi: entry.msg_addr_hi,