External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-08-21 15:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

vhost_user_block: Use VirtioBlockConfig from vm-virtio

Browse Source 
Use the same definition of the struct as vm-virtio.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-05-20 15:25:14 +01:00 committed by Samuel Ortiz
parent 1fac263263
commit 9d88ba7afb
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vhost_user_block/src/lib.rs
View File

@ -21,13 +21,11 @@ use std::fs::File;
use std::fs::OpenOptions; use std::fs::OpenOptions;
use std::io::Read; use std::io::Read;
use std::io::{Seek, SeekFrom, Write}; use std::io::{Seek, SeekFrom, Write};
use std::mem;
use std::num::Wrapping; use std::num::Wrapping;
use std::ops::DerefMut; use std::ops::DerefMut;
use std::os::unix::fs::OpenOptionsExt; use std::os::unix::fs::OpenOptionsExt;
use std::path::PathBuf; use std::path::PathBuf;
use std::process; use std::process;
use std::slice;
use std::sync::{Arc, Mutex, RwLock}; use std::sync::{Arc, Mutex, RwLock};
use std::time::Instant; use std::time::Instant;
use std::vec::Vec; use std::vec::Vec;
@ -37,8 +35,10 @@ use vhost_rs::vhost_user::Listener;
use vhost_user_backend::{VhostUserBackend, VhostUserDaemon, Vring}; use vhost_user_backend::{VhostUserBackend, VhostUserDaemon, Vring};
use virtio_bindings::bindings::virtio_blk::*; use virtio_bindings::bindings::virtio_blk::*;
use virtio_bindings::bindings::virtio_ring::VIRTIO_RING_F_EVENT_IDX; use virtio_bindings::bindings::virtio_ring::VIRTIO_RING_F_EVENT_IDX;
use vm_memory::ByteValued;
use vm_memory::{Bytes, GuestMemoryMmap}; use vm_memory::{Bytes, GuestMemoryMmap};
use vm_virtio::block::{build_disk_image_id, Request}; use vm_virtio::block::{build_disk_image_id, Request};
use vm_virtio::VirtioBlockConfig;
use vmm::config::{OptionParser, OptionParserError, Toggle}; use vmm::config::{OptionParser, OptionParserError, Toggle};
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
@ -177,7 +177,7 @@ impl VhostUserBlkThread {
struct VhostUserBlkBackend { struct VhostUserBlkBackend {
threads: Vec<Mutex<VhostUserBlkThread>>, threads: Vec<Mutex<VhostUserBlkThread>>,
config: virtio_blk_config, config: VirtioBlockConfig,
rdonly: bool, rdonly: bool,
poll_queue: bool, poll_queue: bool,
queues_per_thread: Vec<u64>, queues_per_thread: Vec<u64>,
@ -212,7 +212,7 @@ impl VhostUserBlkBackend {
}; };
let nsectors = (image.lock().unwrap().seek(SeekFrom::End(0)).unwrap() as u64) / SECTOR_SIZE; let nsectors = (image.lock().unwrap().seek(SeekFrom::End(0)).unwrap() as u64) / SECTOR_SIZE;
let mut config = virtio_blk_config::default(); let mut config = VirtioBlockConfig::default();
config.capacity = nsectors; config.capacity = nsectors;
config.blk_size = BLK_SIZE; config.blk_size = BLK_SIZE;
@ -221,7 +221,7 @@ impl VhostUserBlkBackend {
config.min_io_size = 1; config.min_io_size = 1;
config.opt_io_size = 1; config.opt_io_size = 1;
config.num_queues = num_queues as u16; config.num_queues = num_queues as u16;
config.wce = 1; config.writeback = 1;
let mut queues_per_thread = Vec::new(); let mut queues_per_thread = Vec::new();
let mut threads = Vec::new(); let mut threads = Vec::new();
@ -342,15 +342,7 @@ impl VhostUserBackend for VhostUserBlkBackend {
} }
fn get_config(&self, _offset: u32, _size: u32) -> Vec<u8> { fn get_config(&self, _offset: u32, _size: u32) -> Vec<u8> {
// self.config is a statically allocated virtio_blk_config self.config.as_slice().to_vec()
let buf = unsafe {
slice::from_raw_parts(
&self.config as *const virtio_blk_config as *const _,
mem::size_of::<virtio_blk_config>(),
)
};
buf.to_vec()
} }
fn exit_event(&self, thread_index: usize) -> Option<(EventFd, Option<u16>)> { fn exit_event(&self, thread_index: usize) -> Option<(EventFd, Option<u16>)> {