From 3dc15a92593d2d0dade61d533c946a890ba715e2 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Thu, 3 Jun 2021 13:27:46 +0000 Subject: [PATCH] vmm: tdx: Don't access same locked structure twice Signed-off-by: Rob Bradford --- vmm/src/vm.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index b156c1788..062b27d2e 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -549,6 +549,8 @@ impl Vm { })); let exit_evt_clone = exit_evt.try_clone().map_err(Error::EventFdClone)?; + #[cfg(feature = "tdx")] + let tdx_enabled = config.lock().unwrap().tdx.is_some(); let cpu_manager = cpu::CpuManager::new( &config.lock().unwrap().cpus.clone(), &device_manager, @@ -560,7 +562,7 @@ impl Vm { seccomp_action.clone(), vm_ops, #[cfg(feature = "tdx")] - config.lock().unwrap().tdx.is_some(), + tdx_enabled, ) .map_err(Error::CpuManager)?;