mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-02 19:45:46 +00:00
qcow: Use vmm_sys_util::tempfile::Tempfile
This removes the requirement for an extra crate. Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
05a2b3fac2
commit
0497a7c311
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -911,7 +911,6 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"log 0.4.14",
|
"log 0.4.14",
|
||||||
"remain",
|
"remain",
|
||||||
"tempfile",
|
|
||||||
"vmm-sys-util",
|
"vmm-sys-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -14,6 +14,3 @@ libc = "0.2.86"
|
|||||||
log = "0.4.14"
|
log = "0.4.14"
|
||||||
remain = "0.2.2"
|
remain = "0.2.2"
|
||||||
vmm-sys-util = ">=0.3.1"
|
vmm-sys-util = ">=0.3.1"
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
tempfile = "3.2.0"
|
|
||||||
|
@ -1704,7 +1704,7 @@ pub fn detect_image_type(file: &mut RawFile) -> Result<ImageType> {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use std::io::{Read, Seek, SeekFrom, Write};
|
use std::io::{Read, Seek, SeekFrom, Write};
|
||||||
use tempfile::tempfile;
|
use vmm_sys_util::tempfile::TempFile;
|
||||||
|
|
||||||
fn valid_header_v3() -> Vec<u8> {
|
fn valid_header_v3() -> Vec<u8> {
|
||||||
vec![
|
vec![
|
||||||
@ -1775,7 +1775,7 @@ mod tests {
|
|||||||
where
|
where
|
||||||
F: FnMut(RawFile),
|
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.write_all(&header).unwrap();
|
||||||
disk_file.set_len(0x1_0000_0000).unwrap();
|
disk_file.set_len(0x1_0000_0000).unwrap();
|
||||||
disk_file.seek(SeekFrom::Start(0)).unwrap();
|
disk_file.seek(SeekFrom::Start(0)).unwrap();
|
||||||
@ -1787,7 +1787,7 @@ mod tests {
|
|||||||
where
|
where
|
||||||
F: FnMut(QcowFile),
|
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();
|
let qcow_file = QcowFile::new(tmp, 3, file_size).unwrap();
|
||||||
|
|
||||||
testfn(qcow_file); // File closed when the function exits.
|
testfn(qcow_file); // File closed when the function exits.
|
||||||
@ -1796,7 +1796,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn default_header_v2() {
|
fn default_header_v2() {
|
||||||
let header = QcowHeader::create_for_size(2, 0x10_0000);
|
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
|
header
|
||||||
.write_to(&mut disk_file)
|
.write_to(&mut disk_file)
|
||||||
.expect("Failed to write header to temporary file.");
|
.expect("Failed to write header to temporary file.");
|
||||||
@ -1807,7 +1807,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn default_header_v3() {
|
fn default_header_v3() {
|
||||||
let header = QcowHeader::create_for_size(3, 0x10_0000);
|
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
|
header
|
||||||
.write_to(&mut disk_file)
|
.write_to(&mut disk_file)
|
||||||
.expect("Failed to write header to temporary file.");
|
.expect("Failed to write header to temporary file.");
|
||||||
|
Loading…
Reference in New Issue
Block a user