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

misc: simplify configure_vcpu() signature on x86_64

Browse Source 
It is always called with topology provided, so there is no
need to pass topology as an Option. Simplifying the signature
makes further topology-related changes to arc/src/x86_64 module
simpler.

Signed-off-by: Peter Oskolkov <posk@google.com>
This commit is contained in:
Peter Oskolkov
2025-08-13 19:26:24 +00:00
committed by Rob Bradford
parent 10b79431f6
commit 34385e99f2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vmm/src/cpu.rs
View File

@@ -390,7 +390,7 @@ impl Vcpu {
boot_setup: Option<(EntryPoint, &GuestMemoryAtomic<GuestMemoryMmap>)>,
#[cfg(target_arch = "x86_64")] cpuid: Vec<CpuIdEntry>,
#[cfg(target_arch = "x86_64")] kvm_hyperv: bool,
#[cfg(target_arch = "x86_64")] topology: Option<(u16, u16, u16, u16)>,
#[cfg(target_arch = "x86_64")] topology: (u16, u16, u16, u16),
) -> Result<()> {
#[cfg(target_arch = "aarch64")]
{
@@ -885,20 +885,20 @@ impl CpuManager {
#[cfg(target_arch = "x86_64")]
let topology = self.config.topology.clone().map_or_else(
|| {
Some((
(
1_u16,
u16::try_from(self.boot_vcpus()).unwrap(),
1_u16,
1_u16,
))
)
},
|t| {
Some((
(
t.threads_per_core.into(),
t.cores_per_die.into(),
t.dies_per_package.into(),
t.packages.into(),
))
)
},
);
#[cfg(target_arch = "x86_64")]