⛄ Sync 2026-07-31 00:04:03

This commit is contained in:
github-actions[bot] committed 2026-07-31 00:04:03 +08:00
1 parent 0c75f44d08
commit 57bd5de698
13 files changed
+164 -95

No files matched your search

+2 -2
View File
@@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-go PKG_NAME:=ddns-go
PKG_VERSION:=6.17.3 PKG_VERSION:=6.17.4
PKG_RELEASE:=20 PKG_RELEASE:=21
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/jeessy2/ddns-go/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/jeessy2/ddns-go/tar.gz/v$(PKG_VERSION)?
+1 -1
View File
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-daede PKG_NAME:=luci-app-daede
PKG_VERSION:=1.14.7 PKG_VERSION:=1.14.7
PKG_RELEASE:=35 PKG_RELEASE:=36
PKG_MAINTAINER:=kenzok8 PKG_MAINTAINER:=kenzok8
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
@@ -15,6 +15,7 @@ const RE_PLACEHOLDER_URL = /(['"])(?:(?:https?|https-file|file):\/\/[^'"]*?(?:ex
const DEFAULT_TEMPLATE = const DEFAULT_TEMPLATE =
'# luci-app-daede 默认配置:把 subscription 里的占位链接换成你的机场订阅,保存即可运行。\n' + '# luci-app-daede 默认配置:把 subscription 里的占位链接换成你的机场订阅,保存即可运行。\n' +
'global {\n' + 'global {\n' +
' # 端口与网卡:lan_interface 填内网桥(通常 br-lan),wan_interface 保持 auto 即可。\n' +
' tproxy_port: 12345\n' + ' tproxy_port: 12345\n' +
' tproxy_port_protect: true\n' + ' tproxy_port_protect: true\n' +
' so_mark_from_dae: 0\n' + ' so_mark_from_dae: 0\n' +
@@ -35,6 +36,7 @@ const DEFAULT_TEMPLATE =
'}\n' + '}\n' +
'\n' + '\n' +
'dns {\n' + 'dns {\n' +
' # 国内域名走 cndns 解析,其余走 fallbackdns,避免 DNS 污染。\n' +
' ipversion_prefer: 4\n' + ' ipversion_prefer: 4\n' +
' response_ttl: 0\n' + ' response_ttl: 0\n' +
' upstream {\n' + ' upstream {\n' +
@@ -50,6 +52,7 @@ const DEFAULT_TEMPLATE =
'}\n' + '}\n' +
'\n' + '\n' +
'group {\n' + 'group {\n' +
' # 节点分组:filter 决定用订阅里的哪些节点,policy 决定怎么选(min_moving_avg = 自动挑最快)。\n' +
' proxy {\n' + ' proxy {\n' +
' filter: subtag(my_airport)\n' + ' filter: subtag(my_airport)\n' +
' policy: min_moving_avg\n' + ' policy: min_moving_avg\n' +
@@ -57,6 +60,8 @@ const DEFAULT_TEMPLATE =
'}\n' + '}\n' +
'\n' + '\n' +
'routing {\n' + 'routing {\n' +
' # 分流规则:从上往下匹配,命中即停,最后由 fallback 兜底。\n' +
' # 想让某个网站直连,在 fallback 之前加一行,例如:domain(example.com) -> direct\n' +
' pname(NetworkManager) -> direct\n' + ' pname(NetworkManager) -> direct\n' +
' dip(224.0.0.0/3) -> direct\n' + ' dip(224.0.0.0/3) -> direct\n' +
' dip(255.255.255.255/32) -> direct\n' + ' dip(255.255.255.255/32) -> direct\n' +
@@ -577,8 +582,12 @@ function renderDaeEditor() {
function syncHL() { function syncHL() {
hlCode.innerHTML = highlightDae(textarea.value) + '\n'; hlCode.innerHTML = highlightDae(textarea.value) + '\n';
hlPre.scrollTop = textarea.scrollTop; hlPre.scrollTop = textarea.scrollTop;
hlPre.scrollLeft = textarea.scrollLeft;
} }
textarea.addEventListener('scroll', function() { hlPre.scrollTop = textarea.scrollTop; }); textarea.addEventListener('scroll', function() {
hlPre.scrollTop = textarea.scrollTop;
hlPre.scrollLeft = textarea.scrollLeft;
});
const save = E('button', { 'class': 'cbi-button cbi-button-positive' }, _('Save manual config')); const save = E('button', { 'class': 'cbi-button cbi-button-positive' }, _('Save manual config'));
const init = E('button', { 'class': 'cbi-button cbi-button-action' }, _('Load default config')); const init = E('button', { 'class': 'cbi-button cbi-button-action' }, _('Load default config'));
const status = E('span', { 'class': 'dd-editor-status' }, ''); const status = E('span', { 'class': 'dd-editor-status' }, '');
@@ -116,6 +116,7 @@ const CSS = [
/* keep selected text transparent too — else the browser force-colors it and /* keep selected text transparent too — else the browser force-colors it and
it ghosts over the highlight pre underneath */ it ghosts over the highlight pre underneath */
'.dd-edit-wrap .dd-editor-hl::selection{background:rgba(56,134,161,.25);color:transparent}', '.dd-edit-wrap .dd-editor-hl::selection{background:rgba(56,134,161,.25);color:transparent}',
'@media screen and (max-device-width:600px){.dd-edit-wrap .dd-editor,.dd-edit-wrap .dd-hl,.dd-edit-wrap .dd-hl code{font-size:16px}}',
'.dh-c{color:#8a919a;font-style:italic}', '.dh-c{color:#8a919a;font-style:italic}',
'.dh-s{color:#2a8a4a}', '.dh-s{color:#2a8a4a}',
'.dh-k{color:#9a3fb5;font-weight:600}', '.dh-k{color:#9a3fb5;font-weight:600}',
@@ -28,6 +28,34 @@ esac
LOCK="/tmp/luci-app-daede.${TYPE}.lock" LOCK="/tmp/luci-app-daede.${TYPE}.lock"
LOG="/tmp/luci-app-daede.${TYPE}.log" LOG="/tmp/luci-app-daede.${TYPE}.log"
RLOCK="/tmp/luci-app-daede.geo-reload.lock"
schedule_backend_reload() {
if [ -d "$RLOCK" ]; then
rmt=$(date -r "$RLOCK" +%s 2>/dev/null || echo 0)
[ $(( $(date +%s) - rmt )) -gt 300 ] && rmdir "$RLOCK" 2>/dev/null
fi
mkdir "$RLOCK" 2>/dev/null || return 0
(
sleep 25
ab="$(uci -q get daede.config.active_backend 2>/dev/null || echo daed)"
if [ "$ab" = dae ]; then
bin=dae; act=hot_reload
else
bin=daed; act=reload
fi
if /bin/pidof "$bin" >/dev/null 2>&1; then
if "/etc/init.d/$bin" "$act" >/dev/null 2>&1; then
echo "$(date '+%F %T') reloaded $bin"
else
echo "$(date '+%F %T') $bin reload failed"
fi
else
echo "$(date '+%F %T') $bin not running; skip reload"
fi
rmdir "$RLOCK" 2>/dev/null
) </dev/null >>"$LOG" 2>&1 &
}
if [ -f "$LOCK" ]; then if [ -f "$LOCK" ]; then
# Lock is fresh (< 5 min)? Refuse. Stale? Remove and proceed. # Lock is fresh (< 5 min)? Refuse. Stale? Remove and proceed.
@@ -73,6 +101,7 @@ fi
else else
mv "$TMP" "$DEST" mv "$TMP" "$DEST"
echo "$(date '+%F %T') updated $DEST ($size bytes)" echo "$(date '+%F %T') updated $DEST ($size bytes)"
schedule_backend_reload
fi fi
fi fi
if [ "$rc" = 0 ]; then echo "$(date '+%F %T') ✓ 完成"; else echo "$(date '+%F %T') ✗ 失败 (rc=$rc)"; fi if [ "$rc" = 0 ]; then echo "$(date '+%F %T') ✓ 完成"; else echo "$(date '+%F %T') ✗ 失败 (rc=$rc)"; fi
+1 -1
View File
@@ -4,7 +4,7 @@ LUCI_TITLE:=Web UI for QEMU Virtual Machine Simple (VMS)
LUCI_DEPENDS:=@TARGET_x86_64 +qemu-vms +ttyd +usbutils +pciutils LUCI_DEPENDS:=@TARGET_x86_64 +qemu-vms +ttyd +usbutils +pciutils
PKG_LICENSE:=GPLv3 PKG_LICENSE:=GPLv3
PKG_VERSION:=0.0.1 PKG_VERSION:=0.0.1
PKG_RELEASE:=6 PKG_RELEASE:=7
include $(TOPDIR)/feeds/luci/luci.mk include $(TOPDIR)/feeds/luci/luci.mk
@@ -73,7 +73,7 @@ return view.extend({
}); });
var bridge = s.option(form.Value, 'bridge', _('Bridge (optional)')); var bridge = s.option(form.Value, 'bridge', _('Bridge (optional)'));
bridge.value('', _('leave empty')); bridge.value('', _('not assign'));
bridgeList.forEach(function(name) { bridgeList.forEach(function(name) {
bridge.value(name, name); bridge.value(name, name);
}); });
@@ -34,16 +34,17 @@ return view.extend({
return found; return found;
}, },
pciOwner: function(addr) { pciOwners: function(addr) {
var section = this.findPciSection(addr); var section = this.findPciSection(addr);
if (!section) if (!section)
return null; return [];
var owner = null; var owners = [];
uci.sections('qemu-vms', 'vm').forEach(function(vm) { uci.sections('qemu-vms', 'vm').forEach(function(vm) {
if (vm.pci_passthrough === section) var list = [].concat(vm.pci_passthrough || []);
owner = vm['.name']; if (list.indexOf(section) !== -1)
owners.push(vm['.name']);
}); });
return owner; return owners;
}, },
// --- USB helpers --- // --- USB helpers ---
@@ -70,6 +71,22 @@ return view.extend({
return owners; return owners;
}, },
cleanupVmReferences: function(sectionType, sectionName) {
// sectionType: 'pci_passthrough' or 'usb_passthrough'
uci.sections('qemu-vms', 'vm').forEach(function(vm) {
var list = [].concat(vm[sectionType] || []);
var index = list.indexOf(sectionName);
if (index !== -1) {
list.splice(index, 1);
if (list.length)
uci.set('qemu-vms', vm['.name'], sectionType, list);
else
uci.unset('qemu-vms', vm['.name'], sectionType);
}
}
);
},
createPciPassthrough: function(dev, ev) { createPciPassthrough: function(dev, ev) {
var self = this; var self = this;
var addr = dev.addr; var addr = dev.addr;
@@ -144,9 +161,9 @@ return view.extend({
return; return;
} }
var owner = this.pciOwner(addr); var owners = this.pciOwners(addr);
if (owner) { if (owners.length) {
ui.addNotification(null, E('p', _('This device is currently attached to VM "%s". Please detach it from the VM first.').format(owner)), 'error'); ui.addNotification(null, E('p', _('This device is currently attached to VM(s): %s. Please detach it from all VMs first.').format(owners.join(', '))), 'error');
return; return;
} }
@@ -159,6 +176,7 @@ return view.extend({
'class': 'btn cbi-button-negative', 'class': 'btn cbi-button-negative',
'click': function() { 'click': function() {
uci.remove('qemu-vms', section); uci.remove('qemu-vms', section);
self.cleanupVmReferences('pci_passthrough', section);
return uci.save().then(function() { return uci.save().then(function() {
ui.hideModal(); ui.hideModal();
ui.addNotification(null, E('p', _('Passthrough removed for %s.').format(addr)), 'info'); ui.addNotification(null, E('p', _('Passthrough removed for %s.').format(addr)), 'info');
@@ -269,6 +287,7 @@ return view.extend({
'class': 'btn cbi-button-negative', 'class': 'btn cbi-button-negative',
'click': function() { 'click': function() {
uci.remove('qemu-vms', section); uci.remove('qemu-vms', section);
self.cleanupVmReferences('usb_passthrough', section);
return uci.save().then(function() { return uci.save().then(function() {
ui.hideModal(); ui.hideModal();
ui.addNotification(null, E('p', _('Passthrough removed.')), 'info'); ui.addNotification(null, E('p', _('Passthrough removed.')), 'info');
@@ -286,7 +305,8 @@ return view.extend({
var self = this; var self = this;
var rows = devices.map(function(dev) { var rows = devices.map(function(dev) {
var section = self.findPciSection(dev.addr); var section = self.findPciSection(dev.addr);
var owner = self.pciOwner(dev.addr); var owners = self.pciOwners(dev.addr);
var owner = owners.length ? owners.join(', ') : null;
var passthroughStatus = section ? _('Active<br />Section: %s').format(section) : _('Not passthrough'); var passthroughStatus = section ? _('Active<br />Section: %s').format(section) : _('Not passthrough');
if (owner) passthroughStatus += ' ' + _('<br />Host: %s').format(owner); if (owner) passthroughStatus += ' ' + _('<br />Host: %s').format(owner);
@@ -423,11 +423,18 @@ return view.extend({
}); });
vncPortRow.style.display = ((vm.display_type || 'serial') === 'vnc') ? '' : 'none'; vncPortRow.style.display = ((vm.display_type || 'serial') === 'vnc') ? '' : 'none';
var pciSelect = E('select', { 'class': 'cbi-input-select', 'id': 'edit-pci' }, [ var attachedPci = [].concat(vm.pci_passthrough || []);
E('option', { 'value': '', 'selected': !vm.pci_passthrough || null }, _('-- none --')) var pciSelect = E('div', { 'style': 'display: flex; flex-wrap: wrap; gap: 0.3em 1.2em;' }, allPci.map(function(p) {
].concat(allPci.map(function(p) { return E('label', { 'style': 'white-space: nowrap; font-weight: normal;' }, [
return E('option', { 'value': p, 'selected': vm.pci_passthrough === p || null }, p); E('input', {
}))); 'type': 'checkbox',
'class': 'edit-pci-check',
'value': p,
'checked': attachedPci.indexOf(p) !== -1 || null
}),' ' + p
]);
}));
if (!allPci.length) pciSelect = E('em', {}, _('No PCI passthrough sections defined yet'));
var networkChecks = allNetworks.map(function(net) { var networkChecks = allNetworks.map(function(net) {
return E('div', {}, [ return E('div', {}, [
@@ -612,9 +619,10 @@ return view.extend({
else else
uci.unset('qemu-vms', name, 'custom_arg'); uci.unset('qemu-vms', name, 'custom_arg');
var pci = document.getElementById('edit-pci').value; var newPci = Array.prototype.slice.call(document.querySelectorAll('.edit-pci-check:checked'))
if (pci) .map(function(el) { return el.value; });
uci.set('qemu-vms', name, 'pci_passthrough', pci); if (newPci.length)
uci.set('qemu-vms', name, 'pci_passthrough', newPci);
else else
uci.unset('qemu-vms', name, 'pci_passthrough'); uci.unset('qemu-vms', name, 'pci_passthrough');
+1 -1
View File
@@ -4,7 +4,7 @@ LUCI_TITLE:=luci-app-ssr-plus
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_NAME:=luci-app-ssr-plus PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=196 PKG_VERSION:=196
PKG_RELEASE:=52 PKG_RELEASE:=53
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \
+33 -33
View File
@@ -1529,107 +1529,107 @@ get_name() {
gen_config_file() { #server1 type2 code3 local_port4 socks_port5 chain6 threads5 gen_config_file() { #server1 type2 code3 local_port4 socks_port5 chain6 threads5
local server="$1" local server="$1"
local type="$2" local type="$2"
local mode="$3" local code="$3"
local local_port="$4" local local_port="$4"
local socks_port="$5" local socks_port="$5"
local chain="$6" local chain="$6"
local tmp_port local tmp_port
local ss_protocol local ss_protocol
case "$mode" in case "$code" in
1) 1)
config_file=$tcp_config_file config_file="$tcp_config_file"
chain_config_file=$(echo "${config_file}" | sed 's/ssrplus\//ssrplus\/chain-/') chain_config_file=$(echo "${config_file}" | sed 's/ssrplus\//ssrplus\/chain-/')
;; ;;
2) 2)
config_file=$udp_config_file config_file="$udp_config_file"
chain_config_file=$(echo "${config_file}" | sed 's/ssrplus\//ssrplus\/chain-/') chain_config_file=$(echo "${config_file}" | sed 's/ssrplus\//ssrplus\/chain-/')
;; ;;
3) 3)
if [ -n "$tmp_local_port" ]; then if [ -n "$tmp_local_port" ]; then
tmp_port=$tmp_local_port tmp_port="$tmp_local_port"
else else
tmp_port=$tmp_shunt_local_port tmp_port="$tmp_shunt_local_port"
fi fi
config_file=$shunt_config_file config_file="$shunt_config_file"
chain_config_file=$(echo "${config_file}" | sed 's/ssrplus\//ssrplus\/chain-/') chain_config_file=$(echo "${config_file}" | sed 's/ssrplus\//ssrplus\/chain-/')
;; ;;
4) 4)
ss_protocol="socks" ss_protocol="socks"
config_file=$local_config_file config_file="$local_config_file"
chain_config_file=$(echo "${config_file}" | sed 's/ssrplus\//ssrplus\/chain-/') chain_config_file=$(echo "${config_file}" | sed 's/ssrplus\//ssrplus\/chain-/')
;; ;;
esac esac
case "$type" in case "$type" in
ss | ssr) ss | ssr)
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$mode" "$local_port" "${ss_protocol:-redir}" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $mode $local_port ${ss_protocol:-redir} >"$config_file"
if [ "$mode" = "3" ]; then if [ "$code" = "3" ]; then
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$mode" "$tmp_port" socks >"$shunt_dns_config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $mode $tmp_port socks >"$shunt_dns_config_file"
fi fi
;; ;;
v2ray) v2ray)
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$mode" "$local_port" "$socks_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $mode $local_port $socks_port >"$config_file"
;; ;;
trojan) trojan)
case "$mode" in case "$code" in
1) 1)
lua /usr/share/shadowsocksr/gen_config.lua "$server" nat "$local_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server nat $local_port >"$config_file"
;; ;;
2) 2)
lua /usr/share/shadowsocksr/gen_config.lua "$server" client "$local_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server client $local_port >"$config_file"
;; ;;
3) 3)
lua /usr/share/shadowsocksr/gen_config.lua "$server" nat "$local_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server nat $local_port >"$config_file"
lua /usr/share/shadowsocksr/gen_config.lua "$server" client "$tmp_port" >"$shunt_dns_config_file" lua /usr/share/shadowsocksr/gen_config.lua $server client $tmp_port >"$shunt_dns_config_file"
;; ;;
4) 4)
lua /usr/share/shadowsocksr/gen_config.lua "$server" client "$local_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server client $local_port >"$config_file"
;; ;;
esac esac
;; ;;
naiveproxy) naiveproxy)
case "$mode" in case "$code" in
1) 1)
lua /usr/share/shadowsocksr/gen_config.lua "$server" redir "$local_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server redir $local_port >"$config_file"
;; ;;
3) 3)
lua /usr/share/shadowsocksr/gen_config.lua "$server" redir "$local_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server redir $local_port >"$config_file"
lua /usr/share/shadowsocksr/gen_config.lua "$server" socks "$tmp_port" >"$shunt_dns_config_file" lua /usr/share/shadowsocksr/gen_config.lua $server socks $tmp_port >"$shunt_dns_config_file"
;; ;;
4) 4)
lua /usr/share/shadowsocksr/gen_config.lua "$server" socks "$local_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server socks $local_port >"$config_file"
;; ;;
esac esac
;; ;;
hysteria2) hysteria2)
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$mode" "$local_port" "$socks_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $mode $local_port $socks_port >"$config_file"
;; ;;
tuic) tuic)
case "$mode" in case "$code" in
1|2|4) 1|2|4)
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$mode" "$local_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $mode $local_port >"$config_file"
;; ;;
3) 3)
if [ -z "$chain" ]; then if [ -z "$chain" ]; then
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$mode" "$local_port" >"$shunt_dns_config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $mode $local_port >"$shunt_dns_config_file"
else else
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$mode" "$local_port" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $mode $local_port >"$config_file"
fi fi
;; ;;
esac esac
;; ;;
shadowtls) shadowtls)
case "$mode" in case "$code" in
1|2|4) 1|2|4)
if [ -z "$chain" ]; then if [ -z "$chain" ]; then
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$type" "$local_port" >"$chain_config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $type $local_port >"$chain_config_file"
else else
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$mode" "$local_port" "$socks_port" "$chain" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $mode $local_port $socks_port $chain >"$config_file"
fi fi
;; ;;
3) 3)
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$type" "$local_port" >"$chain_config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $type $local_port >"$chain_config_file"
lua /usr/share/shadowsocksr/gen_config.lua "$server" "$mode" "$local_port" "$socks_port" "$chain" >"$config_file" lua /usr/share/shadowsocksr/gen_config.lua $server $mode $local_port $socks_port $chain >"$config_file"
;; ;;
esac esac
;; ;;
+1 -1
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=qemu-vms PKG_NAME:=qemu-vms
PKG_VERSION:=0.0.1 PKG_VERSION:=0.0.1
PKG_RELEASE:=6 PKG_RELEASE:=7
PKG_MAINTAINER:=Konstantine Shevlakov <shevlakov@132lan.ru> PKG_MAINTAINER:=Konstantine Shevlakov <shevlakov@132lan.ru>
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
+38 -36
View File
@@ -102,6 +102,41 @@ _add_usb() {
usb_needed=1 usb_needed=1
} }
_add_pci() {
local pci_section="$1"
local pci_id
config_get pci_id "$pci_section" pci_id
[ -n "$pci_id" ] || return 0
local pci_path="/sys/bus/pci/devices/0000:$pci_id"
local iommu_group=""
if [ -L "$pci_path/iommu_group" ]; then
iommu_group="$(basename "$(readlink -f "$pci_path/iommu_group")")"
fi
if [ -n "$iommu_group" ]; then
host_log "$cfg" "PCI passthrough: device $pci_id is in IOMMU group $iommu_group"
for dev in /sys/kernel/iommu_groups/$iommu_group/devices/*; do
local dev_name="$(basename "$dev")"
local current_driver="$(basename "$(readlink -f "$dev/driver" 2>/dev/null)" 2>/dev/null)"
if [ -n "$current_driver" ] && [ "$current_driver" != "vfio-pci" ]; then
echo -n "$dev_name" > "$dev/driver/unbind" 2>/dev/null
host_log "$cfg" "PCI: unbound $dev_name from $current_driver"
fi
echo "vfio-pci" > "$dev/driver_override" 2>/dev/null
echo "$dev_name" > /sys/bus/pci/drivers/vfio-pci/bind 2>/dev/null
if [ -e "$dev/driver" ] && [ "$(basename "$(readlink -f "$dev/driver")")" = "vfio-pci" ]; then
host_log "$cfg" "PCI: successfully bound $dev_name to vfio-pci"
else
host_log "$cfg" "ERROR: failed to bind $dev_name to vfio-pci"
fi
done
sleep 3
pci_opts="$pci_opts -device vfio-pci,host=$pci_id"
else
host_log "$cfg" "WARNING: Cannot determine IOMMU group for $pci_id"
fi
}
#_unbind_usb_host() { #_unbind_usb_host() {
# local usbcfg="$1" # local usbcfg="$1"
# local vendor_id product_id # local vendor_id product_id
@@ -244,7 +279,7 @@ start_vm() {
config_get vnc_port "$cfg" vnc_port config_get vnc_port "$cfg" vnc_port
config_get machine "$cfg" machine "q35" config_get machine "$cfg" machine "q35"
local console_sock="$STAUS_DIR/qemu-$cfg.sock" local console_sock="$STATUS_DIR/qemu-$cfg.sock"
local console_log="$LOG_DIR/qemu-$cfg-console.log" local console_log="$LOG_DIR/qemu-$cfg-console.log"
local qmp_sock="$STATUS_DIR/qemu-$cfg.qmp" local qmp_sock="$STATUS_DIR/qemu-$cfg.qmp"
@@ -276,41 +311,8 @@ start_vm() {
# fi # fi
#fi #fi
local pci_id="" pci_opts="" local pci_opts=""
if [ -n "$pci_passthrough" ]; then config_list_foreach "$cfg" pci_passthrough _add_pci
config_get pci_id "$pci_passthrough" pci_id
if [ -n "$pci_id" ]; then
local pci_path="/sys/bus/pci/devices/0000:$pci_id"
local iommu_group=""
if [ -L "$pci_path/iommu_group" ]; then
iommu_group="$(basename "$(readlink -f "$pci_path/iommu_group")")"
fi
if [ -n "$iommu_group" ]; then
host_log "$cfg" "PCI passthrough: device $pci_id is in IOMMU group $iommu_group"
for dev in /sys/kernel/iommu_groups/$iommu_group/devices/*; do
local dev_name="$(basename "$dev")"
local current_driver="$(basename "$(readlink -f "$dev/driver" 2>/dev/null)" 2>/dev/null)"
if [ -n "$current_driver" ] && [ "$current_driver" != "vfio-pci" ]; then
echo -n "$dev_name" > "$dev/driver/unbind" 2>/dev/null
host_log "$cfg" "PCI: unbound $dev_name from $current_driver"
fi
echo "vfio-pci" > "$dev/driver_override" 2>/dev/null
echo "$dev_name" > /sys/bus/pci/drivers/vfio-pci/bind 2>/dev/null
if [ -e "$dev/driver" ] && [ "$(basename "$(readlink -f "$dev/driver")")" = "vfio-pci" ]; then
host_log "$cfg" "PCI: successfully bound $dev_name to vfio-pci"
else
host_log "$cfg" "ERROR: failed to bind $dev_name to vfio-pci"
fi
done
sleep 3
pci_opts="-device vfio-pci,host=$pci_id"
else
host_log "$cfg" "WARNING: Cannot determine IOMMU group for $pci_id"
fi
else
host_log "$cfg" "WARNING: pci_passthrough section exists but pci_id is empty - skipping"
fi
fi
local cdrom_opts="" local cdrom_opts=""
[ -n "$cdrom" ] && cdrom_opts="-cdrom $cdrom" [ -n "$cdrom" ] && cdrom_opts="-cdrom $cdrom"