Skip to content

Commit

Permalink
fix: compilation errors due to unrelated firecracker changes
Browse files Browse the repository at this point in the history
With PVH support, we are passing around an `EntryPoint` structure, not
just an address. Extract the address from the struct, and pass it to
gdb::gdb_thread instead to fix compilation.

A aarch64 unittest was missing a `GuestAddress` import.

Signed-off-by: Patrick Roy <roypat@amazon.co.uk>
  • Loading branch information
roypat committed Feb 24, 2025
1 parent 5d37abd commit b95ea58
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/vmm/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ pub fn build_microvm_for_boot(

#[cfg(feature = "gdb")]
if let Some(gdb_socket_path) = &vm_resources.machine_config.gdb_socket_path {
gdb::gdb_thread(vmm.clone(), vcpu_fds, gdb_rx, entry_addr, gdb_socket_path)
gdb::gdb_thread(vmm.clone(), vcpu_fds, gdb_rx, entry_point.entry_addr, gdb_socket_path)
.map_err(GdbServer)?;
} else {
debug!("No GDB socket provided not starting gdb server.");
Expand Down
2 changes: 1 addition & 1 deletion src/vmm/src/vstate/vcpu/aarch64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ mod tests {
use std::os::unix::io::AsRawFd;

use kvm_bindings::{KVM_ARM_VCPU_PSCI_0_2, KVM_REG_SIZE_U64};

use vm_memory::GuestAddress;
use super::*;
use crate::arch::aarch64::regs::Aarch64RegisterRef;
use crate::arch::BootProtocol;
Expand Down

0 comments on commit b95ea58

Please sign in to comment.