mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-02 11:35:46 +00:00
hypervisor: aarch64: drop set_its_device
The field can be set directly. This eliminates one place where dyn Device is used outside of KVM aarch64 code. Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
parent
422bf89d4d
commit
0856ebbd42
@ -1,9 +1,8 @@
|
|||||||
// Copyright 2022 Arm Limited (or its affiliates). All rights reserved.
|
// Copyright 2022 Arm Limited (or its affiliates). All rights reserved.
|
||||||
|
|
||||||
use crate::{CpuState, Device, GicState, HypervisorDeviceError, HypervisorVmError};
|
use crate::{CpuState, GicState, HypervisorDeviceError, HypervisorVmError};
|
||||||
use std::any::Any;
|
use std::any::Any;
|
||||||
use std::result;
|
use std::result;
|
||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
/// Errors thrown while setting up the VGIC.
|
/// Errors thrown while setting up the VGIC.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
@ -40,8 +39,6 @@ pub trait Vgic: Send + Sync {
|
|||||||
/// Returns the MSI reg property of the device
|
/// Returns the MSI reg property of the device
|
||||||
fn msi_properties(&self) -> [u64; 2];
|
fn msi_properties(&self) -> [u64; 2];
|
||||||
|
|
||||||
fn set_its_device(&mut self, its_device: Option<Arc<dyn Device>>);
|
|
||||||
|
|
||||||
/// Get the values of GICR_TYPER for each vCPU.
|
/// Get the values of GICR_TYPER for each vCPU.
|
||||||
fn set_gicr_typers(&mut self, vcpu_states: &[CpuState]);
|
fn set_gicr_typers(&mut self, vcpu_states: &[CpuState]);
|
||||||
|
|
||||||
|
@ -187,7 +187,7 @@ impl KvmGicV3Its {
|
|||||||
0,
|
0,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
self.set_its_device(Some(its_fd));
|
self.its_device = Some(its_fd);
|
||||||
|
|
||||||
/* We need to tell the kernel how many irqs to support with this vgic.
|
/* We need to tell the kernel how many irqs to support with this vgic.
|
||||||
* See the `layout` module for details.
|
* See the `layout` module for details.
|
||||||
@ -315,10 +315,6 @@ impl Vgic for KvmGicV3Its {
|
|||||||
[self.msi_addr, self.msi_size]
|
[self.msi_addr, self.msi_size]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_its_device(&mut self, its_device: Option<Arc<dyn Device>>) {
|
|
||||||
self.its_device = its_device;
|
|
||||||
}
|
|
||||||
|
|
||||||
fn set_gicr_typers(&mut self, vcpu_states: &[CpuState]) {
|
fn set_gicr_typers(&mut self, vcpu_states: &[CpuState]) {
|
||||||
let gicr_typers = construct_gicr_typers(vcpu_states);
|
let gicr_typers = construct_gicr_typers(vcpu_states);
|
||||||
self.gicr_typers = gicr_typers;
|
self.gicr_typers = gicr_typers;
|
||||||
|
Loading…
Reference in New Issue
Block a user