Skip to content

Commit 76478da

Browse files
Serban Iorgabonzini
authored andcommitted
[mmap] remove dependency on tempfile
Signed-off-by: Serban Iorga <seriorga@amazon.com>
1 parent 17a17cb commit 76478da

File tree

1 file changed

+27
-29
lines changed

1 file changed

+27
-29
lines changed

src/mmap.rs

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,6 @@ impl Bytes<MemoryRegionAddress> for GuestRegionMmap {
234234
/// * Read bytes from /dev/urandom
235235
///
236236
/// ```
237-
/// # extern crate tempfile;
238-
/// # use self::tempfile::tempfile;
239237
/// # use vm_memory::{Address, Bytes, GuestAddress, GuestMemoryMmap};
240238
/// # use std::fs::File;
241239
/// # use std::path::Path;
@@ -273,13 +271,13 @@ impl Bytes<MemoryRegionAddress> for GuestRegionMmap {
273271
/// * Write 128 bytes to a temp file
274272
///
275273
/// ```
276-
/// # extern crate tempfile;
277-
/// # use self::tempfile::tempfile;
274+
/// # extern crate vmm_sys_util;
275+
/// # use vmm_sys_util::tempfile::TempFile;
278276
/// # use vm_memory::{Address, Bytes, GuestAddress, GuestMemoryMmap};
279277
/// # use std::fs::OpenOptions;
280278
/// # let start_addr = GuestAddress(0x1000);
281279
/// # let gm = GuestMemoryMmap::new(&vec![(start_addr, 0x400)]).unwrap();
282-
/// let mut file = tempfile().unwrap();
280+
/// let mut file = TempFile::new().unwrap().into_file();
283281
/// let mut mem = [0u8; 1024];
284282
/// gm.write_to(start_addr, &mut file, 128).unwrap();
285283
/// ```
@@ -305,13 +303,13 @@ impl Bytes<MemoryRegionAddress> for GuestRegionMmap {
305303
/// * Write 128 bytes to a temp file
306304
///
307305
/// ```
308-
/// # extern crate tempfile;
309-
/// # use self::tempfile::tempfile;
306+
/// # extern crate vmm_sys_util;
307+
/// # use vmm_sys_util::tempfile::TempFile;
310308
/// # use vm_memory::{Address, Bytes, GuestAddress, GuestMemoryMmap};
311309
/// # use std::fs::OpenOptions;
312310
/// # let start_addr = GuestAddress(0x1000);
313311
/// # let gm = GuestMemoryMmap::new(&vec![(start_addr, 0x400)]).unwrap();
314-
/// let mut file = tempfile().unwrap();
312+
/// let mut file = TempFile::new().unwrap().into_file();
315313
/// let mut mem = [0u8; 1024];
316314
/// gm.write_all_to(start_addr, &mut file, 128).unwrap();
317315
/// ```
@@ -499,14 +497,14 @@ impl GuestMemory for GuestMemoryMmap {
499497

500498
#[cfg(test)]
501499
mod tests {
502-
extern crate tempfile;
500+
extern crate vmm_sys_util;
503501

504502
use super::*;
505503

506-
use self::tempfile::tempfile;
507504
use std::fs::File;
508505
use std::mem;
509506
use std::path::Path;
507+
use vmm_sys_util::tempfile::TempFile;
510508

511509
use Bytes;
512510

@@ -585,7 +583,7 @@ mod tests {
585583
let regions: Vec<(GuestAddress, usize, Option<FileOffset>)> = regions_summary
586584
.iter()
587585
.map(|(region_addr, region_size)| {
588-
let f = tempfile().unwrap();
586+
let f = TempFile::new().unwrap().into_file();
589587
f.set_len(*region_size as u64).unwrap();
590588

591589
(*region_addr, *region_size, Some(FileOffset::new(f, 0)))
@@ -764,7 +762,7 @@ mod tests {
764762

765763
#[test]
766764
fn mapped_file_read() {
767-
let mut f = tempfile().unwrap();
765+
let mut f = TempFile::new().unwrap().into_file();
768766
let sample_buf = &[1, 2, 3, 4, 5];
769767
assert!(f.write_all(sample_buf).is_ok());
770768

@@ -779,9 +777,9 @@ mod tests {
779777

780778
#[test]
781779
fn test_address_in_range() {
782-
let f1 = tempfile().unwrap();
780+
let f1 = TempFile::new().unwrap().into_file();
783781
f1.set_len(0x400).unwrap();
784-
let f2 = tempfile().unwrap();
782+
let f2 = TempFile::new().unwrap().into_file();
785783
f2.set_len(0x400).unwrap();
786784

787785
let start_addr1 = GuestAddress(0x0);
@@ -805,9 +803,9 @@ mod tests {
805803

806804
#[test]
807805
fn test_check_address() {
808-
let f1 = tempfile().unwrap();
806+
let f1 = TempFile::new().unwrap().into_file();
809807
f1.set_len(0x400).unwrap();
810-
let f2 = tempfile().unwrap();
808+
let f2 = TempFile::new().unwrap().into_file();
811809
f2.set_len(0x400).unwrap();
812810

813811
let start_addr1 = GuestAddress(0x0);
@@ -837,9 +835,9 @@ mod tests {
837835

838836
#[test]
839837
fn test_to_region_addr() {
840-
let f1 = tempfile().unwrap();
838+
let f1 = TempFile::new().unwrap().into_file();;
841839
f1.set_len(0x400).unwrap();
842-
let f2 = tempfile().unwrap();
840+
let f2 = TempFile::new().unwrap().into_file();;
843841
f2.set_len(0x400).unwrap();
844842

845843
let start_addr1 = GuestAddress(0x0);
@@ -865,9 +863,9 @@ mod tests {
865863

866864
#[test]
867865
fn test_get_host_address() {
868-
let f1 = tempfile().unwrap();
866+
let f1 = TempFile::new().unwrap().into_file();
869867
f1.set_len(0x400).unwrap();
870-
let f2 = tempfile().unwrap();
868+
let f2 = TempFile::new().unwrap().into_file();
871869
f2.set_len(0x400).unwrap();
872870

873871
let start_addr1 = GuestAddress(0x0);
@@ -895,7 +893,7 @@ mod tests {
895893

896894
#[test]
897895
fn test_deref() {
898-
let f = tempfile().unwrap();
896+
let f = TempFile::new().unwrap().into_file();
899897
f.set_len(0x400).unwrap();
900898

901899
let start_addr = GuestAddress(0x0);
@@ -922,9 +920,9 @@ mod tests {
922920

923921
#[test]
924922
fn test_read_u64() {
925-
let f1 = tempfile().unwrap();
923+
let f1 = TempFile::new().unwrap().into_file();
926924
f1.set_len(0x1000).unwrap();
927-
let f2 = tempfile().unwrap();
925+
let f2 = TempFile::new().unwrap().into_file();
928926
f2.set_len(0x1000).unwrap();
929927

930928
let start_addr1 = GuestAddress(0x0);
@@ -968,7 +966,7 @@ mod tests {
968966

969967
#[test]
970968
fn write_and_read() {
971-
let f = tempfile().unwrap();
969+
let f = TempFile::new().unwrap().into_file();
972970
f.set_len(0x400).unwrap();
973971

974972
let mut start_addr = GuestAddress(0x1000);
@@ -997,7 +995,7 @@ mod tests {
997995

998996
#[test]
999997
fn read_to_and_write_from_mem() {
1000-
let f = tempfile().unwrap();
998+
let f = TempFile::new().unwrap().into_file();
1001999
f.set_len(0x400).unwrap();
10021000

10031001
let gm = GuestMemoryMmap::new(&[(GuestAddress(0x1000), 0x400)]).unwrap();
@@ -1069,9 +1067,9 @@ mod tests {
10691067

10701068
#[test]
10711069
fn test_access_cross_boundary() {
1072-
let f1 = tempfile().unwrap();
1070+
let f1 = TempFile::new().unwrap().into_file();
10731071
f1.set_len(0x1000).unwrap();
1074-
let f2 = tempfile().unwrap();
1072+
let f2 = TempFile::new().unwrap().into_file();
10751073
f2.set_len(0x1000).unwrap();
10761074

10771075
let start_addr1 = GuestAddress(0x0);
@@ -1095,7 +1093,7 @@ mod tests {
10951093

10961094
#[test]
10971095
fn test_retrieve_fd_backing_memory_region() {
1098-
let f = tempfile().unwrap();
1096+
let f = TempFile::new().unwrap().into_file();
10991097
f.set_len(0x400).unwrap();
11001098

11011099
let start_addr = GuestAddress(0x0);
@@ -1118,7 +1116,7 @@ mod tests {
11181116
#[test]
11191117
#[cfg(unix)]
11201118
fn test_retrieve_offset_from_fd_backing_memory_region() {
1121-
let f = tempfile().unwrap();
1119+
let f = TempFile::new().unwrap().into_file();
11221120
f.set_len(0x1400).unwrap();
11231121
// Needs to be aligned on 4k, otherwise mmap will fail.
11241122
let offset = 0x1000;

0 commit comments

Comments
 (0)