Fix x86_64 errors and add test

- Fixed errors that occurred on x86 build
- Added integration test for checking steal time

Signed-off-by: Dakshin Devanand <[email protected]>

Author: DakshinD

src/vmm/src/builder.rs

@@ -11,6 +11,7 @@ use std::sync::{Arc, Mutex};
 use event_manager::{MutEventSubscriber, SubscriberOps};
 use libc::EFD_NONBLOCK;
 use linux_loader::cmdline::Cmdline as LoaderKernelCmdline;
+#[cfg(target_arch = "aarch64")]
 use log::warn;
 use userfaultfd::Uffd;
 use utils::time::TimestampUs;
@@ -85,6 +86,7 @@ pub enum StartMicrovmError {
     /// Error creating VMGenID device: {0}
     CreateVMGenID(VmGenIdError),
     /// Error creating PVTime device: {0}
+    #[cfg(target_arch = "aarch64")]
     CreatePVTime(PVTimeError),
     /// Invalid Memory Configuration: {0}
     GuestMemory(crate::vstate::memory::MemoryError),
@@ -420,6 +422,7 @@ pub enum BuildMicrovmFromSnapshotError {
     ACPIDeviManager(#[from] ACPIDeviceManagerRestoreError),
     /// VMGenID update failed: {0}
     VMGenIDUpdate(std::io::Error),
+    #[cfg(target_arch = "aarch64")]
     /// Failed to restore PVTime device: {0}
     RestorePVTime(#[from] PVTimeError),
 }

tests/integration_tests/functional/test_pvtime.py

@@ -6,6 +6,29 @@
 import re
 import time
 
+import pytest
+
+from framework.properties import global_props
+
+
+@pytest.mark.skipif(
+    global_props.cpu_architecture != "aarch64", reason="Only run in aarch64"
+)
+def test_guest_has_pvtime_enabled(uvm_plain):
+    """
+    Check that the guest kernel has enabled PV steal time.
+    """
+    vm = uvm_plain
+    vm.spawn()
+    vm.basic_config()
+    vm.add_net_iface()
+    vm.start()
+
+    _, stdout, _ = vm.ssh.run("dmesg | grep 'stolen time PV'")
+    assert (
+        "stolen time PV" in stdout
+    ), "Guest kernel did not report PV steal time enabled"
+
 
 def test_pvtime_steal_time_increases(uvm_plain):
     """