External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Port to latest vmm-sys-util

Browse Source 
The signal handling for vCPU signals has changed in the latest release
so switch to the new API.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2019-12-11 13:02:07 +00:00
parent 4c92f89f0f
commit c61104df47
13 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Cargo.lock generated
View File

@ -188,7 +188,7 @@ dependencies = [
"vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
"vm-virtio 0.1.0", "vm-virtio 0.1.0",
"vmm 0.1.0", "vmm 0.1.0",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -234,7 +234,7 @@ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -333,7 +333,7 @@ name = "kvm-bindings"
version = "0.2.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -343,7 +343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"kvm-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvm-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -421,7 +421,7 @@ dependencies = [
name = "net_gen" name = "net_gen"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -435,7 +435,7 @@ dependencies = [
"rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -460,7 +460,7 @@ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"vm-allocator 0.1.0", "vm-allocator 0.1.0",
"vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -571,7 +571,7 @@ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"remain 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "remain 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -978,7 +978,7 @@ dependencies = [
"vm-allocator 0.1.0", "vm-allocator 0.1.0",
"vm-device 0.1.0", "vm-device 0.1.0",
"vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -997,7 +997,7 @@ dependencies = [
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1009,7 +1009,7 @@ dependencies = [
"vhost_rs 0.1.0", "vhost_rs 0.1.0",
"vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
"vm-virtio 0.1.0", "vm-virtio 0.1.0",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1073,7 +1073,7 @@ dependencies = [
"vm-allocator 0.1.0", "vm-allocator 0.1.0",
"vm-device 0.1.0", "vm-device 0.1.0",
"vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1102,7 +1102,7 @@ dependencies = [
"vm-allocator 0.1.0", "vm-allocator 0.1.0",
"vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)",
"vm-virtio 0.1.0", "vm-virtio 0.1.0",
"vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1115,7 +1115,7 @@ dependencies = [
[[package]] [[package]]
name = "vmm-sys-util" name = "vmm-sys-util"
version = "0.2.1" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1274,7 +1274,7 @@ dependencies = [
"checksum virtio-bindings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b" "checksum virtio-bindings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b"
"checksum vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)" = "<none>" "checksum vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)" = "<none>"
"checksum vmm-sys-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46996f56aeae31fbc0532ae57a944e00089302f03b18c10c76eebfd9249f4a6c" "checksum vmm-sys-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "46996f56aeae31fbc0532ae57a944e00089302f03b18c10c76eebfd9249f4a6c"
"checksum vmm-sys-util 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6ebb6ba7ba5653b69bfd3fab8c8c363945c0d3f616a6a1592e12122c3be4724e" "checksum vmm-sys-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f4588e216e77682850f4ae35ec855c2517f93d671a2578d2a32d20bf8a73de38"
"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" "checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"

2
Cargo.toml
View File

@ -20,7 +20,7 @@ virtio-bindings = "0.1.0"
vmm = { path = "vmm" } vmm = { path = "vmm" }
vm-device = { path = "vm-device" } vm-device = { path = "vm-device" }
vm-memory = { git = "https://github.com/rust-vmm/vm-memory" } vm-memory = { git = "https://github.com/rust-vmm/vm-memory" }
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"
vm-virtio = { path = "vm-virtio" } vm-virtio = { path = "vm-virtio" }
[dev-dependencies] [dev-dependencies]

2
devices/Cargo.toml
View File

@ -11,7 +11,7 @@ kvm-ioctls = "0.4.0"
libc = "0.2.60" libc = "0.2.60"
log = "0.4.8" log = "0.4.8"
vm-memory = { git = "https://github.com/rust-vmm/vm-memory" } vm-memory = { git = "https://github.com/rust-vmm/vm-memory" }
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"
[dev-dependencies] [dev-dependencies]
tempfile = "3.1.0" tempfile = "3.1.0"

2
net_gen/Cargo.toml
View File

@ -4,4 +4,4 @@ version = "0.1.0"
authors = ["The Chromium OS Authors"] authors = ["The Chromium OS Authors"]
[dependencies] [dependencies]
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"

2
net_util/Cargo.toml
View File

@ -7,7 +7,7 @@ authors = ["The Chromium OS Authors"]
libc = "0.2.60" libc = "0.2.60"
rand = "0.7.0" rand = "0.7.0"
serde = "1.0.98" serde = "1.0.98"
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"
net_gen = { path = "../net_gen" } net_gen = { path = "../net_gen" }

2
pci/Cargo.toml
View File

@ -11,4 +11,4 @@ devices = { path = "../devices" }
libc = "0.2.60" libc = "0.2.60"
log = "0.4.8" log = "0.4.8"
vm-memory = { git = "https://github.com/rust-vmm/vm-memory" } vm-memory = { git = "https://github.com/rust-vmm/vm-memory" }
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"

2
qcow/Cargo.toml
View File

@ -13,7 +13,7 @@ byteorder = "1.3.2"
libc = "0.2.60" libc = "0.2.60"
log = "0.4.8" log = "0.4.8"
remain = "0.1.3" remain = "0.1.3"
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"
[dev-dependencies] [dev-dependencies]
tempfile = "3.1.0" tempfile = "3.1.0"

2
vfio/Cargo.toml
View File

@ -14,7 +14,7 @@ pci = { path = "../pci" }
vfio-bindings = "0.1.0" vfio-bindings = "0.1.0"
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"
[dependencies.vm-memory] [dependencies.vm-memory]
git = "https://github.com/rust-vmm/vm-memory" git = "https://github.com/rust-vmm/vm-memory"

2
vhost_rs/Cargo.toml
View File

@ -15,7 +15,7 @@ vhost-user-slave = []
[dependencies] [dependencies]
bitflags = "1.1.0" bitflags = "1.1.0"
libc = "0.2.60" libc = "0.2.60"
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"
[dependencies.vm-memory] [dependencies.vm-memory]
git = "https://github.com/rust-vmm/vm-memory" git = "https://github.com/rust-vmm/vm-memory"

2
vhost_user_backend/Cargo.toml
View File

@ -14,7 +14,7 @@ epoll = ">=4.0.1"
libc = "0.2.66" libc = "0.2.66"
vm-memory = { git = "https://github.com/rust-vmm/vm-memory" } vm-memory = { git = "https://github.com/rust-vmm/vm-memory" }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"
[dependencies.vhost_rs] [dependencies.vhost_rs]
path = "../vhost_rs" path = "../vhost_rs"

2
vm-virtio/Cargo.toml
View File

@ -22,7 +22,7 @@ tempfile = "3.1.0"
virtio-bindings = { git = "https://github.com/rust-vmm/virtio-bindings", version = "0.1", features = ["virtio-v5_0_0"]} virtio-bindings = { git = "https://github.com/rust-vmm/virtio-bindings", version = "0.1", features = ["virtio-v5_0_0"]}
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"
[dependencies.vhost_rs] [dependencies.vhost_rs]
path = "../vhost_rs" path = "../vhost_rs"

2
vmm/Cargo.toml
View File

@ -31,7 +31,7 @@ serde_json = ">=1.0.9"
vfio = { path = "../vfio", optional = true } vfio = { path = "../vfio", optional = true }
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = ">=0.2.1" vmm-sys-util = ">=0.3.1"
signal-hook = "0.1.10" signal-hook = "0.1.10"
[dependencies.linux-loader] [dependencies.linux-loader]

19
vmm/src/cpu.rs
View File

@ -28,9 +28,7 @@ use kvm_ioctls::*;
use vm_memory::{Address, GuestAddress, GuestMemoryMmap}; use vm_memory::{Address, GuestAddress, GuestMemoryMmap};
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
use vmm_sys_util::signal::{register_signal_handler, validate_signal_num}; use vmm_sys_util::signal::{register_signal_handler, SIGRTMIN};
const VCPU_RTSIG_OFFSET: i32 = 0;
// Debug I/O port // Debug I/O port
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
@ -439,9 +437,8 @@ impl VcpuState {
fn signal_thread(&self) { fn signal_thread(&self) {
if let Some(handle) = self.handle.as_ref() { if let Some(handle) = self.handle.as_ref() {
let signum = validate_signal_num(VCPU_RTSIG_OFFSET, true).unwrap();
unsafe { unsafe {
libc::pthread_kill(handle.as_pthread_t(), signum); libc::pthread_kill(handle.as_pthread_t(), SIGRTMIN());
} }
} }
} }
@ -549,18 +546,10 @@ impl CpuManager {
thread::Builder::new() thread::Builder::new()
.name(format!("vcpu{}", vcpu.id)) .name(format!("vcpu{}", vcpu.id))
.spawn(move || { .spawn(move || {
unsafe { extern "C" fn handle_signal(_: i32, _: *mut siginfo_t, _: *mut c_void) {}
extern "C" fn handle_signal(_: i32, _: *mut siginfo_t, _: *mut c_void) {
}
// This uses an async signal safe handler to kill the vcpu handles. // This uses an async signal safe handler to kill the vcpu handles.
register_signal_handler( register_signal_handler(SIGRTMIN(), handle_signal)
VCPU_RTSIG_OFFSET,
vmm_sys_util::signal::SignalHandler::Siginfo(handle_signal),
true,
0,
)
.expect("Failed to register vcpu signal handler"); .expect("Failed to register vcpu signal handler");
}
vcpu.configure(entry_addr, &vm_memory, cpuid) vcpu.configure(entry_addr, &vm_memory, cpuid)
.expect("Failed to configure vCPU"); .expect("Failed to configure vCPU");