Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 27 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <mathieu.tarral@protonmail.com>"]
edition = "2018"
description = "Python bindings for libmicrovmi"
Expand Down
2 changes: 1 addition & 1 deletion python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion src/driver/xen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ impl Introspectable for Xen {
fn get_vcpu_count(&self) -> Result<u16, Box<dyn Error>> {
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())
Expand Down