From 0497a7c311964157f5c43554a4c91afa39515afc Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Mon, 22 Feb 2021 11:37:20 +0000
Subject: [PATCH] qcow: Use vmm_sys_util::tempfile::Tempfile

This removes the requirement for an extra crate.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 Cargo.lock       |  1 -
 qcow/Cargo.toml  |  3 ---
 qcow/src/qcow.rs | 10 +++++-----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a34dbf942..fa8a59723 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -911,7 +911,6 @@ dependencies = [
  "libc",
  "log 0.4.14",
  "remain",
- "tempfile",
  "vmm-sys-util",
 ]
 
diff --git a/qcow/Cargo.toml b/qcow/Cargo.toml
index df4b5db48..00598a8eb 100644
--- a/qcow/Cargo.toml
+++ b/qcow/Cargo.toml
@@ -14,6 +14,3 @@ libc = "0.2.86"
 log = "0.4.14"
 remain = "0.2.2"
 vmm-sys-util = ">=0.3.1"
-
-[dev-dependencies]
-tempfile = "3.2.0"
diff --git a/qcow/src/qcow.rs b/qcow/src/qcow.rs
index 843fe78d5..8e4ab20a4 100644
--- a/qcow/src/qcow.rs
+++ b/qcow/src/qcow.rs
@@ -1704,7 +1704,7 @@ pub fn detect_image_type(file: &mut RawFile) -> Result<ImageType> {
 mod tests {
     use super::*;
     use std::io::{Read, Seek, SeekFrom, Write};
-    use tempfile::tempfile;
+    use vmm_sys_util::tempfile::TempFile;
 
     fn valid_header_v3() -> Vec<u8> {
         vec![
@@ -1775,7 +1775,7 @@ mod tests {
     where
         F: FnMut(RawFile),
     {
-        let mut disk_file: RawFile = RawFile::new(tempfile().unwrap(), false);
+        let mut disk_file: RawFile = RawFile::new(TempFile::new().unwrap().into_file(), false);
         disk_file.write_all(&header).unwrap();
         disk_file.set_len(0x1_0000_0000).unwrap();
         disk_file.seek(SeekFrom::Start(0)).unwrap();
@@ -1787,7 +1787,7 @@ mod tests {
     where
         F: FnMut(QcowFile),
     {
-        let tmp: RawFile = RawFile::new(tempfile().unwrap(), direct);
+        let tmp: RawFile = RawFile::new(TempFile::new().unwrap().into_file(), direct);
         let qcow_file = QcowFile::new(tmp, 3, file_size).unwrap();
 
         testfn(qcow_file); // File closed when the function exits.
@@ -1796,7 +1796,7 @@ mod tests {
     #[test]
     fn default_header_v2() {
         let header = QcowHeader::create_for_size(2, 0x10_0000);
-        let mut disk_file: RawFile = RawFile::new(tempfile().unwrap(), false);
+        let mut disk_file: RawFile = RawFile::new(TempFile::new().unwrap().into_file(), false);
         header
             .write_to(&mut disk_file)
             .expect("Failed to write header to temporary file.");
@@ -1807,7 +1807,7 @@ mod tests {
     #[test]
     fn default_header_v3() {
         let header = QcowHeader::create_for_size(3, 0x10_0000);
-        let mut disk_file: RawFile = RawFile::new(tempfile().unwrap(), false);
+        let mut disk_file: RawFile = RawFile::new(TempFile::new().unwrap().into_file(), false);
         header
             .write_to(&mut disk_file)
             .expect("Failed to write header to temporary file.");