From 8bb35bfc0f49010a71f5c472427125e088bc4e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dav=C3=AD=C3=B0=20Steinn=20Geirsson?= <david@dsg.is>
Date: Sat, 7 Feb 2026 21:45:26 +0000
Subject: [PATCH] vm-switch: Switch back to upstream vhost

---
 .gitmodules            | 3 ---
 flake.nix              | 4 +++-
 vm-switch/Cargo.lock   | 2 ++
 vm-switch/Cargo.toml   | 6 +++---
 vm-switch/depend/vhost | 1 -
 5 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 160000 vm-switch/depend/vhost

diff --git a/.gitmodules b/.gitmodules
index a99ab1c..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "vm-switch/depend/vhost"]
-	path = vm-switch/depend/vhost
-	url = file:///home/david/git/vhost
diff --git a/flake.nix b/flake.nix
index 82b856e..6e57f35 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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=";
+            };
           };
         };
 
diff --git a/vm-switch/Cargo.lock b/vm-switch/Cargo.lock
index c1a8db9..d4f1877 100644
--- a/vm-switch/Cargo.lock
+++ b/vm-switch/Cargo.lock
@@ -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",
diff --git a/vm-switch/Cargo.toml b/vm-switch/Cargo.toml
index 37958fd..cfcdb98 100644
--- a/vm-switch/Cargo.toml
+++ b/vm-switch/Cargo.toml
@@ -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"
diff --git a/vm-switch/depend/vhost b/vm-switch/depend/vhost
deleted file mode 160000
index a1692d4..0000000
--- a/vm-switch/depend/vhost
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a1692d45e6fc64b98cc1724cf5d7cfe1b966819b