diff --git a/hypervisor/src/mshv/mod.rs b/hypervisor/src/mshv/mod.rs index a2cbb6160..ffc77b3c5 100644 --- a/hypervisor/src/mshv/mod.rs +++ b/hypervisor/src/mshv/mod.rs @@ -586,9 +586,11 @@ impl<'a> PlatformEmulator for MshvEmulatorContext<'a> { ); if let Some(vmmops) = &self.vcpu.vmmops { - vmmops - .mmio_read(gpa, data) - .map_err(|e| PlatformError::MemoryReadFailure(e.into()))?; + if vmmops.guest_mem_read(gpa, data).is_err() { + vmmops + .mmio_read(gpa, data) + .map_err(|e| PlatformError::MemoryReadFailure(e.into()))?; + } } Ok(()) @@ -604,9 +606,11 @@ impl<'a> PlatformEmulator for MshvEmulatorContext<'a> { ); if let Some(vmmops) = &self.vcpu.vmmops { - vmmops - .mmio_write(gpa, data) - .map_err(|e| PlatformError::MemoryWriteFailure(e.into()))?; + if vmmops.guest_mem_write(gpa, data).is_err() { + vmmops + .mmio_write(gpa, data) + .map_err(|e| PlatformError::MemoryWriteFailure(e.into()))?; + } } Ok(())