External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-08-23 16:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: cpu: Rename "vm_memory" parameter/member to "guest_memory"

Browse Source 
This gives consistency across the file.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-12-01 12:33:36 +00:00
parent d98f2618bd
commit e5e5a89e65
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vmm/src/cpu.rs
View File

@ -324,13 +324,13 @@ impl Vcpu {
/// # Arguments /// # Arguments
/// ///
/// * `kernel_entry_point` - Kernel entry point address in guest memory and boot protocol used. /// * `kernel_entry_point` - Kernel entry point address in guest memory and boot protocol used.
/// * `vm_memory` - Guest memory. /// * `guest_memory` - Guest memory.
/// * `cpuid` - (x86_64) CpuId, wrapper over the `kvm_cpuid2` structure. /// * `cpuid` - (x86_64) CpuId, wrapper over the `kvm_cpuid2` structure.
pub fn configure( pub fn configure(
&mut self, &mut self,
#[cfg(target_arch = "aarch64")] vm: &Arc<dyn hypervisor::Vm>, #[cfg(target_arch = "aarch64")] vm: &Arc<dyn hypervisor::Vm>,
kernel_entry_point: Option<EntryPoint>, kernel_entry_point: Option<EntryPoint>,
#[cfg(target_arch = "x86_64")] vm_memory: &GuestMemoryAtomic<GuestMemoryMmap>, #[cfg(target_arch = "x86_64")] guest_memory: &GuestMemoryAtomic<GuestMemoryMmap>,
#[cfg(target_arch = "x86_64")] cpuid: Vec<CpuIdEntry>, #[cfg(target_arch = "x86_64")] cpuid: Vec<CpuIdEntry>,
#[cfg(target_arch = "x86_64")] kvm_hyperv: bool, #[cfg(target_arch = "x86_64")] kvm_hyperv: bool,
) -> Result<()> { ) -> Result<()> {
@ -346,7 +346,7 @@ impl Vcpu {
&self.vcpu, &self.vcpu,
self.id, self.id,
kernel_entry_point, kernel_entry_point,
vm_memory, guest_memory,
cpuid, cpuid,
kvm_hyperv, kvm_hyperv,
) )
@ -427,7 +427,7 @@ pub struct CpuManager {
#[cfg_attr(target_arch = "aarch64", allow(dead_code))] #[cfg_attr(target_arch = "aarch64", allow(dead_code))]
interrupt_controller: Option<Arc<Mutex<dyn InterruptController>>>, interrupt_controller: Option<Arc<Mutex<dyn InterruptController>>>,
#[cfg_attr(target_arch = "aarch64", allow(dead_code))] #[cfg_attr(target_arch = "aarch64", allow(dead_code))]
vm_memory: GuestMemoryAtomic<GuestMemoryMmap>, guest_memory: GuestMemoryAtomic<GuestMemoryMmap>,
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
cpuid: Vec<CpuIdEntry>, cpuid: Vec<CpuIdEntry>,
#[cfg_attr(target_arch = "aarch64", allow(dead_code))] #[cfg_attr(target_arch = "aarch64", allow(dead_code))]
@ -688,7 +688,7 @@ impl CpuManager {
hypervisor_type, hypervisor_type,
config: config.clone(), config: config.clone(),
interrupt_controller: None, interrupt_controller: None,
vm_memory: guest_memory, guest_memory,
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
cpuid, cpuid,
vm, vm,
@ -748,7 +748,7 @@ impl CpuManager {
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
vcpu.configure( vcpu.configure(
entry_point, entry_point,
&self.vm_memory, &self.guest_memory,
self.cpuid.clone(), self.cpuid.clone(),
self.config.kvm_hyperv, self.config.kvm_hyperv,
) )
@ -1627,7 +1627,7 @@ impl CpuManager {
descaddr &= !7u64; descaddr &= !7u64;
let mut buf = [0; 8]; let mut buf = [0; 8];
self.vm_memory self.guest_memory
.memory() .memory()
.read(&mut buf, GuestAddress(descaddr)) .read(&mut buf, GuestAddress(descaddr))
.map_err(|e| Error::TranslateVirtualAddress(e.into()))?; .map_err(|e| Error::TranslateVirtualAddress(e.into()))?;
@ -2260,7 +2260,7 @@ impl Debuggable for CpuManager {
}; };
let psize = arch::PAGE_SIZE as u64; let psize = arch::PAGE_SIZE as u64;
let read_len = std::cmp::min(len as u64 - total_read, psize - (paddr & (psize - 1))); let read_len = std::cmp::min(len as u64 - total_read, psize - (paddr & (psize - 1)));
self.vm_memory self.guest_memory
.memory() .memory()
.read( .read(
&mut buf[total_read as usize..total_read as usize + read_len as usize], &mut buf[total_read as usize..total_read as usize + read_len as usize],
@ -2292,7 +2292,7 @@ impl Debuggable for CpuManager {
data.len() as u64 - total_written, data.len() as u64 - total_written,
psize - (paddr & (psize - 1)), psize - (paddr & (psize - 1)),
); );
self.vm_memory self.guest_memory
.memory() .memory()
.write( .write(
&data[total_written as usize..total_written as usize + write_len as usize], &data[total_written as usize..total_written as usize + write_len as usize],