Skip to content

Commit 4620d28

Browse files
committed
fix: compilation errors due to unrelated firecracker changes
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 <[email protected]>
1 parent 938d5a9 commit 4620d28

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/vmm/src/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ pub fn build_microvm_for_boot(
341341

342342
#[cfg(feature = "gdb")]
343343
if let Some(gdb_socket_path) = &vm_resources.machine_config.gdb_socket_path {
344-
gdb::gdb_thread(vmm.clone(), vcpu_fds, gdb_rx, entry_addr, gdb_socket_path)
344+
gdb::gdb_thread(vmm.clone(), vcpu_fds, gdb_rx, entry_point.entry_addr, gdb_socket_path)
345345
.map_err(GdbServer)?;
346346
} else {
347347
debug!("No GDB socket provided not starting gdb server.");

src/vmm/src/vstate/vcpu/aarch64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ mod tests {
304304
use std::os::unix::io::AsRawFd;
305305

306306
use kvm_bindings::{KVM_ARM_VCPU_PSCI_0_2, KVM_REG_SIZE_U64};
307-
307+
use vm_memory::GuestAddress;
308308
use super::*;
309309
use crate::arch::aarch64::regs::Aarch64RegisterRef;
310310
use crate::arch::BootProtocol;

0 commit comments

Comments
 (0)