dsg/vmsilo
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vm-switch: Switch back to upstream vhost

Browse source
This commit is contained in:
Davíð Steinn Geirsson 2026-02-07 21:45:26 +00:00
parent 502e699f5e
commit 8bb35bfc0f
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "vm-switch/depend/vhost"]
path = vm-switch/depend/vhost
url = file:///home/david/git/vhost

4
flake.nix
View file

@ -1,6 +1,5 @@
{
inputs = {
self.submodules = true;
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
wayland-proxy-virtwl = {
url = "git+https://git.dsg.is/davidlowsec/wayland-proxy-virtwl.git?submodules=1";
@ -58,6 +57,9 @@
src = ./vm-switch;
cargoLock = {
lockFile = ./vm-switch/Cargo.lock;
outputHashes = {
"vhost-0.15.0" = "sha256-Te1NTfPybY3++KrdLV8BD6rJmjvlX/oQAo8DC0mzZPA=";
};
};
};

2
vm-switch/Cargo.lock generated
View file

@ -783,6 +783,7 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
[[package]]
name = "vhost"
version = "0.15.0"
source = "git+https://github.com/rust-vmm/vhost?rev=93e2d9cf9151a5cbeef4fff1fdf26fdb989f060d#93e2d9cf9151a5cbeef4fff1fdf26fdb989f060d"
dependencies = [
"bitflags 2.10.0",
"libc",
@ -794,6 +795,7 @@ dependencies = [
[[package]]
name = "vhost-user-backend"
version = "0.21.0"
source = "git+https://github.com/rust-vmm/vhost?rev=93e2d9cf9151a5cbeef4fff1fdf26fdb989f060d#93e2d9cf9151a5cbeef4fff1fdf26fdb989f060d"
dependencies = [
"libc",
"log",

6
vm-switch/Cargo.toml
View file

@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"
[dependencies]
# Vhost crates from local submodule
vhost = { path = "depend/vhost/vhost", features = ["vhost-user-backend"] }
vhost-user-backend = { path = "depend/vhost/vhost-user-backend" }
# Vhost crates from git (pinned for virtio-queue compatibility)
vhost = { git = "https://github.com/rust-vmm/vhost", rev = "93e2d9cf9151a5cbeef4fff1fdf26fdb989f060d", features = ["vhost-user-backend"] }
vhost-user-backend = { git = "https://github.com/rust-vmm/vhost", rev = "93e2d9cf9151a5cbeef4fff1fdf26fdb989f060d" }
# Virtio dependencies (matching vhost workspace versions)
virtio-bindings = "0.2.6"

1
vm-switch/depend/vhost

@ -1 +0,0 @@
Subproject commit a1692d45e6fc64b98cc1724cf5d7cfe1b966819b