sq

Signed-off-by: Egor Lazarchuk <[email protected]>

Author: ShadowCurse

.cargo/config.toml

@@ -3,6 +3,7 @@ target-dir = "build/cargo_target"
 rustflags = [
   "-Ccodegen-units=1",
 ]
+target = "aarch64-unknown-linux-gnu"
 
 [net]
 git-fetch-with-cli = true

src/vmm/src/vstate/kvm.rs

@@ -1,4 +1,6 @@
-use kvm_bindings::{CpuId, MsrList, KVM_API_VERSION, KVM_MAX_CPUID_ENTRIES};
+use kvm_bindings::KVM_API_VERSION;
+#[cfg(target_arch = "x86_64")]
+use kvm_bindings::{CpuId, MsrList, KVM_MAX_CPUID_ENTRIES};
 use kvm_ioctls::Kvm as KvmFd;
 use serde::{Deserialize, Serialize};
 
@@ -146,7 +148,10 @@ impl Kvm {
 
     pub fn optional_capabilities(&self) -> OptionalCapabilities {
         OptionalCapabilities {
-            counter_offset: self.fd.check_extension(kvm_bindings::KVM_CAP_COUNTER_OFFSET) != 0,
+            counter_offset: self
+                .fd
+                .check_extension_raw(kvm_bindings::KVM_CAP_COUNTER_OFFSET)
+                != 0,
         }
     }
 

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

@@ -22,7 +22,7 @@ use crate::cpu_config::aarch64::custom_cpu_template::VcpuFeatures;
 use crate::cpu_config::templates::CpuConfiguration;
 use crate::logger::{error, IncMetric, METRICS};
 use crate::vcpu::{VcpuConfig, VcpuError};
-use crate::vstate::kvm::OptionalCapabilities;
+use crate::vstate::kvm::{Kvm, OptionalCapabilities};
 use crate::vstate::memory::{Address, GuestAddress, GuestMemoryMmap};
 use crate::vstate::vcpu::VcpuEmulation;
 use crate::vstate::vm::Vm;
@@ -78,7 +78,7 @@ impl KvmVcpu {
     ///
     /// * `index` - Represents the 0-based CPU index between [0, max vcpus).
     /// * `vm` - The vm to which this vcpu will get attached.
-    pub fn new(index: u8, vm: &Vm) -> Result<Self, KvmVcpuError> {
+    pub fn new(index: u8, vm: &Vm, _: &Kvm) -> Result<Self, KvmVcpuError> {
         let kvm_vcpu = vm
             .fd()
             .create_vcpu(index.into())
@@ -347,7 +347,6 @@ mod tests {
             vcpu_count: 1,
             smt: false,
             cpu_config: CpuConfiguration::default(),
-            &optional_capabilities,
         };
         vcpu.configure(
             &vm_mem,