vmbase_example: Upgrade to new vmbase::memory API
Replace direct manipulations of the PTs with the new API.
Replace DIY PCI initialization with the vmbase routine.
Bug: 377276983
Bug: 381400830
Test: atest vmbase_example.integration_test
Change-Id: Iefc5407091e405d5ffd25854bca820e63a0fd6d0
diff --git a/guest/vmbase_example/src/pci.rs b/guest/vmbase_example/src/pci.rs
index 379425d..32ab9f6 100644
--- a/guest/vmbase_example/src/pci.rs
+++ b/guest/vmbase_example/src/pci.rs
@@ -14,7 +14,6 @@
//! Functions to scan the PCI bus for VirtIO device.
-use aarch64_paging::paging::MemoryRegion;
use alloc::alloc::{alloc_zeroed, dealloc, handle_alloc_error, Layout};
use core::{mem::size_of, ptr::NonNull};
use log::{debug, info};
@@ -26,10 +25,7 @@
},
BufferDirection, Error, Hal, PhysAddr, PAGE_SIZE,
};
-use vmbase::{
- fdt::pci::PciInfo,
- virtio::pci::{self, PciTransportIterator},
-};
+use vmbase::virtio::pci::{self, PciTransportIterator};
/// The standard sector size of a VirtIO block device, in bytes.
const SECTOR_SIZE_BYTES: usize = 512;
@@ -115,16 +111,6 @@
info!("Wrote to VirtIO console.");
}
-/// Gets the memory region in which BARs are allocated.
-pub fn get_bar_region(pci_info: &PciInfo) -> MemoryRegion {
- MemoryRegion::new(pci_info.bar_range.start as usize, pci_info.bar_range.end as usize)
-}
-
-/// Gets the PCI CAM memory region.
-pub fn get_cam_region(pci_info: &PciInfo) -> MemoryRegion {
- MemoryRegion::new(pci_info.cam_range.start, pci_info.cam_range.end)
-}
-
struct HalImpl;
/// SAFETY: See the 'Implementation Safety' comments on methods below for how they fulfill the