Skip to content

fix create_guest_memory on aarch64 #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix create_guest_memory on aarch64 #445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/vmm/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ enum Payload {
KernelCopy,
ExternalKernel(ExternalKernel),
#[cfg(test)]
#[allow(dead_code)]
Empty,
Firmware,
#[cfg(feature = "tee")]
Expand Down Expand Up @@ -2167,14 +2168,16 @@ fn attach_snd_device(vmm: &mut Vmm, intc: IrqChip) -> std::result::Result<(), St
#[cfg(test)]
pub mod tests {
use super::*;
use crate::vmm_config::kernel_bundle::KernelBundle;

#[cfg(target_arch = "x86_64")]
fn default_guest_memory(
mem_size_mib: usize,
) -> std::result::Result<
(GuestMemoryMmap, ArchMemoryInfo, ShmManager, PayloadConfig),
StartMicrovmError,
> {
use crate::vmm_config::kernel_bundle::KernelBundle;

let mut vm_resources = VmResources::default();
vm_resources.kernel_bundle = Some(KernelBundle {
host_addr: 0x1000,
Expand Down Expand Up @@ -2221,9 +2224,6 @@ pub mod tests {
#[test]
#[cfg(all(target_arch = "aarch64", target_os = "linux"))]
fn test_create_vcpus_aarch64() {
let (guest_memory, _arch_memory_info) =
create_guest_memory(128, None, Payload::Empty).unwrap();
let vm = setup_vm(&guest_memory, false).unwrap();
let vcpu_count = 2;

let vcpu_config = VcpuConfig {
Expand All @@ -2232,6 +2232,12 @@ pub mod tests {
cpu_template: None,
};

let vm_resources = VmResources::default();

let (guest_memory, _arch_memory_info, _shm_manager, _payload_config) =
create_guest_memory(128, &vm_resources, &Payload::Empty).unwrap();
Copy link
Collaborator

@slp slp Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for taking some time to fix this!

I think it'd be better changing default_guest_memory above to create an empty VmResources (VmResources::default()) and creating the memory with an empty payload (Payload::Empty) so it can be used both in x86_64 and aarch64 tests.

let vm = setup_vm(&guest_memory, false).unwrap();

// Dummy entry_addr, vcpus will not boot.
let entry_addr = GuestAddress(0);
let vcpu_vec = create_vcpus_aarch64(
Expand Down