mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-02 11:35:46 +00:00
hypervisor: x86: drop get/set VcpuEvents from vcpu trait
Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
parent
58dbf07453
commit
d461daa7fa
@ -19,7 +19,7 @@ use crate::kvm::{TdxExitDetails, TdxExitStatus};
|
|||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
use crate::x86_64::LapicState;
|
use crate::x86_64::LapicState;
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
use crate::x86_64::{MsrEntries, VcpuEvents};
|
use crate::x86_64::MsrEntries;
|
||||||
use crate::CpuState;
|
use crate::CpuState;
|
||||||
#[cfg(target_arch = "aarch64")]
|
#[cfg(target_arch = "aarch64")]
|
||||||
use crate::DeviceAttr;
|
use crate::DeviceAttr;
|
||||||
@ -349,18 +349,6 @@ pub trait Vcpu: Send + Sync {
|
|||||||
/// Sets the vcpu's current "multiprocessing state".
|
/// Sets the vcpu's current "multiprocessing state".
|
||||||
///
|
///
|
||||||
fn set_mp_state(&self, mp_state: MpState) -> Result<()>;
|
fn set_mp_state(&self, mp_state: MpState) -> Result<()>;
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
///
|
|
||||||
/// Returns currently pending exceptions, interrupts, and NMIs as well as related
|
|
||||||
/// states of the vcpu.
|
|
||||||
///
|
|
||||||
fn get_vcpu_events(&self) -> Result<VcpuEvents>;
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
///
|
|
||||||
/// Sets pending exceptions, interrupts, and NMIs as well as related states
|
|
||||||
/// of the vcpu.
|
|
||||||
///
|
|
||||||
fn set_vcpu_events(&self, events: &VcpuEvents) -> Result<()>;
|
|
||||||
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
|
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
|
||||||
///
|
///
|
||||||
/// Let the guest know that it has been paused, which prevents from
|
/// Let the guest know that it has been paused, which prevents from
|
||||||
|
@ -1535,26 +1535,6 @@ impl cpu::Vcpu for KvmVcpu {
|
|||||||
}
|
}
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
///
|
///
|
||||||
/// Returns currently pending exceptions, interrupts, and NMIs as well as related
|
|
||||||
/// states of the vcpu.
|
|
||||||
///
|
|
||||||
fn get_vcpu_events(&self) -> cpu::Result<VcpuEvents> {
|
|
||||||
self.fd
|
|
||||||
.get_vcpu_events()
|
|
||||||
.map_err(|e| cpu::HypervisorCpuError::GetVcpuEvents(e.into()))
|
|
||||||
}
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
///
|
|
||||||
/// Sets pending exceptions, interrupts, and NMIs as well as related states
|
|
||||||
/// of the vcpu.
|
|
||||||
///
|
|
||||||
fn set_vcpu_events(&self, events: &VcpuEvents) -> cpu::Result<()> {
|
|
||||||
self.fd
|
|
||||||
.set_vcpu_events(events)
|
|
||||||
.map_err(|e| cpu::HypervisorCpuError::SetVcpuEvents(e.into()))
|
|
||||||
}
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
///
|
|
||||||
/// Let the guest know that it has been paused, which prevents from
|
/// Let the guest know that it has been paused, which prevents from
|
||||||
/// potential soft lockups when being resumed.
|
/// potential soft lockups when being resumed.
|
||||||
///
|
///
|
||||||
@ -2106,6 +2086,26 @@ impl KvmVcpu {
|
|||||||
.set_xcrs(xcrs)
|
.set_xcrs(xcrs)
|
||||||
.map_err(|e| cpu::HypervisorCpuError::SetXcsr(e.into()))
|
.map_err(|e| cpu::HypervisorCpuError::SetXcsr(e.into()))
|
||||||
}
|
}
|
||||||
|
#[cfg(target_arch = "x86_64")]
|
||||||
|
///
|
||||||
|
/// Returns currently pending exceptions, interrupts, and NMIs as well as related
|
||||||
|
/// states of the vcpu.
|
||||||
|
///
|
||||||
|
fn get_vcpu_events(&self) -> cpu::Result<VcpuEvents> {
|
||||||
|
self.fd
|
||||||
|
.get_vcpu_events()
|
||||||
|
.map_err(|e| cpu::HypervisorCpuError::GetVcpuEvents(e.into()))
|
||||||
|
}
|
||||||
|
#[cfg(target_arch = "x86_64")]
|
||||||
|
///
|
||||||
|
/// Sets pending exceptions, interrupts, and NMIs as well as related states
|
||||||
|
/// of the vcpu.
|
||||||
|
///
|
||||||
|
fn set_vcpu_events(&self, events: &VcpuEvents) -> cpu::Result<()> {
|
||||||
|
self.fd
|
||||||
|
.set_vcpu_events(events)
|
||||||
|
.map_err(|e| cpu::HypervisorCpuError::SetVcpuEvents(e.into()))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Device struct for KVM
|
/// Device struct for KVM
|
||||||
|
@ -354,26 +354,6 @@ impl cpu::Vcpu for MshvVcpu {
|
|||||||
.map_err(|e| cpu::HypervisorCpuError::SetMsrEntries(e.into()))
|
.map_err(|e| cpu::HypervisorCpuError::SetMsrEntries(e.into()))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
///
|
|
||||||
/// Returns currently pending exceptions, interrupts, and NMIs as well as related
|
|
||||||
/// states of the vcpu.
|
|
||||||
///
|
|
||||||
fn get_vcpu_events(&self) -> cpu::Result<VcpuEvents> {
|
|
||||||
self.fd
|
|
||||||
.get_vcpu_events()
|
|
||||||
.map_err(|e| cpu::HypervisorCpuError::GetVcpuEvents(e.into()))
|
|
||||||
}
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
|
||||||
///
|
|
||||||
/// Sets pending exceptions, interrupts, and NMIs as well as related states
|
|
||||||
/// of the vcpu.
|
|
||||||
///
|
|
||||||
fn set_vcpu_events(&self, events: &VcpuEvents) -> cpu::Result<()> {
|
|
||||||
self.fd
|
|
||||||
.set_vcpu_events(events)
|
|
||||||
.map_err(|e| cpu::HypervisorCpuError::SetVcpuEvents(e.into()))
|
|
||||||
}
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
///
|
///
|
||||||
/// X86 specific call to enable HyperV SynIC
|
/// X86 specific call to enable HyperV SynIC
|
||||||
@ -725,6 +705,26 @@ impl MshvVcpu {
|
|||||||
.set_xcrs(xcrs)
|
.set_xcrs(xcrs)
|
||||||
.map_err(|e| cpu::HypervisorCpuError::SetXcsr(e.into()))
|
.map_err(|e| cpu::HypervisorCpuError::SetXcsr(e.into()))
|
||||||
}
|
}
|
||||||
|
#[cfg(target_arch = "x86_64")]
|
||||||
|
///
|
||||||
|
/// Returns currently pending exceptions, interrupts, and NMIs as well as related
|
||||||
|
/// states of the vcpu.
|
||||||
|
///
|
||||||
|
fn get_vcpu_events(&self) -> cpu::Result<VcpuEvents> {
|
||||||
|
self.fd
|
||||||
|
.get_vcpu_events()
|
||||||
|
.map_err(|e| cpu::HypervisorCpuError::GetVcpuEvents(e.into()))
|
||||||
|
}
|
||||||
|
#[cfg(target_arch = "x86_64")]
|
||||||
|
///
|
||||||
|
/// Sets pending exceptions, interrupts, and NMIs as well as related states
|
||||||
|
/// of the vcpu.
|
||||||
|
///
|
||||||
|
fn set_vcpu_events(&self, events: &VcpuEvents) -> cpu::Result<()> {
|
||||||
|
self.fd
|
||||||
|
.set_vcpu_events(events)
|
||||||
|
.map_err(|e| cpu::HypervisorCpuError::SetVcpuEvents(e.into()))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Device struct for MSHV
|
/// Device struct for MSHV
|
||||||
|
Loading…
Reference in New Issue
Block a user