chore: make info_vcpu_states be available on x86

Since x86 now has vcpu states printable, make
info_vcpu_states available on x86 as well.

Signed-off-by: Sudan Landge <[email protected]>

Author: Sudan Landge

docs/snapshotting/snapshot-editor.md

@@ -98,7 +98,7 @@ Firecracker snapshot consists of 2 files:
 > ./snapshot-editor info-vmstate version --vmstate-path ./vmstate_file
 > ```
 
-#### `vcpu-states` subcommand (aarch64 only)
+#### `vcpu-states` subcommand
 
 > This command is used to print the vCPU states inside vmstate snapshot file.
 >

src/snapshot-editor/src/info.rs

@@ -26,7 +26,6 @@ pub enum InfoVmStateSubCommand {
         vmstate_path: PathBuf,
     },
     /// Print info about vcpu states.
-    #[cfg(target_arch = "aarch64")]
     VcpuStates {
         /// Path to the vmstate file.
         #[arg(short, long)]
@@ -43,7 +42,6 @@ pub enum InfoVmStateSubCommand {
 pub fn info_vmstate_command(command: InfoVmStateSubCommand) -> Result<(), InfoVmStateError> {
     match command {
         InfoVmStateSubCommand::Version { vmstate_path } => info(&vmstate_path, info_version)?,
-        #[cfg(target_arch = "aarch64")]
         InfoVmStateSubCommand::VcpuStates { vmstate_path } => {
             info(&vmstate_path, info_vcpu_states)?
         }
@@ -74,23 +72,10 @@ fn info_version(_: &MicrovmState, version: u16) -> Result<(), InfoVmStateError>
     }
 }
 
-#[cfg(target_arch = "aarch64")]
 fn info_vcpu_states(state: &MicrovmState, _: u16) -> Result<(), InfoVmStateError> {
     for (i, state) in state.vcpu_states.iter().enumerate() {
         println!("vcpu {i}:");
-        println!("kvm_mp_state: {:#x}", state.mp_state.mp_state);
-        println!("mpidr: {:#x}", state.mpidr);
-        for reg in state.regs.iter() {
-            println!(
-                "{:#x} 0x{}",
-                reg.id,
-                reg.as_slice()
-                    .iter()
-                    .rev()
-                    .map(|b| format!("{b:x}"))
-                    .collect::<String>()
-            );
-        }
+        println!("{state:#?}");
     }
     Ok(())
 }

src/vmm/src/vstate/vcpu/aarch64.rs

@@ -5,6 +5,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the THIRD-PARTY file.
 
+use std::fmt::Debug;
+
 use kvm_bindings::*;
 use kvm_ioctls::*;
 use versionize::{VersionMap, Versionize, VersionizeError, VersionizeResult};
@@ -250,7 +252,7 @@ impl KvmVcpu {
 }
 
 /// Structure holding VCPU kvm state.
-#[derive(Debug, Default, Clone, Versionize)]
+#[derive(Default, Clone, Versionize)]
 pub struct VcpuState {
     /// Multiprocessing state.
     pub mp_state: kvm_bindings::kvm_mp_state,
@@ -271,6 +273,26 @@ pub struct VcpuState {
     pub kvi: Option<kvm_bindings::kvm_vcpu_init>,
 }
 
+impl Debug for VcpuState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        writeln!(f, "kvm_mp_state: {:#x}", self.mp_state.mp_state)?;
+        writeln!(f, "mpidr: {:#x}", self.mpidr)?;
+        for reg in self.regs.iter() {
+            writeln!(
+                f,
+                "{:#x} 0x{}",
+                reg.id,
+                reg.as_slice()
+                    .iter()
+                    .rev()
+                    .map(|b| format!("{b:x}"))
+                    .collect::<String>()
+            )?;
+        }
+        Ok(())
+    }
+}
+
 impl VcpuState {
     fn default_old_regs(_: u16) -> Vec<Aarch64RegisterOld> {
         Vec::default()