From 7062fdc132232992abfef716eebac5d979318b27 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 26 Sep 2023 10:18:59 +0300
Subject: chore(tvix/store): only depend on vhost-user-fs if virtiofs enabled

Change-Id: Iaf88d43df27b87548794a8dddc9a1e08279b8ffb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9471
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
---
 tvix/Cargo.nix        |  3 +--
 tvix/store/Cargo.toml | 17 +++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'tvix')

diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index f88f64291ae4..07be275e5681 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -8729,7 +8729,6 @@ rec {
             name = "fuse-backend-rs";
             packageId = "fuse-backend-rs";
             optional = true;
-            features = [ "vhost-user-fs" ];
           }
           {
             name = "futures";
@@ -8887,7 +8886,7 @@ rec {
           "fuse" = [ "fs" ];
           "reflection" = [ "tonic-reflection" ];
           "tonic-reflection" = [ "dep:tonic-reflection" ];
-          "virtiofs" = [ "fs" "dep:vhost" "dep:vhost-user-backend" "dep:virtio-queue" "dep:vm-memory" "dep:vmm-sys-util" "dep:virtio-bindings" ];
+          "virtiofs" = [ "fs" "dep:vhost" "dep:vhost-user-backend" "dep:virtio-queue" "dep:vm-memory" "dep:vmm-sys-util" "dep:virtio-bindings" "fuse-backend-rs?/vhost-user-fs" "fuse-backend-rs?/virtiofs" ];
         };
         resolvedDefaultFeatures = [ "default" "fs" "fuse" "reflection" "tonic-reflection" "virtiofs" ];
       };
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml
index 94be3e28638b..202bae1858c5 100644
--- a/tvix/store/Cargo.toml
+++ b/tvix/store/Cargo.toml
@@ -37,11 +37,6 @@ optional = true
 # TODO: Switch back to upstream version once https://github.com/cloud-hypervisor/fuse-backend-rs/pull/153 lands.
 git = "https://github.com/cloud-hypervisor/fuse-backend-rs"
 rev = "402e7c531bc75bc44ac366dc59477de8b5d4ca08"
-# Ideally this would only be enabled if virtiofs is enabled
-# Ex: virtiofs = [..., "fuse-backend-rs/?vhost-user-fs", ...]
-# However, crate2nix doesn't properly understand this syntax and doesn't
-# enable this feature properly.
-features = ["vhost-user-fs"]
 
 [dependencies.vhost]
 optional = true
@@ -87,6 +82,16 @@ tonic-mock = { git = "https://github.com/brainrake/tonic-mock", branch = "bump-d
 [features]
 default = ["fuse", "virtiofs", "reflection"]
 fs = ["dep:libc", "dep:fuse-backend-rs"]
-virtiofs = ["fs", "dep:vhost", "dep:vhost-user-backend", "dep:virtio-queue", "dep:vm-memory", "dep:vmm-sys-util", "dep:virtio-bindings"]
+virtiofs = [
+  "fs",
+  "dep:vhost",
+  "dep:vhost-user-backend",
+  "dep:virtio-queue",
+  "dep:vm-memory",
+  "dep:vmm-sys-util",
+  "dep:virtio-bindings",
+  "fuse-backend-rs?/vhost-user-fs", # impl FsCacheReqHandler for SlaveFsCacheReq
+  "fuse-backend-rs?/virtiofs",
+]
 fuse = ["fs"]
 reflection = ["tonic-reflection"]
-- 
cgit 1.4.1