few more defs

Author: romank-msft

vm/hv1/hvdef/src/lib.rs

@@ -3632,6 +3632,16 @@ pub struct HvX64RegisterSevControl {
     pub vmsa_gpa_page_number: u64,
 }
 
+#[bitfield(u64)]
+#[derive(IntoBytes, Immutable, KnownLayout, FromBytes)]
+pub struct HvX64RegisterSevAvic {
+    pub enable_secure_apic: bool,
+    #[bits(11)]
+    _rsvd1: u64,
+    #[bits(52)]
+    pub avic_gpa_page_number: u64,
+}
+
 #[bitfield(u64)]
 #[derive(IntoBytes, Immutable, KnownLayout, FromBytes)]
 pub struct HvRegisterReferenceTsc {

vm/x86/x86defs/src/snp.rs

@@ -206,6 +206,20 @@ pub struct SevNpfInfo {
     rsvd38_63: u64,
 }
 
+/// SEV secure AVIC control register
+#[bitfield(u64)]
+#[derive(IntoBytes, Immutable, KnownLayout, FromBytes, PartialEq, Eq)]
+pub struct SecureAvicControl {
+    #[bits(1)]
+    pub secure_avic_en: u64,
+    #[bits(1)]
+    pub allowed_nmi: u64,
+    #[bits(10)]
+    _rsvd: u64,
+    #[bits(52)]
+    pub guest_apic_backing_page_ptr: u64,
+}
+
 /// SEV VMSA structure representing CPU state
 #[repr(C)]
 #[derive(Debug, Clone, IntoBytes, Immutable, KnownLayout, FromBytes, PartialEq, Eq)]
@@ -344,7 +358,7 @@ pub struct SevVmsa {
     pub rcx: u64,
     pub rdx: u64,
     pub rbx: u64,
-    pub vmsa_reserved8: u64, // MBZ
+    pub secure_avic_control: SecureAvicControl,
     pub rbp: u64,
     pub rsi: u64,
     pub rdi: u64,