sq

Signed-off-by: Egor Lazarchuk <[email protected]>

Author: ShadowCurse

src/vmm/src/vstate/vcpu.rs

@@ -69,9 +69,6 @@ pub struct VcpuConfig {
     pub cpu_config: CpuConfiguration,
 }
 
-// Using this for easier explicit type-casting to help IDEs interpret the code.
-type VcpuCell = RefCell<Option<KvmRunWrapper>>;
-
 /// Error type for [`Vcpu::start_threaded`].
 #[derive(Debug, derive_more::From, thiserror::Error)]
 #[error("Failed to spawn vCPU thread: {0}")]
@@ -88,7 +85,7 @@ pub enum CopyKvmFdError {
     CreateVcpuError(#[from] kvm_ioctls::Error),
 }
 
-thread_local!(static TLS_VCPU_PTR: VcpuCell = const { RefCell::new(None) });
+thread_local!(static TLS_VCPU_PTR: RefCell<Option<KvmRunWrapper>> = const { RefCell::new(None) });
 
 /// A wrapper around creating and using a vcpu.
 #[derive(Debug)]
@@ -123,7 +120,7 @@ impl Vcpu {
             std::mem::size_of::<kvm_bindings::kvm_run>(),
         )
         .unwrap();
-        TLS_VCPU_PTR.with(|cell: &VcpuCell| {
+        TLS_VCPU_PTR.with(|cell| {
             assert!(cell.borrow().is_none());
             *cell.borrow_mut() = Some(kvm_run_ptr);
         })
@@ -135,7 +132,7 @@ impl Vcpu {
         self.init_thread_local_data();
 
         extern "C" fn handle_signal(_: c_int, _: *mut siginfo_t, _: *mut c_void) {
-            TLS_VCPU_PTR.with(|cell: &VcpuCell| {
+            TLS_VCPU_PTR.with(|cell| {
                 if let Some(kvm_run_ptr) = &mut *cell.borrow_mut() {
                     kvm_run_ptr.as_mut_ref().immediate_exit = 1;
                     fence(Ordering::Release);