diff options
| author | Daniel Verkamp <dverkamp@chromium.org> | 2023-03-15 13:18:22 -0700 |
|---|---|---|
| committer | crosvm LUCI <crosvm-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-03-15 21:43:14 +0000 |
| commit | 4257db14895bdb52f6bc7aa721d4ea4ceb656317 (patch) | |
| tree | 548b358c2bc872d4f7666ce168fe76166aba38bd /hypervisor | |
| parent | b96ba4c8bee41be937907b0fc05caf978cdde948 (diff) | |
| download | crosvm-4257db14895bdb52f6bc7aa721d4ea4ceb656317.tar.gz | |
hypervisor: remove nmi.pad field from VcpuEvents
This seems to be purely reserved for alignment reasons; the kernel
never touches it, so we don't need to serialize/deserialize it.
BUG=b:266515147
TEST=tools/presubmit
Change-Id: I3074d24f50a8e0e86340c398885c2fbef1410a88
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4342173
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Elie Kheirallah <khei@google.com>
Reviewed-by: Frederick Mayle <fmayle@google.com>
Diffstat (limited to 'hypervisor')
| -rw-r--r-- | hypervisor/src/kvm/x86_64.rs | 5 | ||||
| -rw-r--r-- | hypervisor/src/x86_64.rs | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/hypervisor/src/kvm/x86_64.rs b/hypervisor/src/kvm/x86_64.rs index 108de2115..baf1c50cd 100644 --- a/hypervisor/src/kvm/x86_64.rs +++ b/hypervisor/src/kvm/x86_64.rs @@ -1318,7 +1318,6 @@ impl From<&VcpuEvents> for kvm_vcpu_events { kvm_ve.flags |= KVM_VCPUEVENT_VALID_NMI_PENDING; } kvm_ve.nmi.masked = ve.nmi.masked as u8; - kvm_ve.nmi.pad = ve.nmi.pad; if let Some(sipi_vector) = ve.sipi_vector { kvm_ve.sipi_vector = sipi_vector; @@ -1374,7 +1373,6 @@ impl From<&kvm_vcpu_events> for VcpuEvents { None }, masked: ve.nmi.masked != 0, - pad: ve.nmi.pad, }; let sipi_vector = if ve.flags & KVM_VCPUEVENT_VALID_SIPI_VECTOR != 0 { @@ -1631,7 +1629,6 @@ mod tests { kvm_ve.nmi.injected = 1; kvm_ve.nmi.pending = 1; kvm_ve.nmi.masked = 0; - kvm_ve.nmi.pad = 111; kvm_ve.sipi_vector = 105; @@ -1667,7 +1664,6 @@ mod tests { assert_eq!(ve.nmi.injected, true); assert_eq!(ve.nmi.pending.unwrap(), true); assert_eq!(ve.nmi.masked, false); - assert_eq!(ve.nmi.pad, 111); assert_eq!(ve.sipi_vector.unwrap(), 105); @@ -1695,7 +1691,6 @@ mod tests { assert_eq!(kvm_ve_restored.nmi.injected, 1); assert_eq!(kvm_ve_restored.nmi.pending, 1); assert_eq!(kvm_ve_restored.nmi.masked, 0); - assert_eq!(kvm_ve_restored.nmi.pad, 111); assert_eq!(kvm_ve_restored.sipi_vector, 105); diff --git a/hypervisor/src/x86_64.rs b/hypervisor/src/x86_64.rs index 2d179959c..e1bacdd9f 100644 --- a/hypervisor/src/x86_64.rs +++ b/hypervisor/src/x86_64.rs @@ -879,7 +879,6 @@ pub struct VcpuNmiState { pub injected: bool, pub pending: Option<bool>, pub masked: bool, - pub pad: u8, } #[derive(Debug, Clone, Serialize, Deserialize)] |