Merge remote-tracking branch 'origin/master' into master

2 files changed, 8 insertions, 0 deletions

diff --git a/sys_util/src/guest_memory.rs b/sys_util/src/guest_memory.rs
index 6399f8c..2390b92 100644
--- a/sys_util/src/guest_memory.rs
+++ b/sys_util/src/guest_memory.rs
@@ -4,6 +4,7 @@
 
 //! Track memory regions that are mapped to the guest VM.
 
+use std::convert::AsRef;
 use std::convert::TryFrom;
 use std::fmt::{self, Display};
 use std::os::unix::io::{AsRawFd, RawFd};
@@ -107,6 +108,12 @@ impl AsRawFd for GuestMemory {
     }
 }
 
+impl AsRef<SharedMemory> for GuestMemory {
+    fn as_ref(&self) -> &SharedMemory {
+        &self.memfd
+    }
+}
+
 impl GuestMemory {
     /// Creates backing memfd for GuestMemory regions
     fn create_memfd(ranges: &[(GuestAddress, u64)]) -> Result<SharedMemory> {
diff --git a/sys_util/src/syslog.rs b/sys_util/src/syslog.rs
index 82b7137..232f046 100644
--- a/sys_util/src/syslog.rs
+++ b/sys_util/src/syslog.rs
@@ -610,6 +610,7 @@ mod tests {
             shm_unlink(shm_name.as_ptr());
             let fd = shm_open(shm_name.as_ptr(), O_RDWR | O_CREAT | O_EXCL, 0666);
             assert!(fd >= 0, "error creating shared memory;");
+            shm_unlink(shm_name.as_ptr());
             File::from_raw_fd(fd)
         };