From 8b9ecac994740f93fd22e60458281c7c38924f6f Mon Sep 17 00:00:00 2001
From: buianhhuy96 <buianhhuy96@gmail.com>
Date: Fri, 20 Dec 2024 15:02:35 +0200
Subject: [PATCH] FMO-92: fmo-tool, add ability to passthrough with vendorid

- Allow passthrough device with exactly-matched vendorid and regex-matched productid
- Update fmo-tool version with vendorname in ddp, allow passthrough device with vendorname using fmo-tool option -vn
- Add default passthrough for device with vendorid "1050"

Signed-off-by: Anh Huy Bui <buianhhuy96@gmail.com>
---
 hardware/fmo-os-rugged-laptop-7330.nix          |  5 +++++
 hardware/fmo-os-rugged-tablet-7230.nix          |  5 +++++
 modules/custom-packages/fmo-tool/fmo-tool.nix   |  2 +-
 modules/custom-packages/vhotplug/vendorid.patch | 13 +++++++++++++
 modules/custom-packages/vhotplug/vhotplug.nix   |  2 ++
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 modules/custom-packages/vhotplug/vendorid.patch

diff --git a/hardware/fmo-os-rugged-laptop-7330.nix b/hardware/fmo-os-rugged-laptop-7330.nix
index 4aa1d64..d53b917 100644
--- a/hardware/fmo-os-rugged-laptop-7330.nix
+++ b/hardware/fmo-os-rugged-laptop-7330.nix
@@ -397,6 +397,11 @@
                   vendorid = "1546";
                   productid = "01a9";
                 }
+                {
+                  bus = "usb";
+                  vendorid = "1050";
+                  productid = ".*";
+                }
               ];
             }; # services.fmo-dynamic-device-passthrough
             fmo-dci = {
diff --git a/hardware/fmo-os-rugged-tablet-7230.nix b/hardware/fmo-os-rugged-tablet-7230.nix
index 2b3fe0d..cd51748 100644
--- a/hardware/fmo-os-rugged-tablet-7230.nix
+++ b/hardware/fmo-os-rugged-tablet-7230.nix
@@ -377,6 +377,11 @@
                   vendorid = "1546";
                   productid = "01a9";
                 }
+                {
+                  bus = "usb";
+                  vendorid = "1050";
+                  productid = ".*";
+                }
               ];
             }; # services.fmo-dynamic-device-passthrough
             fmo-dci = {
diff --git a/modules/custom-packages/fmo-tool/fmo-tool.nix b/modules/custom-packages/fmo-tool/fmo-tool.nix
index 77982fa..60edd7d 100644
--- a/modules/custom-packages/fmo-tool/fmo-tool.nix
+++ b/modules/custom-packages/fmo-tool/fmo-tool.nix
@@ -43,7 +43,7 @@ pkgs.python3Packages.buildPythonApplication {
 
   src = builtins.fetchGit {
     url = "git@github.com:tiiuae/fmo-tool.git";
-    rev = "4cdb772a104893ecf2d15333bad0f335040c3be9";
+    rev = "ed1ba0debd766a07efb14b59401d9ae8b2c5093e";
     ref = "refs/heads/main";
   };
 }
diff --git a/modules/custom-packages/vhotplug/vendorid.patch b/modules/custom-packages/vhotplug/vendorid.patch
new file mode 100644
index 0000000..fb24a03
--- /dev/null
+++ b/modules/custom-packages/vhotplug/vendorid.patch
@@ -0,0 +1,13 @@
+diff --git a/vhotplug/config.py b/vhotplug/config.py
+index 689d243..c1e7300 100644
+--- a/vhotplug/config.py
++++ b/vhotplug/config.py
+@@ -32,7 +32,7 @@ class Config:
+                     logger.debug(f"Rule {usb_description}")
+                     logger.debug(f"Checking {vid}:{pid} against {usb_vid}:{usb_pid}")
+                     vidMatch = usb_vid and vid.casefold() == usb_vid.casefold()
+-                    pidMatch = usb_pid and pid.casefold() == usb_pid.casefold()
++                    pidMatch = (usb_pid and pid.casefold() == usb_pid.casefold()) or re.match(usb_pid, pid, re.IGNORECASE)
+                     if vidMatch and pidMatch:
+                         logger.info(f"Found VM {vm_name} by vendor id / product id, description: {usb_description}")
+                         matches = True
diff --git a/modules/custom-packages/vhotplug/vhotplug.nix b/modules/custom-packages/vhotplug/vhotplug.nix
index ac34c1f..985dfd4 100644
--- a/modules/custom-packages/vhotplug/vhotplug.nix
+++ b/modules/custom-packages/vhotplug/vhotplug.nix
@@ -19,6 +19,8 @@ in
 
     doCheck = false;
 
+    patches = [ ./vendorid.patch ];
+
     src = fetchFromGitHub {
       owner = "tiiuae";
       repo = "vhotplug";