diff --git a/Cargo.lock b/Cargo.lock index 4bee5b72..d888e4cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -324,7 +324,7 @@ dependencies = [ "num-traits 0.2.19", "serde", "wasm-bindgen", - "windows-link", + "windows-link 0.1.0", ] [[package]] @@ -1023,6 +1023,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "libloading" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754ca22de805bb5744484a5b151a9e1a8e837d5dc232c2d7d8c2e3492edc8b60" +dependencies = [ + "cfg-if", + "windows-link 0.2.1", +] + [[package]] name = "libredox" version = "0.1.3" @@ -1051,9 +1061,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "memchr" @@ -1306,18 +1316,19 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" dependencies = [ "num_enum_derive", + "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2203,6 +2214,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-sys" version = "0.48.0" @@ -2374,11 +2391,11 @@ dependencies = [ [[package]] name = "xenctrl" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd4779a5676c5b1cd7eeef5010c3abe401c2704af3db6174b4df209af09a6b0" +checksum = "f3a182dfb8299ff24a1661e8dbd0cc7e570f48d7a12fdd903295e540dba9a7be" dependencies = [ - "libloading 0.8.6", + "libloading 0.9.0", "log", "num-traits 0.2.19", "num_enum", diff --git a/Cargo.toml b/Cargo.toml index 15695326..c19e1262 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ nix = "^0.23.0" enum-iterator = "0.7.0" thiserror = "1.0" libc = { version = "0.2.58", optional = true } -xenctrl = { version = "=0.7.0", optional = true } +xenctrl = { version = "=0.9.0", optional = true } xenstore-rs = { version = "=0.3.2", optional = true } xenforeignmemory = { version = "=0.3.0", optional = true } xenevtchn = { version = "=0.2.0", optional = true } diff --git a/python/Cargo.toml b/python/Cargo.toml index 5f83e594..ac19e2a7 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -2,7 +2,7 @@ name = "pymicrovmi" # note "pymicrovmi" is just a conflict free name for Cargo # the Python package is named "microvmi" (setup.py) -version = "0.2.15" +version = "0.2.16" authors = ["Mathieu Tarral "] edition = "2018" description = "Python bindings for libmicrovmi" diff --git a/python/Dockerfile b/python/Dockerfile index 00e8b0c2..8b668645 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -7,7 +7,7 @@ RUN yum -y install llvm-toolset-7.0-clang llvm-toolset-7.0-clang-devel # Note: the first sed disables a compiler flag that would be treated as an error # the second sed disabled the compilation of qemu, which is very long and also # had errors, and we don't need it anyway -RUN git clone -b RELEASE-4.17.0 --depth 1 https://github.com/xen-project/xen \ +RUN git clone -b RELEASE-4.18.0 --depth 1 https://github.com/xen-project/xen \ && cd xen \ && yum install -y flex ninja-build dev86 xz-devel python3-devel gettext-devel iasl \ ncurses-devel pixman-devel wget yajl-devel zlib-devel \ diff --git a/src/driver/xen.rs b/src/driver/xen.rs index d174826b..24eb8d1f 100644 --- a/src/driver/xen.rs +++ b/src/driver/xen.rs @@ -211,7 +211,7 @@ impl Introspectable for Xen { fn get_vcpu_count(&self) -> Result> { let domain_info = self .xc - .domain_getinfo(self.domid) + .domain_getinfolist(self.domid) .map_err(XenDriverError::from)? .ok_or("Domain info not found")?; Ok((domain_info.max_vcpu_id + 1).try_into().unwrap())