Skip to content

Commit

Permalink
refactor(builder): address comments
Browse files Browse the repository at this point in the history
remove the aarch64 suffix from the attach_legacy_devices_aarch64
function and ensure that aarch64 smt is always set to false int the
configure_system_for_boot function

Signed-off-by: tommady <[email protected]>
  • Loading branch information
tommady committed Nov 22, 2024
1 parent 1e3fc10 commit ef6e55a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/vmm/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ impl std::convert::From<linux_loader::cmdline::Error> for StartMicrovmError {
pub mod aarch64 {
use super::*;

fn attach_legacy_devices_aarch64(
fn attach_legacy_devices(
event_manager: &mut EventManager,
vmm: &mut Vmm,
cmdline: &mut LoaderKernelCmdline,
Expand Down Expand Up @@ -222,7 +222,8 @@ pub mod aarch64 {

let vcpu_config = VcpuConfig {
vcpu_count: vm_config.vcpu_count,
smt: vm_config.smt,
// smt does not exist on aarch64
smt: false,
cpu_config,
};

Expand Down Expand Up @@ -642,8 +643,7 @@ pub fn build_microvm_for_boot(
}

#[cfg(target_arch = "aarch64")]
aarch::attach_legacy_devices_aarch64(event_manager, &mut vmm, &mut boot_cmdline)
.map_err(Internal)?;
aarch::attach_legacy_devices(event_manager, &mut vmm, &mut boot_cmdline).map_err(Internal)?;

attach_vmgenid_device(&mut vmm)?;

Expand Down

0 comments on commit ef6e55a

Please sign in to comment.