Skip to content

refactor(dev-mngr): store vm as Arc in MMIODevManagerConstructorArgs #5401

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

Merged
merged 2 commits into from
Aug 22, 2025
Merged

refactor(dev-mngr): store vm as Arc in MMIODevManagerConstructorArgs #5401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6584f0
refactor(dev-mngr): store vm as Arc in MMIODevManagerConstructorArgs
Manciukic Aug 8, 2025
dec94b1
Merge branch 'main' into refactor/arc-vm-in-mmio-dev-mgr
Manciukic Aug 22, 2025
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
2 changes: 1 addition & 1 deletion src/vmm/src/device_manager/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ impl<'a> Persist<'a> for DeviceManager {

// Restore PCI devices
let pci_ctor_args = PciDevicesConstructorArgs {
vm: constructor_args.vm.clone(),
vm: constructor_args.vm,
mem: constructor_args.mem,
vm_resources: constructor_args.vm_resources,
instance_id: constructor_args.instance_id,
Expand Down
16 changes: 8 additions & 8 deletions src/vmm/src/device_manager/pci_mngr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ pub struct PciDevicesState {
}

pub struct PciDevicesConstructorArgs<'a> {
pub vm: Arc<Vm>,
pub vm: &'a Arc<Vm>,
pub mem: &'a GuestMemoryMmap,
pub vm_resources: &'a mut VmResources,
pub instance_id: &'a str,
Expand Down Expand Up @@ -405,7 +405,7 @@ impl<'a> Persist<'a> for PciDevices {
return Ok(pci_devices);
}

pci_devices.attach_pci_segment(&constructor_args.vm)?;
pci_devices.attach_pci_segment(constructor_args.vm)?;

if let Some(balloon_state) = &state.balloon_device {
let device = Arc::new(Mutex::new(
Expand All @@ -426,7 +426,7 @@ impl<'a> Persist<'a> for PciDevices {

pci_devices
.restore_pci_device(
&constructor_args.vm,
constructor_args.vm,
device,
&balloon_state.device_id,
&balloon_state.transport_state,
Expand All @@ -451,7 +451,7 @@ impl<'a> Persist<'a> for PciDevices {

pci_devices
.restore_pci_device(
&constructor_args.vm,
constructor_args.vm,
device,
&block_state.device_id,
&block_state.transport_state,
Expand Down Expand Up @@ -501,7 +501,7 @@ impl<'a> Persist<'a> for PciDevices {

pci_devices
.restore_pci_device(
&constructor_args.vm,
constructor_args.vm,
device,
&net_state.device_id,
&net_state.transport_state,
Expand Down Expand Up @@ -534,7 +534,7 @@ impl<'a> Persist<'a> for PciDevices {

pci_devices
.restore_pci_device(
&constructor_args.vm,
constructor_args.vm,
device,
&vsock_state.device_id,
&vsock_state.transport_state,
Expand All @@ -557,7 +557,7 @@ impl<'a> Persist<'a> for PciDevices {

pci_devices
.restore_pci_device(
&constructor_args.vm,
constructor_args.vm,
device,
&entropy_state.device_id,
&entropy_state.transport_state,
Expand Down Expand Up @@ -664,7 +664,7 @@ mod tests {
.data;
let vm_resources = &mut VmResources::default();
let restore_args = PciDevicesConstructorArgs {
vm: vmm.vm.clone(),
vm: &vmm.vm,
mem: vmm.vm.guest_memory(),
vm_resources,
instance_id: "microvm-id",
Expand Down
8 changes: 2 additions & 6 deletions src/vmm/src/device_manager/persist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ pub enum SharedDeviceType {

pub struct MMIODevManagerConstructorArgs<'a> {
pub mem: &'a GuestMemoryMmap,
pub vm: &'a Vm,
pub vm: &'a Arc<Vm>,
pub event_manager: &'a mut EventManager,
pub vm_resources: &'a mut VmResources,
pub instance_id: &'a str,
Expand Down Expand Up @@ -364,11 +364,7 @@ impl<'a> Persist<'a> for MMIODeviceManager {
}
if state.type_ == DeviceType::Rtc {
let rtc = Arc::new(Mutex::new(RTCDevice::new()));
dev_manager.register_mmio_rtc(
constructor_args.vm,
rtc,
Some(state.device_info),
)?;
dev_manager.register_mmio_rtc(vm, rtc, Some(state.device_info))?;
}
}
}
Expand Down