@@ -234,8 +234,6 @@ impl Bytes<MemoryRegionAddress> for GuestRegionMmap {
234
234
/// * Read bytes from /dev/urandom
235
235
///
236
236
/// ```
237
- /// # extern crate tempfile;
238
- /// # use self::tempfile::tempfile;
239
237
/// # use vm_memory::{Address, Bytes, GuestAddress, GuestMemoryMmap};
240
238
/// # use std::fs::File;
241
239
/// # use std::path::Path;
@@ -273,13 +271,13 @@ impl Bytes<MemoryRegionAddress> for GuestRegionMmap {
273
271
/// * Write 128 bytes to a temp file
274
272
///
275
273
/// ```
276
- /// # extern crate tempfile ;
277
- /// # use self ::tempfile::tempfile ;
274
+ /// # extern crate vmm_sys_util ;
275
+ /// # use vmm_sys_util ::tempfile::TempFile ;
278
276
/// # use vm_memory::{Address, Bytes, GuestAddress, GuestMemoryMmap};
279
277
/// # use std::fs::OpenOptions;
280
278
/// # let start_addr = GuestAddress(0x1000);
281
279
/// # let gm = GuestMemoryMmap::new(&vec![(start_addr, 0x400)]).unwrap();
282
- /// let mut file = tempfile ().unwrap();
280
+ /// let mut file = TempFile::new ().unwrap().into_file ();
283
281
/// let mut mem = [0u8; 1024];
284
282
/// gm.write_to(start_addr, &mut file, 128).unwrap();
285
283
/// ```
@@ -305,13 +303,13 @@ impl Bytes<MemoryRegionAddress> for GuestRegionMmap {
305
303
/// * Write 128 bytes to a temp file
306
304
///
307
305
/// ```
308
- /// # extern crate tempfile ;
309
- /// # use self ::tempfile::tempfile ;
306
+ /// # extern crate vmm_sys_util ;
307
+ /// # use vmm_sys_util ::tempfile::TempFile ;
310
308
/// # use vm_memory::{Address, Bytes, GuestAddress, GuestMemoryMmap};
311
309
/// # use std::fs::OpenOptions;
312
310
/// # let start_addr = GuestAddress(0x1000);
313
311
/// # let gm = GuestMemoryMmap::new(&vec![(start_addr, 0x400)]).unwrap();
314
- /// let mut file = tempfile ().unwrap();
312
+ /// let mut file = TempFile::new ().unwrap().into_file ();
315
313
/// let mut mem = [0u8; 1024];
316
314
/// gm.write_all_to(start_addr, &mut file, 128).unwrap();
317
315
/// ```
@@ -499,14 +497,14 @@ impl GuestMemory for GuestMemoryMmap {
499
497
500
498
#[ cfg( test) ]
501
499
mod tests {
502
- extern crate tempfile ;
500
+ extern crate vmm_sys_util ;
503
501
504
502
use super :: * ;
505
503
506
- use self :: tempfile:: tempfile;
507
504
use std:: fs:: File ;
508
505
use std:: mem;
509
506
use std:: path:: Path ;
507
+ use vmm_sys_util:: tempfile:: TempFile ;
510
508
511
509
use Bytes ;
512
510
@@ -585,7 +583,7 @@ mod tests {
585
583
let regions: Vec < ( GuestAddress , usize , Option < FileOffset > ) > = regions_summary
586
584
. iter ( )
587
585
. map ( |( region_addr, region_size) | {
588
- let f = tempfile ( ) . unwrap ( ) ;
586
+ let f = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
589
587
f. set_len ( * region_size as u64 ) . unwrap ( ) ;
590
588
591
589
( * region_addr, * region_size, Some ( FileOffset :: new ( f, 0 ) ) )
@@ -764,7 +762,7 @@ mod tests {
764
762
765
763
#[ test]
766
764
fn mapped_file_read ( ) {
767
- let mut f = tempfile ( ) . unwrap ( ) ;
765
+ let mut f = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
768
766
let sample_buf = & [ 1 , 2 , 3 , 4 , 5 ] ;
769
767
assert ! ( f. write_all( sample_buf) . is_ok( ) ) ;
770
768
@@ -779,9 +777,9 @@ mod tests {
779
777
780
778
#[ test]
781
779
fn test_address_in_range ( ) {
782
- let f1 = tempfile ( ) . unwrap ( ) ;
780
+ let f1 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
783
781
f1. set_len ( 0x400 ) . unwrap ( ) ;
784
- let f2 = tempfile ( ) . unwrap ( ) ;
782
+ let f2 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
785
783
f2. set_len ( 0x400 ) . unwrap ( ) ;
786
784
787
785
let start_addr1 = GuestAddress ( 0x0 ) ;
@@ -805,9 +803,9 @@ mod tests {
805
803
806
804
#[ test]
807
805
fn test_check_address ( ) {
808
- let f1 = tempfile ( ) . unwrap ( ) ;
806
+ let f1 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
809
807
f1. set_len ( 0x400 ) . unwrap ( ) ;
810
- let f2 = tempfile ( ) . unwrap ( ) ;
808
+ let f2 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
811
809
f2. set_len ( 0x400 ) . unwrap ( ) ;
812
810
813
811
let start_addr1 = GuestAddress ( 0x0 ) ;
@@ -837,9 +835,9 @@ mod tests {
837
835
838
836
#[ test]
839
837
fn test_to_region_addr ( ) {
840
- let f1 = tempfile ( ) . unwrap ( ) ;
838
+ let f1 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ; ;
841
839
f1. set_len ( 0x400 ) . unwrap ( ) ;
842
- let f2 = tempfile ( ) . unwrap ( ) ;
840
+ let f2 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ; ;
843
841
f2. set_len ( 0x400 ) . unwrap ( ) ;
844
842
845
843
let start_addr1 = GuestAddress ( 0x0 ) ;
@@ -865,9 +863,9 @@ mod tests {
865
863
866
864
#[ test]
867
865
fn test_get_host_address ( ) {
868
- let f1 = tempfile ( ) . unwrap ( ) ;
866
+ let f1 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
869
867
f1. set_len ( 0x400 ) . unwrap ( ) ;
870
- let f2 = tempfile ( ) . unwrap ( ) ;
868
+ let f2 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
871
869
f2. set_len ( 0x400 ) . unwrap ( ) ;
872
870
873
871
let start_addr1 = GuestAddress ( 0x0 ) ;
@@ -895,7 +893,7 @@ mod tests {
895
893
896
894
#[ test]
897
895
fn test_deref ( ) {
898
- let f = tempfile ( ) . unwrap ( ) ;
896
+ let f = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
899
897
f. set_len ( 0x400 ) . unwrap ( ) ;
900
898
901
899
let start_addr = GuestAddress ( 0x0 ) ;
@@ -922,9 +920,9 @@ mod tests {
922
920
923
921
#[ test]
924
922
fn test_read_u64 ( ) {
925
- let f1 = tempfile ( ) . unwrap ( ) ;
923
+ let f1 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
926
924
f1. set_len ( 0x1000 ) . unwrap ( ) ;
927
- let f2 = tempfile ( ) . unwrap ( ) ;
925
+ let f2 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
928
926
f2. set_len ( 0x1000 ) . unwrap ( ) ;
929
927
930
928
let start_addr1 = GuestAddress ( 0x0 ) ;
@@ -968,7 +966,7 @@ mod tests {
968
966
969
967
#[ test]
970
968
fn write_and_read ( ) {
971
- let f = tempfile ( ) . unwrap ( ) ;
969
+ let f = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
972
970
f. set_len ( 0x400 ) . unwrap ( ) ;
973
971
974
972
let mut start_addr = GuestAddress ( 0x1000 ) ;
@@ -997,7 +995,7 @@ mod tests {
997
995
998
996
#[ test]
999
997
fn read_to_and_write_from_mem ( ) {
1000
- let f = tempfile ( ) . unwrap ( ) ;
998
+ let f = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
1001
999
f. set_len ( 0x400 ) . unwrap ( ) ;
1002
1000
1003
1001
let gm = GuestMemoryMmap :: new ( & [ ( GuestAddress ( 0x1000 ) , 0x400 ) ] ) . unwrap ( ) ;
@@ -1069,9 +1067,9 @@ mod tests {
1069
1067
1070
1068
#[ test]
1071
1069
fn test_access_cross_boundary ( ) {
1072
- let f1 = tempfile ( ) . unwrap ( ) ;
1070
+ let f1 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
1073
1071
f1. set_len ( 0x1000 ) . unwrap ( ) ;
1074
- let f2 = tempfile ( ) . unwrap ( ) ;
1072
+ let f2 = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
1075
1073
f2. set_len ( 0x1000 ) . unwrap ( ) ;
1076
1074
1077
1075
let start_addr1 = GuestAddress ( 0x0 ) ;
@@ -1095,7 +1093,7 @@ mod tests {
1095
1093
1096
1094
#[ test]
1097
1095
fn test_retrieve_fd_backing_memory_region ( ) {
1098
- let f = tempfile ( ) . unwrap ( ) ;
1096
+ let f = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
1099
1097
f. set_len ( 0x400 ) . unwrap ( ) ;
1100
1098
1101
1099
let start_addr = GuestAddress ( 0x0 ) ;
@@ -1118,7 +1116,7 @@ mod tests {
1118
1116
#[ test]
1119
1117
#[ cfg( unix) ]
1120
1118
fn test_retrieve_offset_from_fd_backing_memory_region ( ) {
1121
- let f = tempfile ( ) . unwrap ( ) ;
1119
+ let f = TempFile :: new ( ) . unwrap ( ) . into_file ( ) ;
1122
1120
f. set_len ( 0x1400 ) . unwrap ( ) ;
1123
1121
// Needs to be aligned on 4k, otherwise mmap will fail.
1124
1122
let offset = 0x1000 ;
0 commit comments