Merge pull request #93529 from xtruder/pkgs/cloud-hypervisor/init
cloud-hypervisor: init at 0.8.0
This commit is contained in:
commit
941f2eab00
3 changed files with 83 additions and 0 deletions
|
@ -0,0 +1,53 @@
|
||||||
|
diff --git a/Cargo.lock b/Cargo.lock
|
||||||
|
index e566ed25..a661a963 100644
|
||||||
|
--- a/Cargo.lock
|
||||||
|
+++ b/Cargo.lock
|
||||||
|
@@ -689,7 +689,7 @@ dependencies = [
|
||||||
|
"serde",
|
||||||
|
"serde_derive",
|
||||||
|
"serde_json",
|
||||||
|
- "vfio-bindings 0.2.0 (git+https://github.com/rust-vmm/vfio-bindings)",
|
||||||
|
+ "vfio-bindings",
|
||||||
|
"vfio-ioctls",
|
||||||
|
"vm-allocator",
|
||||||
|
"vm-device",
|
||||||
|
@@ -1346,17 +1346,12 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
|
||||||
|
[[package]]
|
||||||
|
name = "vfio-bindings"
|
||||||
|
version = "0.2.0"
|
||||||
|
-source = "git+https://github.com/rust-vmm/vfio-bindings#f08cbcbf4041c981441d9c036c49ebad5098ed1c"
|
||||||
|
+source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
+checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7"
|
||||||
|
dependencies = [
|
||||||
|
"vmm-sys-util",
|
||||||
|
]
|
||||||
|
|
||||||
|
-[[package]]
|
||||||
|
-name = "vfio-bindings"
|
||||||
|
-version = "0.2.0"
|
||||||
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
-checksum = "4a21f546f2bda37f5a8cfb138c87f95b8e34d2d78d6a7a92ba3785f4e08604a7"
|
||||||
|
-
|
||||||
|
[[package]]
|
||||||
|
name = "vfio-ioctls"
|
||||||
|
version = "0.1.0"
|
||||||
|
@@ -1366,7 +1361,7 @@ dependencies = [
|
||||||
|
"kvm-bindings",
|
||||||
|
"kvm-ioctls",
|
||||||
|
"log 0.4.8",
|
||||||
|
- "vfio-bindings 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
+ "vfio-bindings",
|
||||||
|
"vm-memory",
|
||||||
|
"vmm-sys-util",
|
||||||
|
]
|
||||||
|
diff --git a/pci/Cargo.toml b/pci/Cargo.toml
|
||||||
|
index 9c6955c7..4ecf8e6b 100644
|
||||||
|
--- a/pci/Cargo.toml
|
||||||
|
+++ b/pci/Cargo.toml
|
||||||
|
@@ -23,5 +23,5 @@ vm-memory = "0.2.1"
|
||||||
|
vm-migration = { path = "../vm-migration" }
|
||||||
|
|
||||||
|
[dependencies.vfio-bindings]
|
||||||
|
-git = "https://github.com/rust-vmm/vfio-bindings"
|
||||||
|
+version = "0.2.0"
|
||||||
|
features = ["fam-wrappers"]
|
|
@ -0,0 +1,28 @@
|
||||||
|
{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl }:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "cloud-hypervisor";
|
||||||
|
version = "0.8.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "cloud-hypervisor";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "h2aWWjycTm84TS89/vhqnAvwOqeeSDtvvCt+Is6I0eI=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
buildInputs = [ openssl ];
|
||||||
|
|
||||||
|
cargoPatches = [ ./cargo-lock-vendor-fix.patch ];
|
||||||
|
cargoSha256 = "fOIB+qVDqAAgQPW3bK2NfST24GzYJeRXgaMFXyNPcPQ=";
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
|
||||||
|
description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM";
|
||||||
|
changelog = "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/tag/v${version}";
|
||||||
|
license = with licenses; [ asl20 bsd3 ];
|
||||||
|
maintainers = with maintainers; [ offline ];
|
||||||
|
platforms = [ "x86_64-linux" ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -19359,6 +19359,8 @@ in
|
||||||
|
|
||||||
cloud-print-connector = callPackage ../servers/cloud-print-connector { };
|
cloud-print-connector = callPackage ../servers/cloud-print-connector { };
|
||||||
|
|
||||||
|
cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { };
|
||||||
|
|
||||||
clp = callPackage ../applications/science/math/clp { };
|
clp = callPackage ../applications/science/math/clp { };
|
||||||
|
|
||||||
cmatrix = callPackage ../applications/misc/cmatrix { };
|
cmatrix = callPackage ../applications/misc/cmatrix { };
|
||||||
|
|
Loading…
Reference in a new issue