External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-08 12:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vm-virtio: Fix virtio-pci BAR type

Browse Source 
The 32 or 64 bits type for the memory BAR was not set correctly. This
patch ensure the right type is applied to the BAR.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2019-09-20 14:48:34 -07:00 committed by Rob Bradford
parent 29b3848ffb
commit 2cd406ba50
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vm-virtio/src/transport/pci_device.rs
View File

@ -542,32 +542,27 @@ impl PciDevice for VirtioPciDevice {
// Allocate the virtio-pci capability BAR. // Allocate the virtio-pci capability BAR.
// See http://docs.oasis-open.org/virtio/virtio/v1.0/cs04/virtio-v1.0-cs04.html#x1-740004 // See http://docs.oasis-open.org/virtio/virtio/v1.0/cs04/virtio-v1.0-cs04.html#x1-740004
let virtio_pci_bar_addr = if self.use_64bit_bar { let (virtio_pci_bar_addr, region_type) = if self.use_64bit_bar {
let region_type = PciBarRegionType::Memory64BitRegion;
let addr = allocator let addr = allocator
.allocate_mmio_addresses(None, CAPABILITY_BAR_SIZE, None) .allocate_mmio_addresses(None, CAPABILITY_BAR_SIZE, None)
.ok_or(PciDeviceError::IoAllocationFailed(CAPABILITY_BAR_SIZE))?; .ok_or(PciDeviceError::IoAllocationFailed(CAPABILITY_BAR_SIZE))?;
ranges.push(( ranges.push((addr, CAPABILITY_BAR_SIZE, region_type));
addr, (addr, region_type)
CAPABILITY_BAR_SIZE,
PciBarRegionType::Memory64BitRegion,
));
addr
} else { } else {
let region_type = PciBarRegionType::Memory32BitRegion;
let addr = allocator let addr = allocator
.allocate_mmio_hole_addresses(None, CAPABILITY_BAR_SIZE, None) .allocate_mmio_hole_addresses(None, CAPABILITY_BAR_SIZE, None)
.ok_or(PciDeviceError::IoAllocationFailed(CAPABILITY_BAR_SIZE))?; .ok_or(PciDeviceError::IoAllocationFailed(CAPABILITY_BAR_SIZE))?;
ranges.push(( ranges.push((addr, CAPABILITY_BAR_SIZE, region_type));
addr, (addr, region_type)
CAPABILITY_BAR_SIZE,
PciBarRegionType::Memory32BitRegion,
));
addr
}; };
let config = PciBarConfiguration::default() let config = PciBarConfiguration::default()
.set_register_index(0) .set_register_index(0)
.set_address(virtio_pci_bar_addr.raw_value()) .set_address(virtio_pci_bar_addr.raw_value())
.set_size(CAPABILITY_BAR_SIZE); .set_size(CAPABILITY_BAR_SIZE)
.set_region_type(region_type);
let virtio_pci_bar = let virtio_pci_bar =
self.configuration.add_pci_bar(&config).map_err(|e| { self.configuration.add_pci_bar(&config).map_err(|e| {
PciDeviceError::IoRegistrationFailed(virtio_pci_bar_addr.raw_value(), e) PciDeviceError::IoRegistrationFailed(virtio_pci_bar_addr.raw_value(), e)