build, misc: Bump vmm-sys-util dependency

The structure of the vmm-sys-util crate has changed with lots of code
moving to submodules.

This change adjusts the use of the imported structs to reference the
submodules.

Fixes: #145

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2019-08-02 15:23:52 +01:00
committed by Sebastien Boeuf
parent ac950d9a97
commit 9caad7394d
23 changed files with 35 additions and 32 deletions

View File

@@ -11,7 +11,7 @@
use super::Result;
use std::os::unix::io::RawFd;
use vmm_sys_util::EventFd;
use vmm_sys_util::eventfd::EventFd;
/// Maximum number of memory regions supported.
pub const VHOST_MAX_MEMORY_REGIONS: usize = 255;

View File

@@ -15,8 +15,8 @@ use std::os::unix::io::{AsRawFd, RawFd};
use std::ptr::null;
use vm_memory::{Address, GuestAddress, GuestMemory, GuestUsize};
use vmm_sys_util::eventfd::EventFd;
use vmm_sys_util::ioctl::{ioctl, ioctl_with_mut_ref, ioctl_with_ptr, ioctl_with_ref};
use vmm_sys_util::EventFd;
use super::{
Error, Result, VhostBackend, VhostUserMemoryRegionInfo, VringConfigData,

View File

@@ -8,7 +8,7 @@ use std::os::unix::io::{AsRawFd, RawFd};
use std::os::unix::net::UnixStream;
use std::sync::{Arc, Mutex};
use vmm_sys_util::EventFd;
use vmm_sys_util::eventfd::EventFd;
use super::connection::Endpoint;
use super::message::*;

View File

@@ -116,10 +116,10 @@ impl Error {
}
}
impl std::convert::From<vmm_sys_util::Error> for Error {
impl std::convert::From<vmm_sys_util::errno::Error> for Error {
/// Convert raw socket errors into meaningful vhost-user errors.
///
/// The vmm_sys_util::Error is a simple wrapper over the raw errno, which doesn't means much
/// The vmm_sys_util::errno::Error is a simple wrapper over the raw errno, which doesn't means much
/// to the vhost-user connection manager. So convert it into meaningful errors to simplify
/// the connection manager logic.
///
@@ -128,7 +128,7 @@ impl std::convert::From<vmm_sys_util::Error> for Error {
/// * - Error::SocketBroken: the underline socket is broken.
/// * - Error::SocketError: other socket related errors.
#[allow(unreachable_patterns)] // EWOULDBLOCK equals to EGAIN on linux
fn from(err: vmm_sys_util::Error) -> Self {
fn from(err: vmm_sys_util::errno::Error) -> Self {
match err.errno() {
// The socket is marked nonblocking and the requested operation would block.
libc::EAGAIN => Error::SocketRetry(IOError::from_raw_os_error(libc::EAGAIN)),

View File

@@ -16,7 +16,7 @@ use std::ptr::{copy_nonoverlapping, null_mut, write_unaligned};
use libc::{
c_long, c_void, cmsghdr, iovec, msghdr, recvmsg, sendmsg, MSG_NOSIGNAL, SCM_RIGHTS, SOL_SOCKET,
};
use vmm_sys_util::{Error, Result};
use vmm_sys_util::errno::{Error, Result};
// Each of the following macros performs the same function as their C counterparts. They are each
// macros because they are used to size statically allocated arrays.
@@ -335,7 +335,7 @@ mod tests {
use libc::cmsghdr;
use vmm_sys_util::EventFd;
use vmm_sys_util::eventfd::EventFd;
#[test]
fn buffer_len() {