diff options
Diffstat (limited to 'src/sys/windows.rs')
| -rw-r--r-- | src/sys/windows.rs | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/sys/windows.rs b/src/sys/windows.rs index beb2a5ab8..a42644bf9 100644 --- a/src/sys/windows.rs +++ b/src/sys/windows.rs @@ -186,6 +186,7 @@ use resources::SystemAllocator; use run_vcpu::run_all_vcpus; use run_vcpu::VcpuRunMode; use rutabaga_gfx::RutabagaGralloc; +use rutabaga_gfx::RutabagaGrallocBackendFlags; use smallvec::SmallVec; use sync::Mutex; use tube_transporter::TubeToken; @@ -884,6 +885,7 @@ fn handle_readable_event<V: VmArch + 'static, Vcpu: VcpuArch + 'static>( let mut run_mode_opt = None; let vcpu_size = vcpu_boxes.lock().len(); let resp = request.execute( + &guest_os.vm, &mut run_mode_opt, disk_host_tubes, &mut guest_os.pm, @@ -903,17 +905,6 @@ fn handle_readable_event<V: VmArch + 'static, Vcpu: VcpuArch + 'static>( msg, ); }, - |msg, index| { - kick_vcpu( - run_mode_arc, - vcpu_control_channels, - vcpu_boxes, - guest_os.irq_chip.as_ref(), - pvclock_host_tube, - index, - msg, - ); - }, force_s2idle, #[cfg(feature = "swap")] None, @@ -921,12 +912,6 @@ fn handle_readable_event<V: VmArch + 'static, Vcpu: VcpuArch + 'static>( vcpu_size, irq_handler_control, || guest_os.irq_chip.as_ref().snapshot(vcpu_size), - |snapshot| { - guest_os - .irq_chip - .try_box_clone()? - .restore(snapshot, vcpu_size) - }, ); (resp, run_mode_opt) }; @@ -1451,6 +1436,7 @@ fn run_control<V: VmArch + 'static, Vcpu: VcpuArch + 'static>( if let Some(path) = restore_path { vm_control::do_restore( path, + &guest_os.vm, |msg| { kick_all_vcpus( run_mode_arc.as_ref(), @@ -2488,8 +2474,8 @@ where (None, None) }; - let gralloc = - RutabagaGralloc::new().exit_context(Exit::CreateGralloc, "failed to create gralloc")?; + let gralloc = RutabagaGralloc::new(RutabagaGrallocBackendFlags::new()) + .exit_context(Exit::CreateGralloc, "failed to create gralloc")?; let pstore_size = components.pstore.as_ref().map(|pstore| pstore.size as u64); let mut sys_allocator = SystemAllocator::new( |