kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm, tests: Make specifying a size optional for virtio-pmem

Browse Source 
If a size is specified use it (in particular this is required if the
destination is a directory) otherwise seek in the file to get the size
of the file.

Add a new check that the size is a multiple of 2MiB otherwise the kernel
will reject it.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2020-04-24 16:58:03 +01:00
parent 7481e4d959
commit 1df38daf74
4 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/integration.rs
View File

@@ -1987,15 +1987,20 @@ mod tests {
#[cfg_attr(not(feature = "mmio"), test)]
fn test_virtio_pmem_persist_writes() {
test_virtio_pmem(false)
test_virtio_pmem(false, false)
}
#[cfg_attr(not(feature = "mmio"), test)]
fn test_virtio_pmem_discard_writes() {
test_virtio_pmem(true)
test_virtio_pmem(true, false)
}
fn test_virtio_pmem(discard_writes: bool) {
#[cfg_attr(not(feature = "mmio"), test)]
fn test_virtio_pmem_with_size() {
test_virtio_pmem(true, true)
}
fn test_virtio_pmem(discard_writes: bool, specify_size: bool) {
test_block!(tb, "", {
let mut clear = ClearDiskConfig::new();
let guest = Guest::new(&mut clear);
@@ -2020,9 +2025,9 @@ mod tests {
.args(&[
"--pmem",
format!(
"file={},size={}{}",
"file={}{}{}",
pmem_temp_file.path().to_str().unwrap(),
"128M",
if specify_size { ",size=128M" } else { "" },
if discard_writes {
",discard_writes=on"
} else {
@@ -3836,7 +3841,7 @@ mod tests {
&api_socket,
"add-pmem",
Some(&format!(
"file={},size=128M,id=test0",
"file={},id=test0",
pmem_temp_file.path().to_str().unwrap()
))
)