diff options
author | Matt Delco <delco@chromium.org> | 2020-02-13 14:08:04 -0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-02-20 02:12:03 +0000 |
commit | e73414db487afd4bebd2fb60ca80693ee6349cf5 (patch) | |
tree | adf53724c2db3f7c21e7d85ba9df6b6354ca327a /src/plugin | |
parent | c469580e6c9b83172ba58e8305c6e5c11acfe186 (diff) | |
download | crosvm-e73414db487afd4bebd2fb60ca80693ee6349cf5.tar crosvm-e73414db487afd4bebd2fb60ca80693ee6349cf5.tar.gz crosvm-e73414db487afd4bebd2fb60ca80693ee6349cf5.tar.bz2 crosvm-e73414db487afd4bebd2fb60ca80693ee6349cf5.tar.lz crosvm-e73414db487afd4bebd2fb60ca80693ee6349cf5.tar.xz crosvm-e73414db487afd4bebd2fb60ca80693ee6349cf5.tar.zst crosvm-e73414db487afd4bebd2fb60ca80693ee6349cf5.zip |
crosvm: add ability to enable caps on vcpu
This change primarily adds functionality to allow kvm features to be enabled on a vcpu (most of the current infra only supporst the ioctl for the vm fd). BUG=b:144746965 TEST=ran 'build_test' and verified that the added tests passed. Change-Id: I30c00b6f462377c21d477602ceba5853df953b37 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2055883 Tested-by: Matt Delco <delco@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Dmitry Torokhov <dtor@chromium.org> Reviewed-by: Dylan Reid <dgreid@chromium.org> Commit-Queue: Matt Delco <delco@chromium.org>
Diffstat (limited to 'src/plugin')
-rw-r--r-- | src/plugin/vcpu.rs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/plugin/vcpu.rs b/src/plugin/vcpu.rs index 6bae9c4..ae96789 100644 --- a/src/plugin/vcpu.rs +++ b/src/plugin/vcpu.rs @@ -20,8 +20,8 @@ use assertions::const_assert; use data_model::DataInit; use kvm::{CpuId, Vcpu}; use kvm_sys::{ - kvm_debugregs, kvm_fpu, kvm_lapic_state, kvm_mp_state, kvm_msr_entry, kvm_msrs, kvm_regs, - kvm_sregs, kvm_vcpu_events, kvm_xcrs, KVM_CPUID_FLAG_SIGNIFCANT_INDEX, + kvm_debugregs, kvm_enable_cap, kvm_fpu, kvm_lapic_state, kvm_mp_state, kvm_msr_entry, kvm_msrs, + kvm_regs, kvm_sregs, kvm_vcpu_events, kvm_xcrs, KVM_CPUID_FLAG_SIGNIFCANT_INDEX, }; use protobuf::stream::CodedOutputStream; use protos::plugin::*; @@ -675,6 +675,18 @@ impl PluginVcpu { cpuid_entry.edx = request_entry.edx; } vcpu.set_cpuid2(&cpuid) + } else if request.has_enable_capability() { + response.mut_enable_capability(); + let capability = request.get_enable_capability().capability; + if capability != kvm_sys::KVM_CAP_HYPERV_SYNIC + && capability != kvm_sys::KVM_CAP_HYPERV_SYNIC2 + { + Err(SysError::new(EINVAL)) + } else { + let mut cap: kvm_enable_cap = Default::default(); + cap.cap = capability; + vcpu.kvm_enable_cap(&cap) + } } else if request.has_shutdown() { return Err(SysError::new(EPIPE)); } else { |