diff --git a/vmm/src/cpu.rs b/vmm/src/cpu.rs
index 3062b61c0..98f4e9325 100644
--- a/vmm/src/cpu.rs
+++ b/vmm/src/cpu.rs
@@ -908,11 +908,28 @@ impl CpuManager {
         #[cfg(not(feature = "tdx"))]
         let dynamic = true;
 
+        #[cfg(target_arch = "x86_64")]
+        let cpuid = {
+            let phys_bits = physical_bits(hypervisor.as_ref(), config.max_phys_bits);
+            arch::generate_common_cpuid(
+                hypervisor.as_ref(),
+                &arch::CpuidConfig {
+                    phys_bits,
+                    kvm_hyperv: config.kvm_hyperv,
+                    #[cfg(feature = "tdx")]
+                    tdx: tdx_enabled,
+                    amx: config.features.amx,
+                    profile: config.profile,
+                },
+            )
+            .map_err(Error::CommonCpuId)?
+        };
+
         Ok(Arc::new(Mutex::new(CpuManager {
             config: config.clone(),
             interrupt_controller: None,
             #[cfg(target_arch = "x86_64")]
-            cpuid: Vec::new(),
+            cpuid,
             vm,
             vcpus_kill_signalled: Arc::new(AtomicBool::new(false)),
             vcpus_pause_signalled: Arc::new(AtomicBool::new(false)),
@@ -940,31 +957,6 @@ impl CpuManager {
         })))
     }
 
-    #[cfg(target_arch = "x86_64")]
-    pub fn populate_cpuid(
-        &mut self,
-        hypervisor: &dyn hypervisor::Hypervisor,
-        #[cfg(feature = "tdx")] tdx: bool,
-    ) -> Result<()> {
-        self.cpuid = {
-            let phys_bits = physical_bits(hypervisor, self.config.max_phys_bits);
-            arch::generate_common_cpuid(
-                hypervisor,
-                &arch::CpuidConfig {
-                    phys_bits,
-                    kvm_hyperv: self.config.kvm_hyperv,
-                    #[cfg(feature = "tdx")]
-                    tdx,
-                    amx: self.config.features.amx,
-                    profile: self.config.profile,
-                },
-            )
-            .map_err(Error::CommonCpuId)?
-        };
-
-        Ok(())
-    }
-
     fn create_vcpu(
         &mut self,
         cpu_id: u32,
diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs
index 3890a51f1..9fd5d85b0 100644
--- a/vmm/src/vm.rs
+++ b/vmm/src/vm.rs
@@ -818,18 +818,6 @@ impl Vm {
             igvm_enabled,
         )
         .map_err(Error::CpuManager)?;
-
-        #[cfg(target_arch = "x86_64")]
-        cpu_manager
-            .lock()
-            .unwrap()
-            .populate_cpuid(
-                hypervisor.as_ref(),
-                #[cfg(feature = "tdx")]
-                tdx_enabled,
-            )
-            .map_err(Error::CpuManager)?;
-
         Ok(cpu_manager)
     }