kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

pci: Refine pci topology

Browse Source 
PciConfigIo is a legacy pci bus dispatcher, which manages all pci
devices including a pci root bridge. However, it is unnecessary to
design a complex hierarchy which redirects every access by PciRoot.

Since pci root bridge is also a pci device instance, and only contains
easy config space read/write, and PciConfigIo actually acts as a pci bus
to dispatch resource based resolving when VMExit, we re-arrange to make
the pci hierarchy clean.

Signed-off-by: Jing Liu <jing2.liu@linux.intel.com>
This commit is contained in:
Jing Liu
2019-06-04 14:51:00 +08:00
committed by Samuel Ortiz
parent 4605ecf1a8
commit 2bb0b22cc1
4 changed files with 125 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
vmm/src/vm.rs
View File

@@ -525,7 +525,8 @@ impl DeviceManager {
exit_evt.try_clone().map_err(DeviceManagerError::EventFd)?,
)));
let mut pci_root = PciRoot::new(None);
let pci_root = PciRoot::new(None);
let mut pci = PciConfigIo::new(pci_root);
for disk_cfg in &vm_cfg.disks {
// Open block device path
@@ -559,7 +560,7 @@ impl DeviceManager {
memory.clone(),
allocator,
vm_fd,
&mut pci_root,
&mut pci,
&mut mmio_bus,
&interrupt_info,
)?;
@@ -584,7 +585,7 @@ impl DeviceManager {
memory.clone(),
allocator,
vm_fd,
&mut pci_root,
&mut pci,
&mut mmio_bus,
&interrupt_info,
)?;
@@ -600,7 +601,7 @@ impl DeviceManager {
memory.clone(),
allocator,
vm_fd,
&mut pci_root,
&mut pci,
&mut mmio_bus,
&interrupt_info,
)?;
@@ -623,7 +624,7 @@ impl DeviceManager {
memory.clone(),
allocator,
vm_fd,
&mut pci_root,
&mut pci,
&mut mmio_bus,
&interrupt_info,
)?;
@@ -688,14 +689,14 @@ impl DeviceManager {
memory.clone(),
allocator,
vm_fd,
&mut pci_root,
&mut pci,
&mut mmio_bus,
&interrupt_info,
)?;
}
}
let pci = Arc::new(Mutex::new(PciConfigIo::new(pci_root)));
let pci = Arc::new(Mutex::new(pci));
Ok(DeviceManager {
io_bus,
@@ -713,7 +714,7 @@ impl DeviceManager {
memory: GuestMemoryMmap,
allocator: &mut SystemAllocator,
vm_fd: &Arc<VmFd>,
pci_root: &mut PciRoot,
pci: &mut PciConfigIo,
mmio_bus: &mut devices::Bus,
interrupt_info: &InterruptInfo,
) -> DeviceManagerResult<()> {
@@ -804,12 +805,10 @@ impl DeviceManager {
let virtio_pci_device = Arc::new(Mutex::new(virtio_pci_device));
pci_root
.add_device(virtio_pci_device.clone())
pci.add_device(virtio_pci_device.clone())
.map_err(DeviceManagerError::AddPciDevice)?;
pci_root
.register_mapping(virtio_pci_device.clone(), mmio_bus, bars)
pci.register_mapping(virtio_pci_device.clone(), mmio_bus, bars)
.map_err(DeviceManagerError::AddPciDevice)?;
Ok(())