summary refs log tree commit diff
path: root/kvm/tests/read_only_memory.rs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-06-14 11:25:18 +0000
committerAlyssa Ross <hi@alyssa.is>2020-06-14 11:25:18 +0000
commitb7966a9d2e768533acac0f37bdeb293c256109d3 (patch)
tree357a365ecc99e4bec214d084352e316769f70041 /kvm/tests/read_only_memory.rs
parent1e318da5b57c12f67bed3b528100dbe4ec287ac5 (diff)
parentd42d3fec7a9535b664b89d30fd48c90feda59957 (diff)
downloadcrosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar
crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.gz
crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.bz2
crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.lz
crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.xz
crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.zst
crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'kvm/tests/read_only_memory.rs')
-rw-r--r--kvm/tests/read_only_memory.rs11
1 files changed, 7 insertions, 4 deletions
diff --git a/kvm/tests/read_only_memory.rs b/kvm/tests/read_only_memory.rs
index d8c0e1d..36ba1b2 100644
--- a/kvm/tests/read_only_memory.rs
+++ b/kvm/tests/read_only_memory.rs
@@ -45,9 +45,12 @@ fn test_run() {
     vcpu_regs.rax = 0x66;
     vcpu_regs.rbx = 0;
     vcpu.set_regs(&vcpu_regs).expect("set regs failed");
-    vm.add_mmio_memory(
+    vm.add_memory_region(
         GuestAddress(0),
-        MemoryMapping::from_fd(&mem, mem_size as usize).expect("failed to create memory mapping"),
+        Box::new(
+            MemoryMapping::from_fd(&mem, mem_size as usize)
+                .expect("failed to create memory mapping"),
+        ),
         false,
         false,
     )
@@ -63,9 +66,9 @@ fn test_run() {
     mmap_ro
         .write_obj(vcpu_regs.rax as u8, 0)
         .expect("failed writing data to ro memory");
-    vm.add_mmio_memory(
+    vm.add_memory_region(
         GuestAddress(vcpu_sregs.es.base),
-        MemoryMapping::from_fd(&mem_ro, 0x1000).expect("failed to create memory mapping"),
+        Box::new(MemoryMapping::from_fd(&mem_ro, 0x1000).expect("failed to create memory mapping")),
         true,
         false,
     )