External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-22 04:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "vmm: api: Modify FsConfig to be OpenAPI friendly"

Browse Source 
This reverts commit defc5dcd9cf883178d958ec3260fb886e700d5e1.
This commit is contained in:
Sebastien Boeuf 2019-12-06 18:22:16 -08:00 committed by Rob Bradford
parent 9b1ba14f2d
commit aa94e9b8f3
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmm/src/api/openapi/cloud-hypervisor.yaml
View File

@ -321,13 +321,9 @@ components:
type: integer
queue_size:
type: integer
dax:
type: boolean
default: true
cache_size:
type: integer
format: int64
default: 8589934592
PmemConfig:
required:

10
vmm/src/config.rs
View File

@ -409,8 +409,7 @@ pub struct FsConfig {
pub sock: PathBuf,
pub num_queues: usize,
pub queue_size: u16,
pub dax: bool,
pub cache_size: u64,
pub cache_size: Option<u64>,
}
impl FsConfig {
@ -445,7 +444,7 @@ impl FsConfig {
let mut queue_size: u16 = 1024;
let mut dax: bool = true;
// Default cache size set to 8Gib.
let mut cache_size: u64 = 0x0002_0000_0000;
let mut cache_size: Option<u64> = Some(0x0002_0000_0000);
if tag.is_empty() {
return Err(Error::ParseFsTagParam);
@ -477,9 +476,9 @@ impl FsConfig {
if !cache_size_str.is_empty() {
return Err(Error::InvalidCacheSizeWithDaxOff);
}
cache_size = 0;
cache_size = None;
} else if !cache_size_str.is_empty() {
cache_size = parse_size(cache_size_str)?;
cache_size = Some(parse_size(cache_size_str)?);
}
Ok(FsConfig {
@ -487,7 +486,6 @@ impl FsConfig {
sock: PathBuf::from(sock),
num_queues,
queue_size,
dax,
cache_size,
})
}

13
vmm/src/device_manager.rs
View File

@ -974,8 +974,8 @@ impl DeviceManager {
if let Some(fs_list_cfg) = &vm_info.vm_cfg.lock().unwrap().fs {
for fs_cfg in fs_list_cfg.iter() {
if let Some(fs_sock) = fs_cfg.sock.to_str() {
let cache: Option<(VirtioSharedMemoryList, u64)> = if fs_cfg.dax {
let fs_cache = fs_cfg.cache_size;
let mut cache: Option<(VirtioSharedMemoryList, u64)> = None;
if let Some(fs_cache) = fs_cfg.cache_size {
// The memory needs to be 2MiB aligned in order to support
// hugepages.
let fs_guest_addr = allocator
@ -1020,18 +1020,15 @@ impl DeviceManager {
offset: 0,
len: fs_cache,
});
Some((
cache = Some((
VirtioSharedMemoryList {
addr: fs_guest_addr,
len: fs_cache as GuestUsize,
region_list,
},
addr as u64,
))
} else {
None
};
));
}
let virtio_fs_device = vm_virtio::vhost_user::Fs::new(
fs_sock,