fix rebase

Author: romank-msft

openhcl/virt_mshv_vtl/src/processor/snp/mod.rs

@@ -334,7 +334,7 @@ impl HardwareIsolatedBacking for SnpBacked {
         dev: &impl CpuIo,
     ) -> Result<bool, UhRunVpError> {
         this.cvm_handle_cross_vtl_interrupts(|this, vtl, check_rflags| {
-            let vmsa = this.runner.vmsa_mut(vtl);
+            let (avic_page, vmsa) = this.runner.secure_avic_page_vmsa_mut(vtl);
             if vmsa.event_inject().valid()
                 && vmsa.event_inject().interruption_type() == x86defs::snp::SEV_INTR_TYPE_NMI
             {
@@ -347,6 +347,7 @@ impl HardwareIsolatedBacking for SnpBacked {
                 .access(&mut SnpApicClient {
                     partition: this.partition,
                     vmsa,
+                    avic_page,
                     dev,
                     vmtime: &this.vmtime,
                     vtl,