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 <sudanl@amazon.com>

src/snapshot-editor/src/info.rs

@@ -6,6 +6,7 @@ use std::path::PathBuf;
 use clap::Subcommand;
 use vmm::persist::MicrovmState;
 use vmm::version_map::FC_VERSION_TO_SNAP_VERSION;
+use vmm::vstate::vcpu::VcpuState;
 
 use crate::utils::*;
 
@@ -26,7 +27,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 +43,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)?
         }
@@ -75,22 +74,31 @@ fn info_version(_: &MicrovmState, version: u16) -> Result<(), InfoVmStateError>
 }
 
 #[cfg(target_arch = "aarch64")]
+fn info_vcpu_states_arch(state: &VcpuState) {
+    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>()
+        );
+    }
+}
+
+#[cfg(target_arch = "x86_64")]
+fn info_vcpu_states_arch(state: &VcpuState) {
+    println!("{state:#?}");
+}
+
 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>()
-            );
-        }
+        info_vcpu_states_arch(state);
     }
     Ok(())
 }