From 5da1a88296b43d1c27f3b102d5335b6443fd85c3 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 5 Apr 2023 13:32:38 +0200
Subject: [PATCH 001/132] initial commit to prepare for rewrite into golang for
actual use
---
.gitignore | 3 +-
.goreleaser.yaml | 29 ++++++
cmd/main.go | 1 +
go.mod | 5 ++
go.sum | 2 +
.../lib}/apply_CHANGES.sh | 0
{lib => old_bash_version/lib}/get_GPU.sh | 0
.../lib}/get_GPU_GROUP.sh | 0
{lib => old_bash_version/lib}/get_GPU_ROM.sh | 0
{lib => old_bash_version/lib}/get_USB_CTL.sh | 0
.../lib}/get_USB_CTL_GROUP.sh | 0
{lib => old_bash_version/lib}/paths.sh | 0
{lib => old_bash_version/lib}/set_CMDLINE.sh | 0
{lib => old_bash_version/lib}/set_DRACUT.sh | 0
.../lib}/set_INITRAMFSTOOLS.sh | 0
.../lib}/set_MKINITCPIO.sh | 0
{lib => old_bash_version/lib}/set_MODPROBE.sh | 0
{lib => old_bash_version/lib}/set_VFIO.sh | 0
vfio-setup => old_bash_version/vfio-setup | 0
vfio-verify => old_bash_version/vfio-verify | 0
pkg/params/params.go | 90 +++++++++++++++++++
21 files changed, 129 insertions(+), 1 deletion(-)
create mode 100644 .goreleaser.yaml
create mode 100644 cmd/main.go
create mode 100644 go.mod
create mode 100644 go.sum
rename {lib => old_bash_version/lib}/apply_CHANGES.sh (100%)
rename {lib => old_bash_version/lib}/get_GPU.sh (100%)
rename {lib => old_bash_version/lib}/get_GPU_GROUP.sh (100%)
rename {lib => old_bash_version/lib}/get_GPU_ROM.sh (100%)
rename {lib => old_bash_version/lib}/get_USB_CTL.sh (100%)
rename {lib => old_bash_version/lib}/get_USB_CTL_GROUP.sh (100%)
rename {lib => old_bash_version/lib}/paths.sh (100%)
rename {lib => old_bash_version/lib}/set_CMDLINE.sh (100%)
rename {lib => old_bash_version/lib}/set_DRACUT.sh (100%)
rename {lib => old_bash_version/lib}/set_INITRAMFSTOOLS.sh (100%)
rename {lib => old_bash_version/lib}/set_MKINITCPIO.sh (100%)
rename {lib => old_bash_version/lib}/set_MODPROBE.sh (100%)
rename {lib => old_bash_version/lib}/set_VFIO.sh (100%)
rename vfio-setup => old_bash_version/vfio-setup (100%)
rename vfio-verify => old_bash_version/vfio-verify (100%)
create mode 100644 pkg/params/params.go
diff --git a/.gitignore b/.gitignore
index f892f21..22508b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
config/
backup/
utils/
-utils.old/
\ No newline at end of file
+utils.old/
+bin/
\ No newline at end of file
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
new file mode 100644
index 0000000..f2d4dbc
--- /dev/null
+++ b/.goreleaser.yaml
@@ -0,0 +1,29 @@
+before:
+ hooks:
+ - go mod tidy
+builds:
+ - env:
+ - CGO_ENABLED=0
+ goos:
+ - linux
+ hooks:
+ post:
+ - upx "{{ .Path }}"
+archives:
+ - replacements:
+ linux: Linux
+ amd64: x86_64
+checksum:
+ name_template: 'checksums.txt'
+snapshot:
+ name_template: "{{ incpatch .Version }}-next"
+changelog:
+ sort: asc
+ filters:
+ exclude:
+ - '^docs:'
+ - '^test:'
+
+# modelines, feel free to remove those if you don't want/use them:
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=cnqoj
diff --git a/cmd/main.go b/cmd/main.go
new file mode 100644
index 0000000..06ab7d0
--- /dev/null
+++ b/cmd/main.go
@@ -0,0 +1 @@
+package main
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..800350d
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,5 @@
+module github.com/HikariKnight/quickpassthrough
+
+go 1.20
+
+require github.com/akamensky/argparse v1.4.0
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..5bf91e2
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,2 @@
+github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
+github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
diff --git a/lib/apply_CHANGES.sh b/old_bash_version/lib/apply_CHANGES.sh
similarity index 100%
rename from lib/apply_CHANGES.sh
rename to old_bash_version/lib/apply_CHANGES.sh
diff --git a/lib/get_GPU.sh b/old_bash_version/lib/get_GPU.sh
similarity index 100%
rename from lib/get_GPU.sh
rename to old_bash_version/lib/get_GPU.sh
diff --git a/lib/get_GPU_GROUP.sh b/old_bash_version/lib/get_GPU_GROUP.sh
similarity index 100%
rename from lib/get_GPU_GROUP.sh
rename to old_bash_version/lib/get_GPU_GROUP.sh
diff --git a/lib/get_GPU_ROM.sh b/old_bash_version/lib/get_GPU_ROM.sh
similarity index 100%
rename from lib/get_GPU_ROM.sh
rename to old_bash_version/lib/get_GPU_ROM.sh
diff --git a/lib/get_USB_CTL.sh b/old_bash_version/lib/get_USB_CTL.sh
similarity index 100%
rename from lib/get_USB_CTL.sh
rename to old_bash_version/lib/get_USB_CTL.sh
diff --git a/lib/get_USB_CTL_GROUP.sh b/old_bash_version/lib/get_USB_CTL_GROUP.sh
similarity index 100%
rename from lib/get_USB_CTL_GROUP.sh
rename to old_bash_version/lib/get_USB_CTL_GROUP.sh
diff --git a/lib/paths.sh b/old_bash_version/lib/paths.sh
similarity index 100%
rename from lib/paths.sh
rename to old_bash_version/lib/paths.sh
diff --git a/lib/set_CMDLINE.sh b/old_bash_version/lib/set_CMDLINE.sh
similarity index 100%
rename from lib/set_CMDLINE.sh
rename to old_bash_version/lib/set_CMDLINE.sh
diff --git a/lib/set_DRACUT.sh b/old_bash_version/lib/set_DRACUT.sh
similarity index 100%
rename from lib/set_DRACUT.sh
rename to old_bash_version/lib/set_DRACUT.sh
diff --git a/lib/set_INITRAMFSTOOLS.sh b/old_bash_version/lib/set_INITRAMFSTOOLS.sh
similarity index 100%
rename from lib/set_INITRAMFSTOOLS.sh
rename to old_bash_version/lib/set_INITRAMFSTOOLS.sh
diff --git a/lib/set_MKINITCPIO.sh b/old_bash_version/lib/set_MKINITCPIO.sh
similarity index 100%
rename from lib/set_MKINITCPIO.sh
rename to old_bash_version/lib/set_MKINITCPIO.sh
diff --git a/lib/set_MODPROBE.sh b/old_bash_version/lib/set_MODPROBE.sh
similarity index 100%
rename from lib/set_MODPROBE.sh
rename to old_bash_version/lib/set_MODPROBE.sh
diff --git a/lib/set_VFIO.sh b/old_bash_version/lib/set_VFIO.sh
similarity index 100%
rename from lib/set_VFIO.sh
rename to old_bash_version/lib/set_VFIO.sh
diff --git a/vfio-setup b/old_bash_version/vfio-setup
similarity index 100%
rename from vfio-setup
rename to old_bash_version/vfio-setup
diff --git a/vfio-verify b/old_bash_version/vfio-verify
similarity index 100%
rename from vfio-verify
rename to old_bash_version/vfio-verify
diff --git a/pkg/params/params.go b/pkg/params/params.go
new file mode 100644
index 0000000..08ccf79
--- /dev/null
+++ b/pkg/params/params.go
@@ -0,0 +1,90 @@
+package params
+
+import (
+ "fmt"
+ "os"
+
+ "github.com/akamensky/argparse"
+)
+
+/*
+ The whole purpose of this module is to make a struct
+ to just carry all our parsed arguments around between functions
+
+ Create a Params struct with all the argparse arguments
+ pArg := params.NewParams()
+*/
+
+type Params struct {
+ Flag map[string]bool
+ FlagCounter map[string]int
+ IntList map[string][]int
+ StringList map[string][]string
+ String map[string]string
+}
+
+func (p *Params) addFlag(name string, flag bool) {
+ p.Flag[name] = flag
+}
+
+func (p *Params) addFlagCounter(name string, flag int) {
+ p.FlagCounter[name] = flag
+}
+
+func (p *Params) addIntList(name string, flag []int) {
+ p.IntList[name] = flag
+}
+
+func (p *Params) addStringList(name string, flag []string) {
+ p.StringList[name] = flag
+}
+
+func (p *Params) addString(name string, flag string) {
+ p.String[name] = flag
+}
+
+func NewParams() *Params {
+ // Setup the parser for arguments
+ parser := argparse.NewParser("quickpassthrough", "A utility to help you configure your host for GPU Passthrough")
+
+ // Configure arguments
+ /*gpu := parser.Flag("g", "gpu", &argparse.Options{
+ Required: false,
+ Help: "List all GPUs. (use -i # to only display results from specified IOMMU group)",
+ })*/
+
+ // Parse arguments
+ err := parser.Parse(os.Args)
+ if err != nil {
+ // In case of error print error and print usage
+ // This can also be done by passing -h or --help flags
+ fmt.Print(parser.Usage(err))
+ os.Exit(4)
+ }
+
+ // Make our struct
+ pArg := &Params{
+ Flag: make(map[string]bool),
+ FlagCounter: make(map[string]int),
+ IntList: make(map[string][]int),
+ StringList: make(map[string][]string),
+ String: make(map[string]string),
+ }
+
+ // Add all parsed arguments to a struct for portability since we will use them all over the program
+ /*pArg.addFlag("gpu", *gpu)
+ pArg.addFlag("usb", *usb)
+ pArg.addFlag("nic", *nic)
+ pArg.addFlag("sata", *sata)
+ pArg.addFlagCounter("related", *related)
+ pArg.addStringList("ignore", *ignore)
+ pArg.addIntList("iommu_group", *iommu_group)
+ pArg.addFlag("kernelmodules", *kernelmodules)
+ pArg.addFlag("legacyoutput", *legacyoutput)
+ pArg.addFlag("id", *id)
+ pArg.addFlag("pciaddr", *pciaddr)
+ pArg.addFlag("rom", *rom)
+ pArg.addString("format", *format)*/
+
+ return pArg
+}
From fe4d1ea1c21b6949105c2b873fc75015cfe5c39f Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 5 Apr 2023 13:35:27 +0200
Subject: [PATCH 002/132] testing build tools
---
.gitignore | 3 ++-
cmd/main.go | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 22508b9..b6a0e99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ config/
backup/
utils/
utils.old/
-bin/
\ No newline at end of file
+bin/
+dist/
\ No newline at end of file
diff --git a/cmd/main.go b/cmd/main.go
index 06ab7d0..89490cd 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -1 +1,7 @@
package main
+
+import "fmt"
+
+func main() {
+ fmt.Println("test")
+}
From 68f5c98ab8f444768108aa58e22e0d4abb817e1e Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 5 Apr 2023 13:42:45 +0200
Subject: [PATCH 003/132] goreleaser config
---
.goreleaser.yaml => cmd/.goreleaser.yaml | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename .goreleaser.yaml => cmd/.goreleaser.yaml (100%)
diff --git a/.goreleaser.yaml b/cmd/.goreleaser.yaml
similarity index 100%
rename from .goreleaser.yaml
rename to cmd/.goreleaser.yaml
From 1fc61e5842501d347a41e37611ed61ae6d23dae0 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 5 Apr 2023 14:10:13 +0200
Subject: [PATCH 004/132] testing goreleaser with symlink to main.go
---
cmd/.goreleaser.yaml => .goreleaser.yaml | 0
main.go | 1 +
2 files changed, 1 insertion(+)
rename cmd/.goreleaser.yaml => .goreleaser.yaml (100%)
create mode 120000 main.go
diff --git a/cmd/.goreleaser.yaml b/.goreleaser.yaml
similarity index 100%
rename from cmd/.goreleaser.yaml
rename to .goreleaser.yaml
diff --git a/main.go b/main.go
new file mode 120000
index 0000000..3788640
--- /dev/null
+++ b/main.go
@@ -0,0 +1 @@
+cmd/main.go
\ No newline at end of file
From 62635076c3d1a65bf7fce06783bea901e805ac76 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 5 Apr 2023 17:53:27 +0200
Subject: [PATCH 005/132] start work on go rewrite for stable release
---
.goreleaser.yaml | 29 ----
cmd/main.go | 13 +-
go.mod | 19 ++-
go.sum | 63 ++++++++
.../ls_iommu_downloader.go | 143 ++++++++++++++++++
internal/tuimode/tuimode.go | 28 ++++
internal/untar/untar.go | 77 ++++++++++
main.go | 1 -
pkg/params/params.go | 7 +-
9 files changed, 344 insertions(+), 36 deletions(-)
delete mode 100644 .goreleaser.yaml
create mode 100644 internal/ls_iommu_downloader/ls_iommu_downloader.go
create mode 100644 internal/tuimode/tuimode.go
create mode 100644 internal/untar/untar.go
delete mode 120000 main.go
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
deleted file mode 100644
index f2d4dbc..0000000
--- a/.goreleaser.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-before:
- hooks:
- - go mod tidy
-builds:
- - env:
- - CGO_ENABLED=0
- goos:
- - linux
- hooks:
- post:
- - upx "{{ .Path }}"
-archives:
- - replacements:
- linux: Linux
- amd64: x86_64
-checksum:
- name_template: 'checksums.txt'
-snapshot:
- name_template: "{{ incpatch .Version }}-next"
-changelog:
- sort: asc
- filters:
- exclude:
- - '^docs:'
- - '^test:'
-
-# modelines, feel free to remove those if you don't want/use them:
-# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
-# vim: set ts=2 sw=2 tw=0 fo=cnqoj
diff --git a/cmd/main.go b/cmd/main.go
index 89490cd..c0a135a 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -1,7 +1,16 @@
package main
-import "fmt"
+import (
+ "github.com/HikariKnight/quickpassthrough/internal/tuimode"
+ "github.com/HikariKnight/quickpassthrough/pkg/params"
+)
func main() {
- fmt.Println("test")
+ // Get all our arguments in 1 neat struct
+ pArg := params.NewParams()
+
+ if !pArg.Flag["gui"] {
+ //downloader.GetLsIOMMU()
+ tuimode.App()
+ }
}
diff --git a/go.mod b/go.mod
index 800350d..1d8c267 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,21 @@ module github.com/HikariKnight/quickpassthrough
go 1.20
-require github.com/akamensky/argparse v1.4.0
+require (
+ code.rocketnine.space/tslocum/cview v1.5.8
+ github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6
+ github.com/akamensky/argparse v1.4.0
+ github.com/cavaliergopher/grab/v3 v3.0.1
+)
+
+require (
+ code.rocketnine.space/tslocum/cbind v0.1.5 // indirect
+ github.com/gdamore/encoding v1.0.0 // indirect
+ github.com/gdamore/tcell/v2 v2.6.0 // indirect
+ github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+ github.com/mattn/go-runewidth v0.0.14 // indirect
+ github.com/rivo/uniseg v0.4.3 // indirect
+ golang.org/x/sys v0.5.0 // indirect
+ golang.org/x/term v0.5.0 // indirect
+ golang.org/x/text v0.7.0 // indirect
+)
diff --git a/go.sum b/go.sum
index 5bf91e2..846957a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,65 @@
+code.rocketnine.space/tslocum/cbind v0.1.5 h1:i6NkeLLNPNMS4NWNi3302Ay3zSU6MrqOT+yJskiodxE=
+code.rocketnine.space/tslocum/cbind v0.1.5/go.mod h1:LtfqJTzM7qhg88nAvNhx+VnTjZ0SXBJtxBObbfBWo/M=
+code.rocketnine.space/tslocum/cview v1.5.8 h1:G90dP78WmZ8obrLNggx9z4kPXgJDT/MhsKpEAoqqto8=
+code.rocketnine.space/tslocum/cview v1.5.8/go.mod h1:+MjJYGHPuMPgVgZEir/JZNIDFvsL87kOTzwIba6au2A=
+github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6 h1:jaGl8YTbuuOVMzXbym2h6vOC+E7HvYaRyNvFH6oRv6s=
+github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6/go.mod h1:1uNtCpUQNhh8GGCg+WqgRNTJf7jYDHvoGVvUJCKlEuE=
github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
+github.com/cavaliergopher/grab/v3 v3.0.1 h1:4z7TkBfmPjmLAAmkkAZNX/6QJ1nNFdv3SdIHXju0Fr4=
+github.com/cavaliergopher/grab/v3 v3.0.1/go.mod h1:1U/KNnD+Ft6JJiYoYBAimKH2XrYptb8Kl3DFGmsjpq4=
+github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
+github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
+github.com/gdamore/tcell/v2 v2.2.0/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU=
+github.com/gdamore/tcell/v2 v2.5.2/go.mod h1:wSkrPaXoiIWZqW/g7Px4xc79di6FTcpB8tvaKJ6uGBo=
+github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg=
+github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y=
+github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
+github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.14-0.20220323023645-f9d555329d96/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.3.1/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
+github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210309040221-94ec62e08169/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220318055525-2edf467146b5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/internal/ls_iommu_downloader/ls_iommu_downloader.go b/internal/ls_iommu_downloader/ls_iommu_downloader.go
new file mode 100644
index 0000000..714c2d8
--- /dev/null
+++ b/internal/ls_iommu_downloader/ls_iommu_downloader.go
@@ -0,0 +1,143 @@
+package ls_iommu_downloader
+
+import (
+ "encoding/json"
+ "errors"
+ "fmt"
+ "io"
+ "net/http"
+ "os"
+ "time"
+
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/HikariKnight/quickpassthrough/internal/untar"
+ "github.com/cavaliergopher/grab/v3"
+)
+
+// Generated from github API response using https://mholt.github.io/json-to-go/
+type Response struct {
+ URL string `json:"url"`
+ AssetsURL string `json:"assets_url"`
+ UploadURL string `json:"upload_url"`
+ HTMLURL string `json:"html_url"`
+ ID int `json:"id"`
+ Author struct {
+ Login string `json:"login"`
+ ID int `json:"id"`
+ NodeID string `json:"node_id"`
+ AvatarURL string `json:"avatar_url"`
+ GravatarID string `json:"gravatar_id"`
+ URL string `json:"url"`
+ HTMLURL string `json:"html_url"`
+ FollowersURL string `json:"followers_url"`
+ FollowingURL string `json:"following_url"`
+ GistsURL string `json:"gists_url"`
+ StarredURL string `json:"starred_url"`
+ SubscriptionsURL string `json:"subscriptions_url"`
+ OrganizationsURL string `json:"organizations_url"`
+ ReposURL string `json:"repos_url"`
+ EventsURL string `json:"events_url"`
+ ReceivedEventsURL string `json:"received_events_url"`
+ Type string `json:"type"`
+ SiteAdmin bool `json:"site_admin"`
+ } `json:"author"`
+ NodeID string `json:"node_id"`
+ TagName string `json:"tag_name"`
+ TargetCommitish string `json:"target_commitish"`
+ Name string `json:"name"`
+ Draft bool `json:"draft"`
+ Prerelease bool `json:"prerelease"`
+ CreatedAt time.Time `json:"created_at"`
+ PublishedAt time.Time `json:"published_at"`
+ Assets []struct {
+ URL string `json:"url"`
+ ID int `json:"id"`
+ NodeID string `json:"node_id"`
+ Name string `json:"name"`
+ Label string `json:"label"`
+ Uploader struct {
+ Login string `json:"login"`
+ ID int `json:"id"`
+ NodeID string `json:"node_id"`
+ AvatarURL string `json:"avatar_url"`
+ GravatarID string `json:"gravatar_id"`
+ URL string `json:"url"`
+ HTMLURL string `json:"html_url"`
+ FollowersURL string `json:"followers_url"`
+ FollowingURL string `json:"following_url"`
+ GistsURL string `json:"gists_url"`
+ StarredURL string `json:"starred_url"`
+ SubscriptionsURL string `json:"subscriptions_url"`
+ OrganizationsURL string `json:"organizations_url"`
+ ReposURL string `json:"repos_url"`
+ EventsURL string `json:"events_url"`
+ ReceivedEventsURL string `json:"received_events_url"`
+ Type string `json:"type"`
+ SiteAdmin bool `json:"site_admin"`
+ } `json:"uploader"`
+ ContentType string `json:"content_type"`
+ State string `json:"state"`
+ Size int `json:"size"`
+ DownloadCount int `json:"download_count"`
+ CreatedAt time.Time `json:"created_at"`
+ UpdatedAt time.Time `json:"updated_at"`
+ BrowserDownloadURL string `json:"browser_download_url"`
+ } `json:"assets"`
+ TarballURL string `json:"tarball_url"`
+ ZipballURL string `json:"zipball_url"`
+ Body string `json:"body"`
+}
+
+func GetLsIOMMU() {
+ // Check the API for releases
+ resp, err := http.Get("https://api.github.com/repos/hikariknight/ls-iommu/releases/latest")
+ errorcheck.ErrorCheck(err)
+
+ // Close the response when function ends
+ defer resp.Body.Close()
+
+ // Get the response body
+ body, err := io.ReadAll(resp.Body)
+ errorcheck.ErrorCheck(err)
+
+ var result Response
+ if err := json.Unmarshal(body, &result); err != nil {
+ fmt.Println("Cant decode JSON")
+ }
+
+ // Make the directory for ls-iommu if it does not exist
+ path := "utils"
+ if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
+ err := os.Mkdir(path, os.ModePerm)
+ errorcheck.ErrorCheck(err)
+ }
+
+ // Generate the download url
+ downloadUrl := fmt.Sprintf(
+ "https://github.com/HikariKnight/ls-iommu/releases/download/%s/ls-iommu_%s_Linux_x86_64.tar.gz",
+ result.TagName,
+ result.TagName,
+ )
+
+ // Create blank file
+ fileName := fmt.Sprintf("%s/ls-iommu_Linux_x86_64.tar.gz", path)
+ grabClient := grab.NewClient()
+ req, _ := grab.NewRequest(fileName, downloadUrl)
+
+ // Download ls-iommu
+ download := grabClient.Do(req)
+
+ // check for errors
+ if err := download.Err(); err != nil {
+ fmt.Fprintf(os.Stderr, "Download failed: %v\n", err)
+ os.Exit(1)
+ }
+
+ fmt.Printf("Download saved to ./%v \n", download.Filename)
+
+ r, err := os.Open(fileName)
+ errorcheck.ErrorCheck(err)
+ err = untar.Untar(fmt.Sprintf("%s/", path), r)
+ errorcheck.ErrorCheck(err)
+
+}
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
new file mode 100644
index 0000000..18cf336
--- /dev/null
+++ b/internal/tuimode/tuimode.go
@@ -0,0 +1,28 @@
+package tuimode
+
+import (
+ "code.rocketnine.space/tslocum/cview"
+)
+
+func App() {
+ // Create a TUI app
+ app := cview.NewApplication()
+ defer app.HandlePanic()
+ app.EnableMouse(true)
+
+ // Generate flex grid
+ flex := cview.NewFlex()
+ flex.SetDirection(cview.FlexRow)
+
+ tv := cview.NewTextView()
+ tv.SetBorder(true)
+ tv.SetTitle("Hello, world!")
+ tv.SetText("Lorem ipsum dolor sit amet")
+ flex.AddItem(tv, 0, 0, true)
+ flex.AddItem(tv, 0, 1, false)
+
+ app.SetRoot(flex, true)
+ if err := app.Run(); err != nil {
+ panic(err)
+ }
+}
diff --git a/internal/untar/untar.go b/internal/untar/untar.go
new file mode 100644
index 0000000..4cb0e0a
--- /dev/null
+++ b/internal/untar/untar.go
@@ -0,0 +1,77 @@
+package untar
+
+import (
+ "archive/tar"
+ "compress/gzip"
+ "io"
+ "os"
+ "path/filepath"
+)
+
+// Source: https://medium.com/@skdomino/taring-untaring-files-in-go-6b07cf56bc07
+
+// Untar takes a destination path and a reader; a tar reader loops over the tarfile
+// creating the file structure at 'dst' along the way, and writing any files
+func Untar(dst string, r io.Reader) error {
+
+ gzr, err := gzip.NewReader(r)
+ if err != nil {
+ return err
+ }
+ defer gzr.Close()
+
+ tr := tar.NewReader(gzr)
+
+ for {
+ header, err := tr.Next()
+
+ switch {
+
+ // if no more files are found return
+ case err == io.EOF:
+ return nil
+
+ // return any other error
+ case err != nil:
+ return err
+
+ // if the header is nil, just skip it (not sure how this happens)
+ case header == nil:
+ continue
+ }
+
+ // the target location where the dir/file should be created
+ target := filepath.Join(dst, header.Name)
+
+ // the following switch could also be done using fi.Mode(), not sure if there
+ // a benefit of using one vs. the other.
+ // fi := header.FileInfo()
+
+ // check the file type
+ switch header.Typeflag {
+
+ // if its a dir and it doesn't exist create it
+ case tar.TypeDir:
+ if _, err := os.Stat(target); err != nil {
+ if err := os.MkdirAll(target, 0755); err != nil {
+ return err
+ }
+ }
+
+ // if it's a file create it
+ case tar.TypeReg:
+ f, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
+ if err != nil {
+ return err
+ }
+
+ // copy over contents
+ if _, err := io.Copy(f, tr); err != nil {
+ return err
+ }
+
+ // manually close here after each file operation; defering would cause each file close to wait until all operations have completed.
+ f.Close()
+ }
+ }
+}
diff --git a/main.go b/main.go
deleted file mode 120000
index 3788640..0000000
--- a/main.go
+++ /dev/null
@@ -1 +0,0 @@
-cmd/main.go
\ No newline at end of file
diff --git a/pkg/params/params.go b/pkg/params/params.go
index 08ccf79..dab85bb 100644
--- a/pkg/params/params.go
+++ b/pkg/params/params.go
@@ -48,10 +48,10 @@ func NewParams() *Params {
parser := argparse.NewParser("quickpassthrough", "A utility to help you configure your host for GPU Passthrough")
// Configure arguments
- /*gpu := parser.Flag("g", "gpu", &argparse.Options{
+ gui := parser.Flag("g", "gui", &argparse.Options{
Required: false,
- Help: "List all GPUs. (use -i # to only display results from specified IOMMU group)",
- })*/
+ Help: "Launch GUI (placeholder for now)",
+ })
// Parse arguments
err := parser.Parse(os.Args)
@@ -72,6 +72,7 @@ func NewParams() *Params {
}
// Add all parsed arguments to a struct for portability since we will use them all over the program
+ pArg.addFlag("gui", *gui)
/*pArg.addFlag("gpu", *gpu)
pArg.addFlag("usb", *usb)
pArg.addFlag("nic", *nic)
From d787eb28dbccf1d9edae195128b3cb9df3373e35 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Thu, 6 Apr 2023 03:23:28 +0200
Subject: [PATCH 006/132] After testing, decided to use bubble tea as tui
library
---
cmd/main.go | 3 +-
go.mod | 14 +++++---
go.sum | 64 ++++++++++++++-----------------------
internal/tuimode/tuimode.go | 53 ++++++++++++++++++------------
4 files changed, 69 insertions(+), 65 deletions(-)
diff --git a/cmd/main.go b/cmd/main.go
index c0a135a..b51b847 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -1,6 +1,7 @@
package main
import (
+ downloader "github.com/HikariKnight/quickpassthrough/internal/ls_iommu_downloader"
"github.com/HikariKnight/quickpassthrough/internal/tuimode"
"github.com/HikariKnight/quickpassthrough/pkg/params"
)
@@ -10,7 +11,7 @@ func main() {
pArg := params.NewParams()
if !pArg.Flag["gui"] {
- //downloader.GetLsIOMMU()
+ downloader.GetLsIOMMU()
tuimode.App()
}
}
diff --git a/go.mod b/go.mod
index 1d8c267..0b38f75 100644
--- a/go.mod
+++ b/go.mod
@@ -3,19 +3,25 @@ module github.com/HikariKnight/quickpassthrough
go 1.20
require (
- code.rocketnine.space/tslocum/cview v1.5.8
github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6
github.com/akamensky/argparse v1.4.0
github.com/cavaliergopher/grab/v3 v3.0.1
+ github.com/charmbracelet/bubbletea v0.23.2
)
require (
- code.rocketnine.space/tslocum/cbind v0.1.5 // indirect
- github.com/gdamore/encoding v1.0.0 // indirect
- github.com/gdamore/tcell/v2 v2.6.0 // indirect
+ github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
+ github.com/containerd/console v1.0.3 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+ github.com/mattn/go-isatty v0.0.17 // indirect
+ github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
+ github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
+ github.com/muesli/cancelreader v0.2.2 // indirect
+ github.com/muesli/reflow v0.3.0 // indirect
+ github.com/muesli/termenv v0.14.0 // indirect
github.com/rivo/uniseg v0.4.3 // indirect
+ golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
diff --git a/go.sum b/go.sum
index 846957a..ee4c906 100644
--- a/go.sum
+++ b/go.sum
@@ -1,65 +1,49 @@
-code.rocketnine.space/tslocum/cbind v0.1.5 h1:i6NkeLLNPNMS4NWNi3302Ay3zSU6MrqOT+yJskiodxE=
-code.rocketnine.space/tslocum/cbind v0.1.5/go.mod h1:LtfqJTzM7qhg88nAvNhx+VnTjZ0SXBJtxBObbfBWo/M=
-code.rocketnine.space/tslocum/cview v1.5.8 h1:G90dP78WmZ8obrLNggx9z4kPXgJDT/MhsKpEAoqqto8=
-code.rocketnine.space/tslocum/cview v1.5.8/go.mod h1:+MjJYGHPuMPgVgZEir/JZNIDFvsL87kOTzwIba6au2A=
github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6 h1:jaGl8YTbuuOVMzXbym2h6vOC+E7HvYaRyNvFH6oRv6s=
github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6/go.mod h1:1uNtCpUQNhh8GGCg+WqgRNTJf7jYDHvoGVvUJCKlEuE=
github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
+github.com/aymanbagabas/go-osc52 v1.2.1 h1:q2sWUyDcozPLcLabEMd+a+7Ea2DitxZVN9hTxab9L4E=
+github.com/aymanbagabas/go-osc52 v1.2.1/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
github.com/cavaliergopher/grab/v3 v3.0.1 h1:4z7TkBfmPjmLAAmkkAZNX/6QJ1nNFdv3SdIHXju0Fr4=
github.com/cavaliergopher/grab/v3 v3.0.1/go.mod h1:1U/KNnD+Ft6JJiYoYBAimKH2XrYptb8Kl3DFGmsjpq4=
-github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
-github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
-github.com/gdamore/tcell/v2 v2.2.0/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU=
-github.com/gdamore/tcell/v2 v2.5.2/go.mod h1:wSkrPaXoiIWZqW/g7Px4xc79di6FTcpB8tvaKJ6uGBo=
-github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg=
-github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y=
-github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/charmbracelet/bubbletea v0.23.2 h1:vuUJ9HJ7b/COy4I30e8xDVQ+VRDUEFykIjryPfgsdps=
+github.com/charmbracelet/bubbletea v0.23.2/go.mod h1:FaP3WUivcTM0xOKNmhciz60M6I+weYLF76mr1JyI7sM=
+github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
+github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
+github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
+github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-runewidth v0.0.14-0.20220323023645-f9d555329d96/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34=
+github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
+github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
+github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
+github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
+github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
+github.com/muesli/termenv v0.14.0 h1:8x9NFfOe8lmIWK4pgy3IfVEy47f+ppe3tUqdPZG2Uy0=
+github.com/muesli/termenv v0.14.0/go.mod h1:kG/pF1E7fh949Xhe156crRUrHNyK221IuGO7Ez60Uc8=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.3.1/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210309040221-94ec62e08169/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220318055525-2edf467146b5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index 18cf336..8758944 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -1,28 +1,41 @@
package tuimode
+// A simple example demonstrating the use of multiple text input components
+// from the Bubbles component library.
+
import (
- "code.rocketnine.space/tslocum/cview"
+ "log"
+
+ tea "github.com/charmbracelet/bubbletea"
)
+type model struct{}
+
+func (m model) Init() tea.Cmd {
+ return nil
+}
+
+// This is where we handle all the events
+func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+ switch msg := msg.(type) {
+ case tea.KeyMsg:
+ switch msg.String() {
+ case "ctrl+c":
+ return m, tea.Quit
+ }
+ }
+ return m, nil
+}
+
+// This is where we change what is shown on the screen
+func (m model) View() string {
+ return "test\n"
+}
+
+// This is where we build everything
func App() {
- // Create a TUI app
- app := cview.NewApplication()
- defer app.HandlePanic()
- app.EnableMouse(true)
-
- // Generate flex grid
- flex := cview.NewFlex()
- flex.SetDirection(cview.FlexRow)
-
- tv := cview.NewTextView()
- tv.SetBorder(true)
- tv.SetTitle("Hello, world!")
- tv.SetText("Lorem ipsum dolor sit amet")
- flex.AddItem(tv, 0, 0, true)
- flex.AddItem(tv, 0, 1, false)
-
- app.SetRoot(flex, true)
- if err := app.Run(); err != nil {
- panic(err)
+ p := tea.NewProgram(model{}, tea.WithAltScreen())
+ if _, err := p.Run(); err != nil {
+ log.Fatal(err)
}
}
From d1a365d933cc4cccc0c75b8f46f61e3689da32b6 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Thu, 6 Apr 2023 17:58:12 +0200
Subject: [PATCH 007/132] Somewhat functional concept
---
go.mod | 4 ++
go.sum | 20 ++++++++++
internal/tuimode/tuimode.go | 79 +++++++++++++++++++++++++++++++++----
3 files changed, 95 insertions(+), 8 deletions(-)
diff --git a/go.mod b/go.mod
index 0b38f75..2a13779 100644
--- a/go.mod
+++ b/go.mod
@@ -6,10 +6,13 @@ require (
github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6
github.com/akamensky/argparse v1.4.0
github.com/cavaliergopher/grab/v3 v3.0.1
+ github.com/charmbracelet/bubbles v0.15.0
github.com/charmbracelet/bubbletea v0.23.2
+ github.com/charmbracelet/lipgloss v0.6.0
)
require (
+ github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -21,6 +24,7 @@ require (
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.14.0 // indirect
github.com/rivo/uniseg v0.4.3 // indirect
+ github.com/sahilm/fuzzy v0.1.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
diff --git a/go.sum b/go.sum
index ee4c906..dee88fe 100644
--- a/go.sum
+++ b/go.sum
@@ -2,20 +2,34 @@ github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6 h1:jaGl8YTbu
github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6/go.mod h1:1uNtCpUQNhh8GGCg+WqgRNTJf7jYDHvoGVvUJCKlEuE=
github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
+github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
+github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
+github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
github.com/aymanbagabas/go-osc52 v1.2.1 h1:q2sWUyDcozPLcLabEMd+a+7Ea2DitxZVN9hTxab9L4E=
github.com/aymanbagabas/go-osc52 v1.2.1/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
github.com/cavaliergopher/grab/v3 v3.0.1 h1:4z7TkBfmPjmLAAmkkAZNX/6QJ1nNFdv3SdIHXju0Fr4=
github.com/cavaliergopher/grab/v3 v3.0.1/go.mod h1:1U/KNnD+Ft6JJiYoYBAimKH2XrYptb8Kl3DFGmsjpq4=
+github.com/charmbracelet/bubbles v0.15.0 h1:c5vZ3woHV5W2b8YZI1q7v4ZNQaPetfHuoHzx+56Z6TI=
+github.com/charmbracelet/bubbles v0.15.0/go.mod h1:Y7gSFbBzlMpUDR/XM9MhZI374Q+1p1kluf1uLl8iK74=
+github.com/charmbracelet/bubbletea v0.23.1/go.mod h1:JAfGK/3/pPKHTnAS8JIE2u9f61BjWTQY57RbT25aMXU=
github.com/charmbracelet/bubbletea v0.23.2 h1:vuUJ9HJ7b/COy4I30e8xDVQ+VRDUEFykIjryPfgsdps=
github.com/charmbracelet/bubbletea v0.23.2/go.mod h1:FaP3WUivcTM0xOKNmhciz60M6I+weYLF76mr1JyI7sM=
+github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
+github.com/charmbracelet/lipgloss v0.6.0 h1:1StyZB9vBSOyuZxQUcUwGr17JmojPNm87inij9N3wJY=
+github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk=
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
+github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
@@ -24,18 +38,24 @@ github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTd
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
+github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ=
github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
+github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
+github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc=
github.com/muesli/termenv v0.14.0 h1:8x9NFfOe8lmIWK4pgy3IfVEy47f+ppe3tUqdPZG2Uy0=
github.com/muesli/termenv v0.14.0/go.mod h1:kG/pF1E7fh949Xhe156crRUrHNyK221IuGO7Ez60Uc8=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
+github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index 8758944..342895f 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -4,37 +4,100 @@ package tuimode
// from the Bubbles component library.
import (
+ "bufio"
+ "bytes"
+ "io"
"log"
+ "os/exec"
+ "strings"
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/charmbracelet/bubbles/list"
tea "github.com/charmbracelet/bubbletea"
+ "github.com/charmbracelet/lipgloss"
)
-type model struct{}
+var docStyle = lipgloss.NewStyle().Margin(1, 2)
+
+type item struct {
+ title, desc string
+}
+
+func (i item) Title() string { return i.title }
+func (i item) Description() string { return i.desc }
+func (i item) FilterValue() string { return i.title }
+
+type model struct {
+ lists map[string]list.Model
+ list list.Model
+}
+
+func initLists() model {
+ m := model{lists: make(map[string]list.Model)}
+ return m
+}
+
+func (m model) addItems(obj string, items []list.Item) {
+ m.lists[obj] = list.New(items, list.NewDefaultDelegate(), 0, 0)
+}
func (m model) Init() tea.Cmd {
return nil
}
-// This is where we handle all the events
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) {
case tea.KeyMsg:
- switch msg.String() {
- case "ctrl+c":
+ if msg.String() == "ctrl+c" {
return m, tea.Quit
}
+ case tea.WindowSizeMsg:
+ h, v := docStyle.GetFrameSize()
+ m.list.SetSize(msg.Width-h, msg.Height-v)
}
- return m, nil
+
+ var cmd tea.Cmd
+ m.list, cmd = m.list.Update(msg)
+ return m, cmd
}
-// This is where we change what is shown on the screen
func (m model) View() string {
- return "test\n"
+ return docStyle.Render(m.list.View())
}
// This is where we build everything
func App() {
- p := tea.NewProgram(model{}, tea.WithAltScreen())
+ var stdout, stderr bytes.Buffer
+
+ cmd := exec.Command("utils/ls-iommu", "-g", "-F", "name,device_id,optional_revision")
+ cmd.Stderr = &stderr
+ cmd.Stdout = &stdout
+
+ err := cmd.Run()
+ errorcheck.ErrorCheck(err)
+
+ items := []list.Item{}
+ output, _ := io.ReadAll(&stdout)
+
+ // If we get an error from ls-iommu then print the error and exit
+ // As the system might not have IOMMU enabled
+ if stderr.String() != "" {
+ log.Fatal(stderr.String())
+ }
+
+ scanner := bufio.NewScanner(strings.NewReader(string(output)))
+ for scanner.Scan() {
+ objects := strings.Split(scanner.Text(), ": ")
+ items = append(items, item{title: objects[1], desc: objects[0]})
+ }
+
+ l := list.New(items, list.NewDefaultDelegate(), 0, 0)
+ l.Title = "Select a GPU to check the IOMMU groups of"
+
+ m := model{list: l}
+
+ // Start the program with the model
+ p := tea.NewProgram(m, tea.WithAltScreen())
if _, err := p.Run(); err != nil {
log.Fatal(err)
}
From 8c0f626ccdf53668aba271c4f20f3070745d25da Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Thu, 6 Apr 2023 23:30:09 +0200
Subject: [PATCH 008/132] somewhat functional UI mockup
---
internal/tuimode/tuimode.go | 178 +++++++++++++++++++++++++++++++-----
1 file changed, 154 insertions(+), 24 deletions(-)
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index 342895f..a31b6bd 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -9,6 +9,7 @@ import (
"io"
"log"
"os/exec"
+ "regexp"
"strings"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
@@ -18,6 +19,18 @@ import (
)
var docStyle = lipgloss.NewStyle().Margin(1, 2)
+var titleStyle = lipgloss.NewStyle().
+ Background(lipgloss.Color("#5F5FD7")).
+ Foreground(lipgloss.Color("#FFFFFF"))
+
+type status int
+
+const (
+ GPUS status = iota
+ GPU_GROUP
+ USB
+ USB_GROUP
+)
type item struct {
title, desc string
@@ -28,48 +41,174 @@ func (i item) Description() string { return i.desc }
func (i item) FilterValue() string { return i.title }
type model struct {
- lists map[string]list.Model
- list list.Model
+ fetched []bool
+ lists []list.Model
+ loaded bool
+ focused status
+ width int
+ height int
}
-func initLists() model {
- m := model{lists: make(map[string]list.Model)}
- return m
-}
+func (m *model) initLists(width, height int) {
+ defaultList := list.New([]list.Item{}, list.NewDefaultDelegate(), width, height)
-func (m model) addItems(obj string, items []list.Item) {
- m.lists[obj] = list.New(items, list.NewDefaultDelegate(), 0, 0)
+ // Disable features we wont need
+ defaultList.SetShowTitle(false)
+ defaultList.SetFilteringEnabled(false)
+ defaultList.SetSize(width, height)
+
+ // Add height and width to our model so we can use it later
+ m.width = width
+ m.height = height
+
+ m.lists = []list.Model{defaultList, defaultList, defaultList, defaultList}
+ m.fetched = []bool{false, false, false, false}
+ m.focused = GPUS
+
+ // Init GPU list
+ //m.lists[GPUS].Title = "Select a GPU to check the IOMMU groups of"
+ items := GetIOMMU("-g", "-F", "name,device_id,optional_revision")
+ m.lists[GPUS].SetShowTitle(false)
+ m.lists[GPUS].SetItems(items)
+ m.fetched[GPUS] = true
+
+ m.lists[GPU_GROUP].Title = ""
+ m.lists[GPU_GROUP].SetItems(items)
+
+ // Init USB Controller list
+ items = GetIOMMU("-u", "-F", "name,device_id,optional_revision")
+ m.lists[USB].SetItems(items)
+ m.fetched[USB] = true
+
+ m.lists[USB_GROUP].Title = ""
+ m.lists[USB_GROUP].SetItems(items)
}
func (m model) Init() tea.Cmd {
return nil
}
+// This function processes the enter event
+func (m *model) processSelection() {
+ switch m.focused {
+ case GPUS:
+ // Gets the selected item
+ selectedItem := m.lists[m.focused].SelectedItem()
+
+ // Gets the IOMMU group of the selected item
+ iommu_group_regex := regexp.MustCompile(`(\d{1,3})`)
+ iommu_group := iommu_group_regex.FindString(selectedItem.(item).desc)
+
+ items := GetIOMMU("-gr", "-i", iommu_group, "-F", "name,device_id,optional_revision")
+ m.lists[GPU_GROUP].SetItems(items)
+
+ // Adjust height to correct for a bigger title
+ m.lists[GPU_GROUP].SetSize(m.width, m.height-1)
+
+ // Change focus to next index
+ m.focused++
+
+ case GPU_GROUP:
+ // Gets the selected item
+ /*selectedItem := m.lists[m.focused].SelectedItem()
+
+ // Gets the IOMMU group of the selected item
+ iommu_group_regex := regexp.MustCompile(`(\d{1,3})`)
+ iommu_group := iommu_group_regex.FindString(selectedItem.(item).desc)
+
+ items := GetIOMMU("-gr", "-i", iommu_group, "--id")*/
+ m.focused++
+ case USB:
+ // Gets the selected item
+ selectedItem := m.lists[m.focused].SelectedItem()
+
+ // Gets the IOMMU group of the selected item
+ iommu_group_regex := regexp.MustCompile(`(\d{1,3})`)
+ iommu_group := iommu_group_regex.FindString(selectedItem.(item).desc)
+
+ items := GetIOMMU("-ur", "-i", iommu_group, "-F", "name,device_id,optional_revision")
+ m.lists[USB_GROUP].SetItems(items)
+
+ // Adjust height to correct for a bigger title
+ m.lists[USB_GROUP].SetSize(m.width, m.height-1)
+
+ // Change focus to next index
+ m.focused++
+ }
+}
+
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) {
case tea.KeyMsg:
- if msg.String() == "ctrl+c" {
+ switch msg.String() {
+ case "ctrl+c", "q":
return m, tea.Quit
+
+ case "enter":
+ if m.loaded {
+ m.processSelection()
+ }
}
case tea.WindowSizeMsg:
- h, v := docStyle.GetFrameSize()
- m.list.SetSize(msg.Width-h, msg.Height-v)
+ if !m.loaded {
+ // Get the terminal frame size
+ h, v := docStyle.GetFrameSize()
+
+ // Initialize the static lists and make sure the content
+ // does not extend past the screen
+ m.initLists(msg.Width-h, msg.Height-v)
+
+ // Set model loaded to true
+ m.loaded = true
+ }
}
var cmd tea.Cmd
- m.list, cmd = m.list.Update(msg)
+ m.lists[m.focused], cmd = m.lists[m.focused].Update(msg)
return m, cmd
}
func (m model) View() string {
- return docStyle.Render(m.list.View())
+ if m.loaded {
+ title := ""
+ switch m.focused {
+ case GPUS:
+ title = "Select a GPU to check the IOMMU groups of"
+
+ case GPU_GROUP:
+ title = "Press ENTER/RETURN to set up all these devices for passthrough.\nThis list should only contain items related to your GPU."
+
+ case USB:
+ title = "[OPTIONAL]: Select a USB Controller to check the IOMMU groups of"
+
+ case USB_GROUP:
+ title = "Press ENTER/RETURN to set up all these devices for passthrough.\nThis list should only contain the USB controller you want to use."
+ }
+ return lipgloss.JoinVertical(lipgloss.Left, titleStyle.Render(title), m.lists[m.focused].View())
+ } else {
+ return "Loading..."
+ }
+}
+
+func NewModel() *model {
+ return &model{}
}
// This is where we build everything
func App() {
+ m := NewModel()
+
+ // Start the program with the model
+ p := tea.NewProgram(m, tea.WithAltScreen())
+ if _, err := p.Run(); err != nil {
+ log.Fatal(err)
+ }
+}
+
+func GetIOMMU(args ...string) []list.Item {
var stdout, stderr bytes.Buffer
- cmd := exec.Command("utils/ls-iommu", "-g", "-F", "name,device_id,optional_revision")
+ cmd := exec.Command("utils/ls-iommu", args...)
cmd.Stderr = &stderr
cmd.Stdout = &stdout
@@ -91,14 +230,5 @@ func App() {
items = append(items, item{title: objects[1], desc: objects[0]})
}
- l := list.New(items, list.NewDefaultDelegate(), 0, 0)
- l.Title = "Select a GPU to check the IOMMU groups of"
-
- m := model{list: l}
-
- // Start the program with the model
- p := tea.NewProgram(m, tea.WithAltScreen())
- if _, err := p.Run(); err != nil {
- log.Fatal(err)
- }
+ return items
}
From 08d823093cc1798adec61380201a955f50b95e05 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 7 Apr 2023 00:31:34 +0200
Subject: [PATCH 009/132] fixed some rendering issues
---
internal/tuimode/tuimode.go | 47 ++++++++++++++++++++++++++++---------
1 file changed, 36 insertions(+), 11 deletions(-)
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index a31b6bd..e2dcefd 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -6,6 +6,7 @@ package tuimode
import (
"bufio"
"bytes"
+ "fmt"
"io"
"log"
"os/exec"
@@ -18,10 +19,14 @@ import (
"github.com/charmbracelet/lipgloss"
)
-var docStyle = lipgloss.NewStyle().Margin(1, 2)
-var titleStyle = lipgloss.NewStyle().
- Background(lipgloss.Color("#5F5FD7")).
- Foreground(lipgloss.Color("#FFFFFF"))
+var (
+ docStyle = lipgloss.NewStyle().Margin(2, 2)
+ titleStyle = lipgloss.NewStyle().
+ Background(lipgloss.Color("#5F5FD7")).
+ Foreground(lipgloss.Color("#FFFFFF"))
+ helpStyle = lipgloss.NewStyle().
+ Foreground(lipgloss.Color(241))
+)
type status int
@@ -103,7 +108,7 @@ func (m *model) processSelection() {
m.lists[GPU_GROUP].SetItems(items)
// Adjust height to correct for a bigger title
- m.lists[GPU_GROUP].SetSize(m.width, m.height-1)
+ m.lists[GPU_GROUP].SetSize(m.width, m.height)
// Change focus to next index
m.focused++
@@ -130,7 +135,7 @@ func (m *model) processSelection() {
m.lists[USB_GROUP].SetItems(items)
// Adjust height to correct for a bigger title
- m.lists[USB_GROUP].SetSize(m.width, m.height-1)
+ m.lists[USB_GROUP].SetSize(m.width, m.height)
// Change focus to next index
m.focused++
@@ -147,6 +152,14 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case "enter":
if m.loaded {
m.processSelection()
+ //return m, nil
+ }
+ case "ctrl+z", "backspace":
+ if m.focused > 0 {
+ m.focused--
+ return m, nil
+ } else {
+ return m, tea.Quit
}
}
case tea.WindowSizeMsg:
@@ -173,18 +186,30 @@ func (m model) View() string {
title := ""
switch m.focused {
case GPUS:
- title = "Select a GPU to check the IOMMU groups of"
+ title = fmt.Sprintf(
+ "\n %s\n",
+ titleStyle.Render("Select a GPU to check the IOMMU groups of"),
+ )
case GPU_GROUP:
- title = "Press ENTER/RETURN to set up all these devices for passthrough.\nThis list should only contain items related to your GPU."
+ title = fmt.Sprintf(
+ "\n %s\n %s",
+ titleStyle.Render("Press ENTER/RETURN to set up all these devices for passthrough."), titleStyle.Render("This list should only contain items related to your GPU."),
+ )
case USB:
- title = "[OPTIONAL]: Select a USB Controller to check the IOMMU groups of"
+ title = fmt.Sprintf(
+ "\n %s\n",
+ titleStyle.Render("[OPTIONAL]: Select a USB Controller to check the IOMMU groups of"),
+ )
case USB_GROUP:
- title = "Press ENTER/RETURN to set up all these devices for passthrough.\nThis list should only contain the USB controller you want to use."
+ title = fmt.Sprintf(
+ "\n %s\n %s",
+ titleStyle.Render("Press ENTER/RETURN to set up all these devices for passthrough."), titleStyle.Render("This list should only contain the USB controller you want to use."),
+ )
}
- return lipgloss.JoinVertical(lipgloss.Left, titleStyle.Render(title), m.lists[m.focused].View())
+ return lipgloss.JoinVertical(lipgloss.Left, title, m.lists[m.focused].View())
} else {
return "Loading..."
}
From 4ffa9aaf3532f455b9e88c8c04c3be55ecbe5d06 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 7 Apr 2023 03:15:55 +0200
Subject: [PATCH 010/132] UI experimentation
---
internal/tuimode/tuimode.go | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index e2dcefd..70b04b4 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -26,6 +26,8 @@ var (
Foreground(lipgloss.Color("#FFFFFF"))
helpStyle = lipgloss.NewStyle().
Foreground(lipgloss.Color(241))
+ listStyle = lipgloss.NewStyle().
+ BorderStyle(lipgloss.DoubleBorder())
)
type status int
@@ -55,7 +57,7 @@ type model struct {
}
func (m *model) initLists(width, height int) {
- defaultList := list.New([]list.Item{}, list.NewDefaultDelegate(), width, height)
+ defaultList := list.New([]list.Item{}, list.NewDefaultDelegate(), width, height/2)
// Disable features we wont need
defaultList.SetShowTitle(false)
@@ -152,7 +154,6 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case "enter":
if m.loaded {
m.processSelection()
- //return m, nil
}
case "ctrl+z", "backspace":
if m.focused > 0 {
@@ -209,7 +210,7 @@ func (m model) View() string {
titleStyle.Render("Press ENTER/RETURN to set up all these devices for passthrough."), titleStyle.Render("This list should only contain the USB controller you want to use."),
)
}
- return lipgloss.JoinVertical(lipgloss.Left, title, m.lists[m.focused].View())
+ return lipgloss.JoinVertical(lipgloss.Left, title, listStyle.Render(m.lists[m.focused].View()))
} else {
return "Loading..."
}
From 3b0731be1c4360a02e3fa8d8d49ecb1aae715327 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 7 Apr 2023 03:16:27 +0200
Subject: [PATCH 011/132] Only download ls-iommu if we do not have it or its
outdated
---
.../ls_iommu_downloader.go | 59 ++++++++++++++++---
internal/untar/untar.go | 7 ++-
2 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/internal/ls_iommu_downloader/ls_iommu_downloader.go b/internal/ls_iommu_downloader/ls_iommu_downloader.go
index 714c2d8..61810b1 100644
--- a/internal/ls_iommu_downloader/ls_iommu_downloader.go
+++ b/internal/ls_iommu_downloader/ls_iommu_downloader.go
@@ -1,12 +1,16 @@
package ls_iommu_downloader
import (
+ "crypto/sha256"
+ "encoding/hex"
"encoding/json"
"errors"
"fmt"
"io"
+ "log"
"net/http"
"os"
+ "strings"
"time"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
@@ -119,8 +123,55 @@ func GetLsIOMMU() {
result.TagName,
)
- // Create blank file
+ // Generate checksums.txt url
+ checkSumsUrl := fmt.Sprintf(
+ "https://github.com/HikariKnight/ls-iommu/releases/download/%s/checksums.txt",
+ result.TagName,
+ )
+
fileName := fmt.Sprintf("%s/ls-iommu_Linux_x86_64.tar.gz", path)
+
+ // Get the checksum data
+ checksums, err := http.Get(checkSumsUrl)
+ errorcheck.ErrorCheck(err)
+ defer checksums.Body.Close()
+ checksums_txt, err := io.ReadAll(checksums.Body)
+ errorcheck.ErrorCheck(err)
+
+ // Check if the tar.gz exists
+ _, err = os.Stat(fileName)
+
+ if errors.Is(err, os.ErrNotExist) {
+ downloadNewVersion(path, fileName, downloadUrl)
+ if checkSum(string(checksums_txt), fileName) {
+ err = untar.Untar(fmt.Sprintf("%s/", path), fileName)
+ errorcheck.ErrorCheck(err)
+ }
+ } else {
+ if !checkSum(string(checksums_txt), fileName) {
+ downloadNewVersion(path, fileName, downloadUrl)
+ err = untar.Untar(fmt.Sprintf("%s/", path), fileName)
+ errorcheck.ErrorCheck(err)
+ }
+ }
+}
+
+func checkSum(checksums string, fileName string) bool {
+ r, err := os.Open(fileName)
+ errorcheck.ErrorCheck(err)
+ defer r.Close()
+
+ hasher := sha256.New()
+ if _, err := io.Copy(hasher, r); err != nil {
+ log.Fatal(err)
+ }
+ value := hex.EncodeToString(hasher.Sum(nil))
+
+ return strings.Contains(checksums, value)
+}
+
+func downloadNewVersion(path, fileName, downloadUrl string) {
+ // Create a request
grabClient := grab.NewClient()
req, _ := grab.NewRequest(fileName, downloadUrl)
@@ -134,10 +185,4 @@ func GetLsIOMMU() {
}
fmt.Printf("Download saved to ./%v \n", download.Filename)
-
- r, err := os.Open(fileName)
- errorcheck.ErrorCheck(err)
- err = untar.Untar(fmt.Sprintf("%s/", path), r)
- errorcheck.ErrorCheck(err)
-
}
diff --git a/internal/untar/untar.go b/internal/untar/untar.go
index 4cb0e0a..ee605b0 100644
--- a/internal/untar/untar.go
+++ b/internal/untar/untar.go
@@ -6,13 +6,18 @@ import (
"io"
"os"
"path/filepath"
+
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
)
// Source: https://medium.com/@skdomino/taring-untaring-files-in-go-6b07cf56bc07
// Untar takes a destination path and a reader; a tar reader loops over the tarfile
// creating the file structure at 'dst' along the way, and writing any files
-func Untar(dst string, r io.Reader) error {
+func Untar(dst string, fileName string) error {
+ r, err := os.Open(fileName)
+ errorcheck.ErrorCheck(err)
+ defer r.Close()
gzr, err := gzip.NewReader(r)
if err != nil {
From 67ff7d185fe87216f6e466112b379aa9035985e6 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 7 Apr 2023 14:05:36 +0200
Subject: [PATCH 012/132] Update dependencies
---
go.mod | 20 ++++++++++----------
go.sum | 36 +++++++++++++++++++++---------------
2 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/go.mod b/go.mod
index 2a13779..a37bab6 100644
--- a/go.mod
+++ b/go.mod
@@ -3,30 +3,30 @@ module github.com/HikariKnight/quickpassthrough
go 1.20
require (
- github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6
+ github.com/HikariKnight/ls-iommu v0.0.0-20230407115706-e1ca65712f56
github.com/akamensky/argparse v1.4.0
github.com/cavaliergopher/grab/v3 v3.0.1
github.com/charmbracelet/bubbles v0.15.0
github.com/charmbracelet/bubbletea v0.23.2
- github.com/charmbracelet/lipgloss v0.6.0
+ github.com/charmbracelet/lipgloss v0.7.1
)
require (
github.com/atotto/clipboard v0.1.4 // indirect
- github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
+ github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
- github.com/mattn/go-isatty v0.0.17 // indirect
+ github.com/mattn/go-isatty v0.0.18 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
- github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
+ github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
- github.com/muesli/termenv v0.14.0 // indirect
- github.com/rivo/uniseg v0.4.3 // indirect
+ github.com/muesli/termenv v0.15.1 // indirect
+ github.com/rivo/uniseg v0.4.4 // indirect
github.com/sahilm/fuzzy v0.1.0 // indirect
golang.org/x/sync v0.1.0 // indirect
- golang.org/x/sys v0.5.0 // indirect
- golang.org/x/term v0.5.0 // indirect
- golang.org/x/text v0.7.0 // indirect
+ golang.org/x/sys v0.7.0 // indirect
+ golang.org/x/term v0.7.0 // indirect
+ golang.org/x/text v0.9.0 // indirect
)
diff --git a/go.sum b/go.sum
index dee88fe..f82d8f1 100644
--- a/go.sum
+++ b/go.sum
@@ -1,12 +1,13 @@
-github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6 h1:jaGl8YTbuuOVMzXbym2h6vOC+E7HvYaRyNvFH6oRv6s=
-github.com/HikariKnight/ls-iommu v0.0.0-20230405132048-f543a620b6b6/go.mod h1:1uNtCpUQNhh8GGCg+WqgRNTJf7jYDHvoGVvUJCKlEuE=
+github.com/HikariKnight/ls-iommu v0.0.0-20230407115706-e1ca65712f56 h1:OPbMP7OR9UsdTCcy9JLg2sUdijT7H9u1Lx+QgZhIeFI=
+github.com/HikariKnight/ls-iommu v0.0.0-20230407115706-e1ca65712f56/go.mod h1:1uNtCpUQNhh8GGCg+WqgRNTJf7jYDHvoGVvUJCKlEuE=
github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
github.com/akamensky/argparse v1.4.0/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
-github.com/aymanbagabas/go-osc52 v1.2.1 h1:q2sWUyDcozPLcLabEMd+a+7Ea2DitxZVN9hTxab9L4E=
github.com/aymanbagabas/go-osc52 v1.2.1/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
github.com/cavaliergopher/grab/v3 v3.0.1 h1:4z7TkBfmPjmLAAmkkAZNX/6QJ1nNFdv3SdIHXju0Fr4=
github.com/cavaliergopher/grab/v3 v3.0.1/go.mod h1:1U/KNnD+Ft6JJiYoYBAimKH2XrYptb8Kl3DFGmsjpq4=
github.com/charmbracelet/bubbles v0.15.0 h1:c5vZ3woHV5W2b8YZI1q7v4ZNQaPetfHuoHzx+56Z6TI=
@@ -15,8 +16,9 @@ github.com/charmbracelet/bubbletea v0.23.1/go.mod h1:JAfGK/3/pPKHTnAS8JIE2u9f61B
github.com/charmbracelet/bubbletea v0.23.2 h1:vuUJ9HJ7b/COy4I30e8xDVQ+VRDUEFykIjryPfgsdps=
github.com/charmbracelet/bubbletea v0.23.2/go.mod h1:FaP3WUivcTM0xOKNmhciz60M6I+weYLF76mr1JyI7sM=
github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
-github.com/charmbracelet/lipgloss v0.6.0 h1:1StyZB9vBSOyuZxQUcUwGr17JmojPNm87inij9N3wJY=
github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk=
+github.com/charmbracelet/lipgloss v0.7.1 h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZpc5Kc1E=
+github.com/charmbracelet/lipgloss v0.7.1/go.mod h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c=
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
@@ -25,8 +27,9 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
+github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
@@ -34,8 +37,9 @@ github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRC
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34=
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
+github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ=
@@ -43,12 +47,13 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc=
-github.com/muesli/termenv v0.14.0 h1:8x9NFfOe8lmIWK4pgy3IfVEy47f+ppe3tUqdPZG2Uy0=
github.com/muesli/termenv v0.14.0/go.mod h1:kG/pF1E7fh949Xhe156crRUrHNyK221IuGO7Ez60Uc8=
+github.com/muesli/termenv v0.15.1 h1:UzuTb/+hhlBugQz28rpzey4ZuKcZ03MeKsoG7IJZIxs=
+github.com/muesli/termenv v0.15.1/go.mod h1:HeAQPTzpfs016yGtA4g00CsdYnVLJvxsS4ANqrZs2sQ=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
-github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
+github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
@@ -58,12 +63,13 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
+golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
From 654685d1e4d5612eeb6b465f146e6987418551c0 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 7 Apr 2023 14:06:06 +0200
Subject: [PATCH 013/132] Add some comments and a better error message if
ls-iommu returns an error
---
internal/tuimode/tuimode.go | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index 70b04b4..56c49f0 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -234,27 +234,30 @@ func App() {
func GetIOMMU(args ...string) []list.Item {
var stdout, stderr bytes.Buffer
+ // Configure the ls-iommu command
cmd := exec.Command("utils/ls-iommu", args...)
cmd.Stderr = &stderr
cmd.Stdout = &stdout
+ // Execute the command
err := cmd.Run()
- errorcheck.ErrorCheck(err)
+ // If ls-iommu returns an error then IOMMU is disabled
+ errorcheck.ErrorCheck(err, "IOMMU disabled in either UEFI/BIOS or in bootloader!")
+
+ // Read the output
items := []list.Item{}
output, _ := io.ReadAll(&stdout)
- // If we get an error from ls-iommu then print the error and exit
- // As the system might not have IOMMU enabled
- if stderr.String() != "" {
- log.Fatal(stderr.String())
- }
-
+ // Parse the output line by line
scanner := bufio.NewScanner(strings.NewReader(string(output)))
for scanner.Scan() {
+ // Get the current line and split by :
objects := strings.Split(scanner.Text(), ": ")
+ // Write the objects into the list
items = append(items, item{title: objects[1], desc: objects[0]})
}
+ // Return our list of items
return items
}
From 632a2cb0de95e9a7946ae1a5f08f96429c7a03de Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 7 Apr 2023 14:31:50 +0200
Subject: [PATCH 014/132] Make the titles better and improve startup error
---
internal/tuimode/tuimode.go | 36 +++++++++++++++++-------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index 56c49f0..86bb10c 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -8,7 +8,6 @@ import (
"bytes"
"fmt"
"io"
- "log"
"os/exec"
"regexp"
"strings"
@@ -27,7 +26,7 @@ var (
helpStyle = lipgloss.NewStyle().
Foreground(lipgloss.Color(241))
listStyle = lipgloss.NewStyle().
- BorderStyle(lipgloss.DoubleBorder())
+ BorderStyle(lipgloss.RoundedBorder())
)
type status int
@@ -110,7 +109,7 @@ func (m *model) processSelection() {
m.lists[GPU_GROUP].SetItems(items)
// Adjust height to correct for a bigger title
- m.lists[GPU_GROUP].SetSize(m.width, m.height)
+ m.lists[GPU_GROUP].SetSize(m.width, m.height-1)
// Change focus to next index
m.focused++
@@ -137,7 +136,7 @@ func (m *model) processSelection() {
m.lists[USB_GROUP].SetItems(items)
// Adjust height to correct for a bigger title
- m.lists[USB_GROUP].SetSize(m.width, m.height)
+ m.lists[USB_GROUP].SetSize(m.width, m.height-1)
// Change focus to next index
m.focused++
@@ -188,47 +187,46 @@ func (m model) View() string {
switch m.focused {
case GPUS:
title = fmt.Sprintf(
- "\n %s\n",
- titleStyle.Render("Select a GPU to check the IOMMU groups of"),
+ " Select a GPU to check the IOMMU groups of",
)
case GPU_GROUP:
- title = fmt.Sprintf(
- "\n %s\n %s",
- titleStyle.Render("Press ENTER/RETURN to set up all these devices for passthrough."), titleStyle.Render("This list should only contain items related to your GPU."),
+ title = fmt.Sprint(
+ " Press ENTER/RETURN to set up all these devices for passthrough.\n",
+ " This list should only contain items related to your GPU.",
)
case USB:
- title = fmt.Sprintf(
- "\n %s\n",
- titleStyle.Render("[OPTIONAL]: Select a USB Controller to check the IOMMU groups of"),
+ title = fmt.Sprint(
+ " [OPTIONAL]: Select a USB Controller to check the IOMMU groups of",
)
case USB_GROUP:
- title = fmt.Sprintf(
- "\n %s\n %s",
- titleStyle.Render("Press ENTER/RETURN to set up all these devices for passthrough."), titleStyle.Render("This list should only contain the USB controller you want to use."),
+ title = fmt.Sprint(
+ " Press ENTER/RETURN to set up all these devices for passthrough.\n",
+ " This list should only contain the USB controller you want to use.",
)
}
- return lipgloss.JoinVertical(lipgloss.Left, title, listStyle.Render(m.lists[m.focused].View()))
+ return lipgloss.JoinVertical(lipgloss.Left, listStyle.SetString(fmt.Sprintf("%s\n", titleStyle.Render(title))).Render(m.lists[m.focused].View()))
} else {
return "Loading..."
}
}
func NewModel() *model {
+ // Create a blank model and return it
return &model{}
}
// This is where we build everything
func App() {
+ // Make a blank model to keep our state in
m := NewModel()
// Start the program with the model
p := tea.NewProgram(m, tea.WithAltScreen())
- if _, err := p.Run(); err != nil {
- log.Fatal(err)
- }
+ _, err := p.Run()
+ errorcheck.ErrorCheck(err, "Failed to initialize UI")
}
func GetIOMMU(args ...string) []list.Item {
From 571b3e98eee08ad811f211e30358c241f70c5c0f Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 7 Apr 2023 17:21:25 +0200
Subject: [PATCH 015/132] cleanup the titles
---
internal/tuimode/tuimode.go | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index 86bb10c..9967ab6 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -186,9 +186,7 @@ func (m model) View() string {
title := ""
switch m.focused {
case GPUS:
- title = fmt.Sprintf(
- " Select a GPU to check the IOMMU groups of",
- )
+ title = " Select a GPU to check the IOMMU groups of"
case GPU_GROUP:
title = fmt.Sprint(
@@ -197,9 +195,7 @@ func (m model) View() string {
)
case USB:
- title = fmt.Sprint(
- " [OPTIONAL]: Select a USB Controller to check the IOMMU groups of",
- )
+ title = " [OPTIONAL]: Select a USB Controller to check the IOMMU groups of"
case USB_GROUP:
title = fmt.Sprint(
From c6c94bba40ceb98b23627f9c05c6c3d6d58517c7 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 7 Apr 2023 22:50:53 +0200
Subject: [PATCH 016/132] setup a config handler
---
internal/configs/configs.go | 83 +++++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
create mode 100644 internal/configs/configs.go
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
new file mode 100644
index 0000000..287fe2c
--- /dev/null
+++ b/internal/configs/configs.go
@@ -0,0 +1,83 @@
+package configs
+
+import (
+ "errors"
+ "fmt"
+ "os"
+ "regexp"
+
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+)
+
+type Path struct {
+ MODPROBE string
+ INITRAMFS string
+ ETCMODULES string
+ DEFAULT string
+ QUICKEMU string
+ DRACUT string
+ MKINITCPIO string
+}
+
+func GetConfigPaths() *Path {
+ Paths := &Path{
+ MODPROBE: "config/etc/modprobe.d",
+ INITRAMFS: "config/etc/initramfs-tools",
+ ETCMODULES: "config/etc/modules",
+ DEFAULT: "config/etc/default",
+ QUICKEMU: "config/quickemu",
+ DRACUT: "config/etc/dracut.conf.d",
+ MKINITCPIO: "config/etc/mkinitcpio.conf",
+ }
+
+ return Paths
+}
+
+func InitConfigs() {
+ config := GetConfigPaths()
+
+ dirs := []string{
+ config.MODPROBE,
+ config.INITRAMFS,
+ config.DEFAULT,
+ config.DRACUT,
+ }
+
+ // Remove old config
+ os.RemoveAll("config")
+
+ // Make a regex to get the system path instead of the config path
+ syspath_re := regexp.MustCompile(`^config`)
+
+ // For each directory
+ for _, confpath := range dirs {
+ // Get the system path
+ syspath := syspath_re.ReplaceAllString(confpath, "")
+
+ // If the path exists
+ if _, err := os.Stat(syspath); !errors.Is(err, os.ErrNotExist) {
+ // Create the directories for our configs
+ err := os.MkdirAll(confpath, os.ModePerm)
+ errorcheck.ErrorCheck(err)
+ }
+ }
+
+ files := []string{
+ config.ETCMODULES,
+ config.MKINITCPIO,
+ fmt.Sprintf("%s/modules", config.INITRAMFS),
+ }
+
+ for _, conffile := range files {
+ // Get the system file path
+ sysfile := syspath_re.ReplaceAllString(conffile, "")
+
+ // If the file exists
+ if _, err := os.Stat(sysfile); !errors.Is(err, os.ErrNotExist) {
+ // Create the directories for our configs
+ file, err := os.Create(conffile)
+ errorcheck.ErrorCheck(err)
+ defer file.Close()
+ }
+ }
+}
From 475f37e16561c0d4a850f1a0071fa92d5dffa794 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 7 Apr 2023 22:52:02 +0200
Subject: [PATCH 017/132] Create a dialog window, write vbiosdumper, simple
refactoring
---
internal/tuimode/tuimode.go | 258 +++++++++++++++++++++++++++++-------
1 file changed, 212 insertions(+), 46 deletions(-)
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index 9967ab6..8c65f75 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -8,11 +8,14 @@ import (
"bytes"
"fmt"
"io"
+ "os"
"os/exec"
+ "path/filepath"
"regexp"
"strings"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/HikariKnight/quickpassthrough/internal/configs"
"github.com/charmbracelet/bubbles/list"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
@@ -22,59 +25,113 @@ var (
docStyle = lipgloss.NewStyle().Margin(2, 2)
titleStyle = lipgloss.NewStyle().
Background(lipgloss.Color("#5F5FD7")).
- Foreground(lipgloss.Color("#FFFFFF"))
+ Foreground(lipgloss.Color("#FFFFFF")).
+ PaddingLeft(2).PaddingRight(2)
helpStyle = lipgloss.NewStyle().
Foreground(lipgloss.Color(241))
listStyle = lipgloss.NewStyle().
- BorderStyle(lipgloss.RoundedBorder())
+ PaddingLeft(2)
+ choiceStyle = lipgloss.NewStyle().PaddingLeft(4)
+ selectedChoiceStyle = lipgloss.NewStyle().
+ PaddingLeft(2).
+ Foreground(lipgloss.Color("170"))
+ dialogStyle = lipgloss.NewStyle().
+ PaddingLeft(2).
+ Width(78)
)
+// Make a status type
type status int
-const (
- GPUS status = iota
- GPU_GROUP
- USB
- USB_GROUP
-)
-
+// List item struct
type item struct {
title, desc string
}
+// Functions needed for item struct
func (i item) Title() string { return i.title }
func (i item) Description() string { return i.desc }
func (i item) FilterValue() string { return i.title }
-type model struct {
- fetched []bool
- lists []list.Model
- loaded bool
- focused status
- width int
- height int
+// Choice delegate (for our dialog boxes)
+type choiceDelegate struct{}
+
+func (d choiceDelegate) Height() int { return 1 }
+func (d choiceDelegate) Spacing() int { return 0 }
+func (d choiceDelegate) Update(msg tea.Msg, m *list.Model) tea.Cmd { return nil }
+func (d choiceDelegate) Render(w io.Writer, m list.Model, index int, listItem list.Item) {
+ i, ok := listItem.(item)
+ if !ok {
+ return
+ }
+
+ str := fmt.Sprintf("%s", i.title)
+
+ fn := choiceStyle.Render
+ if index == m.Index() {
+ fn = func(s ...string) string {
+ return selectedChoiceStyle.Render("| " + strings.Join(s, " "))
+ }
+ }
+
+ fmt.Fprint(w, fn(str))
}
+// Main Model
+type model struct {
+ fetched []bool
+ lists []list.Model
+ gpu_group string
+ vbios_path string
+ loaded bool
+ focused status
+ width int
+ height int
+}
+
+// Consts used to navigate the main model
+const (
+ GPUS status = iota
+ GPU_GROUP
+ VBIOS
+ USB
+ USB_GROUP
+)
+
func (m *model) initLists(width, height int) {
- defaultList := list.New([]list.Item{}, list.NewDefaultDelegate(), width, height/2)
+ defaultList := list.New([]list.Item{}, list.NewDefaultDelegate(), 0, 10)
+ choiceList := list.New([]list.Item{}, choiceDelegate{}, 0, 7)
// Disable features we wont need
defaultList.SetShowTitle(false)
defaultList.SetFilteringEnabled(false)
defaultList.SetSize(width, height)
+ choiceList.SetShowTitle(false)
+ choiceList.SetFilteringEnabled(false)
// Add height and width to our model so we can use it later
m.width = width
m.height = height
- m.lists = []list.Model{defaultList, defaultList, defaultList, defaultList}
- m.fetched = []bool{false, false, false, false}
+ m.lists = []list.Model{
+ defaultList,
+ defaultList,
+ choiceList,
+ defaultList,
+ defaultList,
+ }
+ m.fetched = []bool{
+ false,
+ false,
+ false,
+ false,
+ false,
+ }
m.focused = GPUS
// Init GPU list
//m.lists[GPUS].Title = "Select a GPU to check the IOMMU groups of"
- items := GetIOMMU("-g", "-F", "name,device_id,optional_revision")
- m.lists[GPUS].SetShowTitle(false)
+ items := StringList2ListItem(GetIOMMU("-g", "-F", "name,device_id,optional_revision"))
m.lists[GPUS].SetItems(items)
m.fetched[GPUS] = true
@@ -82,12 +139,20 @@ func (m *model) initLists(width, height int) {
m.lists[GPU_GROUP].SetItems(items)
// Init USB Controller list
- items = GetIOMMU("-u", "-F", "name,device_id,optional_revision")
+ items = StringList2ListItem(GetIOMMU("-u", "-F", "name,device_id,optional_revision"))
m.lists[USB].SetItems(items)
m.fetched[USB] = true
m.lists[USB_GROUP].Title = ""
m.lists[USB_GROUP].SetItems(items)
+
+ items = []list.Item{
+ item{title: "OK"},
+ }
+
+ m.lists[VBIOS].SetItems(items)
+ //m.lists[TEST].SetSize(width, height)
+
}
func (m model) Init() tea.Cmd {
@@ -98,6 +163,8 @@ func (m model) Init() tea.Cmd {
func (m *model) processSelection() {
switch m.focused {
case GPUS:
+ configs.InitConfigs()
+
// Gets the selected item
selectedItem := m.lists[m.focused].SelectedItem()
@@ -105,7 +172,10 @@ func (m *model) processSelection() {
iommu_group_regex := regexp.MustCompile(`(\d{1,3})`)
iommu_group := iommu_group_regex.FindString(selectedItem.(item).desc)
- items := GetIOMMU("-gr", "-i", iommu_group, "-F", "name,device_id,optional_revision")
+ // Add the gpu group to our model
+ m.gpu_group = iommu_group
+
+ items := StringList2ListItem(GetIOMMU("-gr", "-i", m.gpu_group, "-F", "name,device_id,optional_revision"))
m.lists[GPU_GROUP].SetItems(items)
// Adjust height to correct for a bigger title
@@ -115,15 +185,10 @@ func (m *model) processSelection() {
m.focused++
case GPU_GROUP:
- // Gets the selected item
- /*selectedItem := m.lists[m.focused].SelectedItem()
-
- // Gets the IOMMU group of the selected item
- iommu_group_regex := regexp.MustCompile(`(\d{1,3})`)
- iommu_group := iommu_group_regex.FindString(selectedItem.(item).desc)
-
- items := GetIOMMU("-gr", "-i", iommu_group, "--id")*/
+ // Generate the VBIOS dumper script once the user has selected a GPU
+ GenerateVBIOSDumper(*m)
m.focused++
+
case USB:
// Gets the selected item
selectedItem := m.lists[m.focused].SelectedItem()
@@ -132,7 +197,8 @@ func (m *model) processSelection() {
iommu_group_regex := regexp.MustCompile(`(\d{1,3})`)
iommu_group := iommu_group_regex.FindString(selectedItem.(item).desc)
- items := GetIOMMU("-ur", "-i", iommu_group, "-F", "name,device_id,optional_revision")
+ items := StringList2ListItem(GetIOMMU("-ur", "-i", iommu_group, "-F", "name,device_id,optional_revision"))
+
m.lists[USB_GROUP].SetItems(items)
// Adjust height to correct for a bigger title
@@ -140,6 +206,12 @@ func (m *model) processSelection() {
// Change focus to next index
m.focused++
+
+ case USB_GROUP:
+ m.focused++
+
+ case VBIOS:
+ m.focused++
}
}
@@ -165,11 +237,11 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case tea.WindowSizeMsg:
if !m.loaded {
// Get the terminal frame size
- h, v := docStyle.GetFrameSize()
+ //h, v := docStyle.GetFrameSize()
// Initialize the static lists and make sure the content
// does not extend past the screen
- m.initLists(msg.Width-h, msg.Height-v)
+ m.initLists(msg.Width-2, msg.Height-2)
// Set model loaded to true
m.loaded = true
@@ -186,24 +258,58 @@ func (m model) View() string {
title := ""
switch m.focused {
case GPUS:
- title = " Select a GPU to check the IOMMU groups of"
+ title = titleStyle.Render(
+ "Select a GPU to check the IOMMU groups of",
+ )
case GPU_GROUP:
- title = fmt.Sprint(
- " Press ENTER/RETURN to set up all these devices for passthrough.\n",
- " This list should only contain items related to your GPU.",
+ title = titleStyle.Render(
+ fmt.Sprint(
+ "Press ENTER/RETURN to set up all these devices for passthrough.\n",
+ "This list should only contain items related to your GPU.",
+ ),
)
case USB:
- title = " [OPTIONAL]: Select a USB Controller to check the IOMMU groups of"
+ title = titleStyle.Render(
+ "[OPTIONAL]: Select a USB Controller to check the IOMMU groups of",
+ )
case USB_GROUP:
- title = fmt.Sprint(
- " Press ENTER/RETURN to set up all these devices for passthrough.\n",
- " This list should only contain the USB controller you want to use.",
+ title = titleStyle.Render(
+ fmt.Sprint(
+ "Press ENTER/RETURN to set up all these devices for passthrough.\n",
+ "This list should only contain the USB controller you want to use.",
+ ),
)
+
+ case VBIOS:
+ // Get the program directory
+ exe, _ := os.Executable()
+ scriptdir := filepath.Dir(exe)
+
+ // If we are using go run use the working directory instead
+ if strings.Contains(scriptdir, "/tmp/go-build") {
+ scriptdir, _ = os.Getwd()
+ }
+
+ text := dialogStyle.Render(
+ fmt.Sprint(
+ "Based on your GPU selection, a vbios extraction script has been generated for your convenience.\n",
+ "Passing a VBIOS rom to the card used for passthrough is required for some cards, but not all.\n",
+ "Some cards also requires you to patch your VBIOS romfile, check online if this is neccessary for your card!\n",
+ "The VBIOS will be read from:\n",
+ "%s\n\n",
+ "The script to extract the vbios has to be run as sudo and without a displaymanager running for proper dumping!\n",
+ "\n",
+ "You can run the script with:\n",
+ "%s/utils/dump_vbios.sh",
+ ),
+ )
+ title = fmt.Sprintf(text, m.vbios_path, scriptdir)
}
- return lipgloss.JoinVertical(lipgloss.Left, listStyle.SetString(fmt.Sprintf("%s\n", titleStyle.Render(title))).Render(m.lists[m.focused].View()))
+ //return listStyle.SetString(fmt.Sprintf("%s\n\n", title)).Render(m.lists[m.focused].View())
+ return lipgloss.JoinVertical(lipgloss.Left, fmt.Sprintf("%s\n%s\n", title, listStyle.Render(m.lists[m.focused].View())))
} else {
return "Loading..."
}
@@ -225,7 +331,7 @@ func App() {
errorcheck.ErrorCheck(err, "Failed to initialize UI")
}
-func GetIOMMU(args ...string) []list.Item {
+func GetIOMMU(args ...string) []string {
var stdout, stderr bytes.Buffer
// Configure the ls-iommu command
@@ -240,14 +346,28 @@ func GetIOMMU(args ...string) []list.Item {
errorcheck.ErrorCheck(err, "IOMMU disabled in either UEFI/BIOS or in bootloader!")
// Read the output
- items := []list.Item{}
+ var items []string
output, _ := io.ReadAll(&stdout)
// Parse the output line by line
scanner := bufio.NewScanner(strings.NewReader(string(output)))
for scanner.Scan() {
+ // Write the objects into the list
+ items = append(items, scanner.Text())
+ }
+
+ // Return our list of items
+ return items
+}
+
+func StringList2ListItem(stringList []string) []list.Item {
+ // Make the []list.Item struct
+ items := []list.Item{}
+
+ // Parse the output line by line
+ for _, v := range stringList {
// Get the current line and split by :
- objects := strings.Split(scanner.Text(), ": ")
+ objects := strings.Split(v, ": ")
// Write the objects into the list
items = append(items, item{title: objects[1], desc: objects[0]})
}
@@ -255,3 +375,49 @@ func GetIOMMU(args ...string) []list.Item {
// Return our list of items
return items
}
+
+func GenerateVBIOSDumper(m model) {
+ // Get the vbios path
+ m.vbios_path = GetIOMMU("-g", "-i", m.gpu_group, "--rom")[0]
+
+ // Get the config directories
+ config := configs.GetConfigPaths()
+
+ // Get the program directory
+ exe, _ := os.Executable()
+ scriptdir := filepath.Dir(exe)
+
+ // If we are using go run use the working directory instead
+ if strings.Contains(scriptdir, "/tmp/go-build") {
+ scriptdir, _ = os.Getwd()
+ }
+
+ vbios_script_template := fmt.Sprint(
+ "#!/bin/bash\n",
+ "# THIS FILE IS AUTO GENERATED!\n",
+ "# IF YOU HAVE CHANGED GPU, PLEASE RE-RUN QUICKPASSTHROUGH!\n",
+ "echo 1 | sudo tee %s\n",
+ "sudo bash -c \"cat %s\" > %s/%s/vfio_card.rom\n",
+ "echo 0 | sudo tee %s\n",
+ )
+
+ vbios_script := fmt.Sprintf(
+ vbios_script_template,
+ m.vbios_path,
+ m.vbios_path,
+ scriptdir,
+ config.QUICKEMU,
+ m.vbios_path,
+ )
+
+ scriptfile, err := os.Create("utils/dump_vbios.sh")
+ errorcheck.ErrorCheck(err, "Cannot create file \"utils/dump_vbios.sh\"")
+ defer scriptfile.Close()
+
+ // Make the script executable
+ scriptfile.Chmod(0775)
+ errorcheck.ErrorCheck(err, "Could not change permissions of \"utils/dump_vbios.sh\"")
+
+ // Write the script
+ scriptfile.WriteString(vbios_script)
+}
From c70852de0ee6601f8119806ec515877f3a44e941 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 7 Apr 2023 22:52:50 +0200
Subject: [PATCH 018/132] update gitignore to include basic built binaries
---
.gitignore | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index b6a0e99..6b4c177 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ backup/
utils/
utils.old/
bin/
-dist/
\ No newline at end of file
+dist/
+main
From a4b643d355c1539402862ad013c9ca69a939ffdd Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 8 Apr 2023 00:01:19 +0200
Subject: [PATCH 019/132] Rudementary UI is setup and configured, still need to
split this into multiple files and then implement actual functionality
---
internal/tuimode/tuimode.go | 94 +++++++++++++++++++++++++++++++++----
1 file changed, 85 insertions(+), 9 deletions(-)
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index 8c65f75..fb56fa9 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -22,7 +22,6 @@ import (
)
var (
- docStyle = lipgloss.NewStyle().Margin(2, 2)
titleStyle = lipgloss.NewStyle().
Background(lipgloss.Color("#5F5FD7")).
Foreground(lipgloss.Color("#FFFFFF")).
@@ -65,7 +64,7 @@ func (d choiceDelegate) Render(w io.Writer, m list.Model, index int, listItem li
return
}
- str := fmt.Sprintf("%s", i.title)
+ str := i.title
fn := choiceStyle.Render
if index == m.Index() {
@@ -91,11 +90,14 @@ type model struct {
// Consts used to navigate the main model
const (
- GPUS status = iota
+ INTRO status = iota
+ GPUS
GPU_GROUP
VBIOS
+ VIDEO
USB
USB_GROUP
+ DONE
)
func (m *model) initLists(width, height int) {
@@ -114,11 +116,14 @@ func (m *model) initLists(width, height int) {
m.height = height
m.lists = []list.Model{
- defaultList,
- defaultList,
choiceList,
defaultList,
defaultList,
+ choiceList,
+ choiceList,
+ defaultList,
+ defaultList,
+ choiceList,
}
m.fetched = []bool{
false,
@@ -126,12 +131,22 @@ func (m *model) initLists(width, height int) {
false,
false,
false,
+ false,
+ false,
+ false,
}
- m.focused = GPUS
+ m.focused = INTRO
+
+ // Init INTRO choices
+ items := []list.Item{
+ item{title: "CONTINUE"},
+ }
+ m.lists[INTRO].SetHeight(5)
+ m.lists[INTRO].SetItems(items)
// Init GPU list
//m.lists[GPUS].Title = "Select a GPU to check the IOMMU groups of"
- items := StringList2ListItem(GetIOMMU("-g", "-F", "name,device_id,optional_revision"))
+ items = StringList2ListItem(GetIOMMU("-g", "-F", "name,device_id,optional_revision"))
m.lists[GPUS].SetItems(items)
m.fetched[GPUS] = true
@@ -146,13 +161,24 @@ func (m *model) initLists(width, height int) {
m.lists[USB_GROUP].Title = ""
m.lists[USB_GROUP].SetItems(items)
+ // Init VBIOS choices
items = []list.Item{
item{title: "OK"},
}
-
m.lists[VBIOS].SetItems(items)
- //m.lists[TEST].SetSize(width, height)
+ // Init VIDEO disable choises
+ items = []list.Item{
+ item{title: "YES"},
+ item{title: "NO"},
+ }
+ m.lists[VIDEO].SetItems(items)
+
+ // Init VIDEO disable choises
+ items = []list.Item{
+ item{title: "FINISH"},
+ }
+ m.lists[DONE].SetItems(items)
}
func (m model) Init() tea.Cmd {
@@ -212,6 +238,15 @@ func (m *model) processSelection() {
case VBIOS:
m.focused++
+
+ case VIDEO:
+ m.focused++
+
+ case INTRO:
+ m.focused++
+
+ case DONE:
+ os.Exit(0)
}
}
@@ -257,6 +292,22 @@ func (m model) View() string {
if m.loaded {
title := ""
switch m.focused {
+ case INTRO:
+ title = dialogStyle.Render(
+ fmt.Sprint(
+ "Welcome to QuickPassthrough!\n",
+ "\n",
+ "This script is meant to make it easier to setup GPU passthrough for Qemu systems.\n",
+ "However due to the complexity of GPU passthrough, this script assumes you know how to do (or have done) the following.\n\n",
+ "* You have already enabled IOMMU, VT-d, SVM and/or AMD-v\n inside your UEFI/BIOS advanced settings.\n",
+ "* Know how to edit your bootloader\n",
+ "* Have a bootloader timeout of at least 3 seconds to access the menu\n",
+ "* Enable & Configure kernel modules\n",
+ "* Have a backup/snapshot of your system in case the script causes your\n system to be unbootable\n\n",
+ "By continuing you accept that I am not liable if your system\n",
+ "becomes unbootable, as you will be asked to verify the files generated",
+ ),
+ )
case GPUS:
title = titleStyle.Render(
"Select a GPU to check the IOMMU groups of",
@@ -306,7 +357,32 @@ func (m model) View() string {
"%s/utils/dump_vbios.sh",
),
)
+
title = fmt.Sprintf(text, m.vbios_path, scriptdir)
+
+ case VIDEO:
+ title = dialogStyle.Render(
+ fmt.Sprint(
+ "Disabling video output in Linux for the card you want to use in a VM\n",
+ "will make it easier to successfully do the passthrough without issues.\n",
+ "\n",
+ "Do you want to force disable video output in linux on this card?\n",
+ ),
+ )
+
+ case DONE:
+ title = dialogStyle.Render(
+ fmt.Sprint(
+ "The configuration files have been generated and are\n",
+ "located inside the \"config\" folder\n",
+ "\n",
+ "* The \"cmdline\" file contains kernel arguments that your bootloader needs\n",
+ "* The \"quickemu\" folder contains files that might be\n useable for quickemu in the future\n",
+ "* The files inside the \"etc\" folder must be copied to your system.\n NOTE: Verify that these files are correctly formated/edited!\n",
+ "\n",
+ "A script file named \"install.sh\" has been generated, run it to copy the files to your system and make a backup of your old files.",
+ ),
+ )
}
//return listStyle.SetString(fmt.Sprintf("%s\n\n", title)).Render(m.lists[m.focused].View())
return lipgloss.JoinVertical(lipgloss.Left, fmt.Sprintf("%s\n%s\n", title, listStyle.Render(m.lists[m.focused].View())))
From adada4ff4baeb35455b8bf94d0b65fd0136e1c38 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 8 Apr 2023 00:36:55 +0200
Subject: [PATCH 020/132] remove some un-needed newlines in dialogs
---
internal/tuimode/tuimode.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index fb56fa9..0f3bc84 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -366,7 +366,7 @@ func (m model) View() string {
"Disabling video output in Linux for the card you want to use in a VM\n",
"will make it easier to successfully do the passthrough without issues.\n",
"\n",
- "Do you want to force disable video output in linux on this card?\n",
+ "Do you want to force disable video output in linux on this card?",
),
)
From 358e81c174baf055fc0a36bc49f1acf8a642d9f3 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 8 Apr 2023 04:58:46 +0200
Subject: [PATCH 021/132] Change first line to be a title on welcome screen
---
internal/tuimode/tuimode.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
index 0f3bc84..8e7bb30 100644
--- a/internal/tuimode/tuimode.go
+++ b/internal/tuimode/tuimode.go
@@ -295,8 +295,8 @@ func (m model) View() string {
case INTRO:
title = dialogStyle.Render(
fmt.Sprint(
- "Welcome to QuickPassthrough!\n",
- "\n",
+ titleStyle.Render("Welcome to QuickPassthrough!"),
+ "\n\n",
"This script is meant to make it easier to setup GPU passthrough for Qemu systems.\n",
"However due to the complexity of GPU passthrough, this script assumes you know how to do (or have done) the following.\n\n",
"* You have already enabled IOMMU, VT-d, SVM and/or AMD-v\n inside your UEFI/BIOS advanced settings.\n",
From b339dab29f6e9bc061edf56662f7c3467374d695 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 8 Apr 2023 18:00:19 +0200
Subject: [PATCH 022/132] fix the downloader not overwriting the old archive
---
internal/ls_iommu_downloader/ls_iommu_downloader.go | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/internal/ls_iommu_downloader/ls_iommu_downloader.go b/internal/ls_iommu_downloader/ls_iommu_downloader.go
index 61810b1..0ed0042 100644
--- a/internal/ls_iommu_downloader/ls_iommu_downloader.go
+++ b/internal/ls_iommu_downloader/ls_iommu_downloader.go
@@ -175,14 +175,21 @@ func downloadNewVersion(path, fileName, downloadUrl string) {
grabClient := grab.NewClient()
req, _ := grab.NewRequest(fileName, downloadUrl)
+ // Remove old archive
+ os.Remove(fileName)
+
// Download ls-iommu
download := grabClient.Do(req)
// check for errors
if err := download.Err(); err != nil {
fmt.Fprintf(os.Stderr, "Download failed: %v\n", err)
- os.Exit(1)
+ if _, err := os.Stat("utils/ls-iommu"); errors.Is(err, os.ErrNotExist) {
+ log.Fatal("If the above error is 404, then we could not communicate with the GitHub API\n Please manually download and extract ls-iommu to: utils/\nYou can download it from: https://github.com/HikariKnight/ls-iommu/releases")
+ } else {
+ fmt.Println("Existing ls-iommu binary detected in \"utils/\", will use that instead as the GitHub API did not respond.")
+ }
+ } else {
+ fmt.Printf("Download saved to ./%v \n", download.Filename)
}
-
- fmt.Printf("Download saved to ./%v \n", download.Filename)
}
From 123d1ca18ae077cec6b75ca949b70ef9888039d5 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 8 Apr 2023 19:38:25 +0200
Subject: [PATCH 023/132] Refactor and split tui into smaller files
---
cmd/main.go | 8 +-
internal/gen_vbios_dumper.go | 57 ++
.../ls_iommu_downloader.go | 4 +-
{pkg => internal}/params/params.go | 0
internal/tuimode/tuimode.go | 499 ------------------
internal/ui_main.go | 77 +++
internal/ui_main_functions.go | 72 +++
internal/ui_main_view.go | 117 ++++
internal/ui_model.go | 154 ++++++
internal/ui_style.go | 55 ++
internal/utiil_ls-iommu.go | 61 +++
{internal => pkg}/untar/untar.go | 7 +-
12 files changed, 603 insertions(+), 508 deletions(-)
create mode 100644 internal/gen_vbios_dumper.go
rename {pkg => internal}/params/params.go (100%)
delete mode 100644 internal/tuimode/tuimode.go
create mode 100644 internal/ui_main.go
create mode 100644 internal/ui_main_functions.go
create mode 100644 internal/ui_main_view.go
create mode 100644 internal/ui_model.go
create mode 100644 internal/ui_style.go
create mode 100644 internal/utiil_ls-iommu.go
rename {internal => pkg}/untar/untar.go (85%)
diff --git a/cmd/main.go b/cmd/main.go
index b51b847..5973bf6 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -1,9 +1,9 @@
package main
import (
+ internal "github.com/HikariKnight/quickpassthrough/internal"
downloader "github.com/HikariKnight/quickpassthrough/internal/ls_iommu_downloader"
- "github.com/HikariKnight/quickpassthrough/internal/tuimode"
- "github.com/HikariKnight/quickpassthrough/pkg/params"
+ "github.com/HikariKnight/quickpassthrough/internal/params"
)
func main() {
@@ -11,7 +11,7 @@ func main() {
pArg := params.NewParams()
if !pArg.Flag["gui"] {
- downloader.GetLsIOMMU()
- tuimode.App()
+ downloader.CheckLsIOMMU()
+ internal.Tui()
}
}
diff --git a/internal/gen_vbios_dumper.go b/internal/gen_vbios_dumper.go
new file mode 100644
index 0000000..942793d
--- /dev/null
+++ b/internal/gen_vbios_dumper.go
@@ -0,0 +1,57 @@
+package internal
+
+import (
+ "fmt"
+ "os"
+ "path/filepath"
+ "strings"
+
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/HikariKnight/quickpassthrough/internal/configs"
+)
+
+func generateVBIOSDumper(m model) {
+ // Get the vbios path
+ m.vbios_path = getIOMMU("-g", "-i", m.gpu_group, "--rom")[0]
+
+ // Get the config directories
+ config := configs.GetConfigPaths()
+
+ // Get the program directory
+ exe, _ := os.Executable()
+ scriptdir := filepath.Dir(exe)
+
+ // If we are using go run use the working directory instead
+ if strings.Contains(scriptdir, "/tmp/go-build") {
+ scriptdir, _ = os.Getwd()
+ }
+
+ vbios_script_template := fmt.Sprint(
+ "#!/bin/bash\n",
+ "# THIS FILE IS AUTO GENERATED!\n",
+ "# IF YOU HAVE CHANGED GPU, PLEASE RE-RUN QUICKPASSTHROUGH!\n",
+ "echo 1 | sudo tee %s\n",
+ "sudo bash -c \"cat %s\" > %s/%s/vfio_card.rom\n",
+ "echo 0 | sudo tee %s\n",
+ )
+
+ vbios_script := fmt.Sprintf(
+ vbios_script_template,
+ m.vbios_path,
+ m.vbios_path,
+ scriptdir,
+ config.QUICKEMU,
+ m.vbios_path,
+ )
+
+ scriptfile, err := os.Create("utils/dump_vbios.sh")
+ errorcheck.ErrorCheck(err, "Cannot create file \"utils/dump_vbios.sh\"")
+ defer scriptfile.Close()
+
+ // Make the script executable
+ scriptfile.Chmod(0775)
+ errorcheck.ErrorCheck(err, "Could not change permissions of \"utils/dump_vbios.sh\"")
+
+ // Write the script
+ scriptfile.WriteString(vbios_script)
+}
diff --git a/internal/ls_iommu_downloader/ls_iommu_downloader.go b/internal/ls_iommu_downloader/ls_iommu_downloader.go
index 0ed0042..8fd5032 100644
--- a/internal/ls_iommu_downloader/ls_iommu_downloader.go
+++ b/internal/ls_iommu_downloader/ls_iommu_downloader.go
@@ -14,7 +14,7 @@ import (
"time"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
- "github.com/HikariKnight/quickpassthrough/internal/untar"
+ "github.com/HikariKnight/quickpassthrough/pkg/untar"
"github.com/cavaliergopher/grab/v3"
)
@@ -92,7 +92,7 @@ type Response struct {
Body string `json:"body"`
}
-func GetLsIOMMU() {
+func CheckLsIOMMU() {
// Check the API for releases
resp, err := http.Get("https://api.github.com/repos/hikariknight/ls-iommu/releases/latest")
errorcheck.ErrorCheck(err)
diff --git a/pkg/params/params.go b/internal/params/params.go
similarity index 100%
rename from pkg/params/params.go
rename to internal/params/params.go
diff --git a/internal/tuimode/tuimode.go b/internal/tuimode/tuimode.go
deleted file mode 100644
index 8e7bb30..0000000
--- a/internal/tuimode/tuimode.go
+++ /dev/null
@@ -1,499 +0,0 @@
-package tuimode
-
-// A simple example demonstrating the use of multiple text input components
-// from the Bubbles component library.
-
-import (
- "bufio"
- "bytes"
- "fmt"
- "io"
- "os"
- "os/exec"
- "path/filepath"
- "regexp"
- "strings"
-
- "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
- "github.com/HikariKnight/quickpassthrough/internal/configs"
- "github.com/charmbracelet/bubbles/list"
- tea "github.com/charmbracelet/bubbletea"
- "github.com/charmbracelet/lipgloss"
-)
-
-var (
- titleStyle = lipgloss.NewStyle().
- Background(lipgloss.Color("#5F5FD7")).
- Foreground(lipgloss.Color("#FFFFFF")).
- PaddingLeft(2).PaddingRight(2)
- helpStyle = lipgloss.NewStyle().
- Foreground(lipgloss.Color(241))
- listStyle = lipgloss.NewStyle().
- PaddingLeft(2)
- choiceStyle = lipgloss.NewStyle().PaddingLeft(4)
- selectedChoiceStyle = lipgloss.NewStyle().
- PaddingLeft(2).
- Foreground(lipgloss.Color("170"))
- dialogStyle = lipgloss.NewStyle().
- PaddingLeft(2).
- Width(78)
-)
-
-// Make a status type
-type status int
-
-// List item struct
-type item struct {
- title, desc string
-}
-
-// Functions needed for item struct
-func (i item) Title() string { return i.title }
-func (i item) Description() string { return i.desc }
-func (i item) FilterValue() string { return i.title }
-
-// Choice delegate (for our dialog boxes)
-type choiceDelegate struct{}
-
-func (d choiceDelegate) Height() int { return 1 }
-func (d choiceDelegate) Spacing() int { return 0 }
-func (d choiceDelegate) Update(msg tea.Msg, m *list.Model) tea.Cmd { return nil }
-func (d choiceDelegate) Render(w io.Writer, m list.Model, index int, listItem list.Item) {
- i, ok := listItem.(item)
- if !ok {
- return
- }
-
- str := i.title
-
- fn := choiceStyle.Render
- if index == m.Index() {
- fn = func(s ...string) string {
- return selectedChoiceStyle.Render("| " + strings.Join(s, " "))
- }
- }
-
- fmt.Fprint(w, fn(str))
-}
-
-// Main Model
-type model struct {
- fetched []bool
- lists []list.Model
- gpu_group string
- vbios_path string
- loaded bool
- focused status
- width int
- height int
-}
-
-// Consts used to navigate the main model
-const (
- INTRO status = iota
- GPUS
- GPU_GROUP
- VBIOS
- VIDEO
- USB
- USB_GROUP
- DONE
-)
-
-func (m *model) initLists(width, height int) {
- defaultList := list.New([]list.Item{}, list.NewDefaultDelegate(), 0, 10)
- choiceList := list.New([]list.Item{}, choiceDelegate{}, 0, 7)
-
- // Disable features we wont need
- defaultList.SetShowTitle(false)
- defaultList.SetFilteringEnabled(false)
- defaultList.SetSize(width, height)
- choiceList.SetShowTitle(false)
- choiceList.SetFilteringEnabled(false)
-
- // Add height and width to our model so we can use it later
- m.width = width
- m.height = height
-
- m.lists = []list.Model{
- choiceList,
- defaultList,
- defaultList,
- choiceList,
- choiceList,
- defaultList,
- defaultList,
- choiceList,
- }
- m.fetched = []bool{
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- }
- m.focused = INTRO
-
- // Init INTRO choices
- items := []list.Item{
- item{title: "CONTINUE"},
- }
- m.lists[INTRO].SetHeight(5)
- m.lists[INTRO].SetItems(items)
-
- // Init GPU list
- //m.lists[GPUS].Title = "Select a GPU to check the IOMMU groups of"
- items = StringList2ListItem(GetIOMMU("-g", "-F", "name,device_id,optional_revision"))
- m.lists[GPUS].SetItems(items)
- m.fetched[GPUS] = true
-
- m.lists[GPU_GROUP].Title = ""
- m.lists[GPU_GROUP].SetItems(items)
-
- // Init USB Controller list
- items = StringList2ListItem(GetIOMMU("-u", "-F", "name,device_id,optional_revision"))
- m.lists[USB].SetItems(items)
- m.fetched[USB] = true
-
- m.lists[USB_GROUP].Title = ""
- m.lists[USB_GROUP].SetItems(items)
-
- // Init VBIOS choices
- items = []list.Item{
- item{title: "OK"},
- }
- m.lists[VBIOS].SetItems(items)
-
- // Init VIDEO disable choises
- items = []list.Item{
- item{title: "YES"},
- item{title: "NO"},
- }
- m.lists[VIDEO].SetItems(items)
-
- // Init VIDEO disable choises
- items = []list.Item{
- item{title: "FINISH"},
- }
- m.lists[DONE].SetItems(items)
-}
-
-func (m model) Init() tea.Cmd {
- return nil
-}
-
-// This function processes the enter event
-func (m *model) processSelection() {
- switch m.focused {
- case GPUS:
- configs.InitConfigs()
-
- // Gets the selected item
- selectedItem := m.lists[m.focused].SelectedItem()
-
- // Gets the IOMMU group of the selected item
- iommu_group_regex := regexp.MustCompile(`(\d{1,3})`)
- iommu_group := iommu_group_regex.FindString(selectedItem.(item).desc)
-
- // Add the gpu group to our model
- m.gpu_group = iommu_group
-
- items := StringList2ListItem(GetIOMMU("-gr", "-i", m.gpu_group, "-F", "name,device_id,optional_revision"))
- m.lists[GPU_GROUP].SetItems(items)
-
- // Adjust height to correct for a bigger title
- m.lists[GPU_GROUP].SetSize(m.width, m.height-1)
-
- // Change focus to next index
- m.focused++
-
- case GPU_GROUP:
- // Generate the VBIOS dumper script once the user has selected a GPU
- GenerateVBIOSDumper(*m)
- m.focused++
-
- case USB:
- // Gets the selected item
- selectedItem := m.lists[m.focused].SelectedItem()
-
- // Gets the IOMMU group of the selected item
- iommu_group_regex := regexp.MustCompile(`(\d{1,3})`)
- iommu_group := iommu_group_regex.FindString(selectedItem.(item).desc)
-
- items := StringList2ListItem(GetIOMMU("-ur", "-i", iommu_group, "-F", "name,device_id,optional_revision"))
-
- m.lists[USB_GROUP].SetItems(items)
-
- // Adjust height to correct for a bigger title
- m.lists[USB_GROUP].SetSize(m.width, m.height-1)
-
- // Change focus to next index
- m.focused++
-
- case USB_GROUP:
- m.focused++
-
- case VBIOS:
- m.focused++
-
- case VIDEO:
- m.focused++
-
- case INTRO:
- m.focused++
-
- case DONE:
- os.Exit(0)
- }
-}
-
-func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
- switch msg := msg.(type) {
- case tea.KeyMsg:
- switch msg.String() {
- case "ctrl+c", "q":
- return m, tea.Quit
-
- case "enter":
- if m.loaded {
- m.processSelection()
- }
- case "ctrl+z", "backspace":
- if m.focused > 0 {
- m.focused--
- return m, nil
- } else {
- return m, tea.Quit
- }
- }
- case tea.WindowSizeMsg:
- if !m.loaded {
- // Get the terminal frame size
- //h, v := docStyle.GetFrameSize()
-
- // Initialize the static lists and make sure the content
- // does not extend past the screen
- m.initLists(msg.Width-2, msg.Height-2)
-
- // Set model loaded to true
- m.loaded = true
- }
- }
-
- var cmd tea.Cmd
- m.lists[m.focused], cmd = m.lists[m.focused].Update(msg)
- return m, cmd
-}
-
-func (m model) View() string {
- if m.loaded {
- title := ""
- switch m.focused {
- case INTRO:
- title = dialogStyle.Render(
- fmt.Sprint(
- titleStyle.Render("Welcome to QuickPassthrough!"),
- "\n\n",
- "This script is meant to make it easier to setup GPU passthrough for Qemu systems.\n",
- "However due to the complexity of GPU passthrough, this script assumes you know how to do (or have done) the following.\n\n",
- "* You have already enabled IOMMU, VT-d, SVM and/or AMD-v\n inside your UEFI/BIOS advanced settings.\n",
- "* Know how to edit your bootloader\n",
- "* Have a bootloader timeout of at least 3 seconds to access the menu\n",
- "* Enable & Configure kernel modules\n",
- "* Have a backup/snapshot of your system in case the script causes your\n system to be unbootable\n\n",
- "By continuing you accept that I am not liable if your system\n",
- "becomes unbootable, as you will be asked to verify the files generated",
- ),
- )
- case GPUS:
- title = titleStyle.Render(
- "Select a GPU to check the IOMMU groups of",
- )
-
- case GPU_GROUP:
- title = titleStyle.Render(
- fmt.Sprint(
- "Press ENTER/RETURN to set up all these devices for passthrough.\n",
- "This list should only contain items related to your GPU.",
- ),
- )
-
- case USB:
- title = titleStyle.Render(
- "[OPTIONAL]: Select a USB Controller to check the IOMMU groups of",
- )
-
- case USB_GROUP:
- title = titleStyle.Render(
- fmt.Sprint(
- "Press ENTER/RETURN to set up all these devices for passthrough.\n",
- "This list should only contain the USB controller you want to use.",
- ),
- )
-
- case VBIOS:
- // Get the program directory
- exe, _ := os.Executable()
- scriptdir := filepath.Dir(exe)
-
- // If we are using go run use the working directory instead
- if strings.Contains(scriptdir, "/tmp/go-build") {
- scriptdir, _ = os.Getwd()
- }
-
- text := dialogStyle.Render(
- fmt.Sprint(
- "Based on your GPU selection, a vbios extraction script has been generated for your convenience.\n",
- "Passing a VBIOS rom to the card used for passthrough is required for some cards, but not all.\n",
- "Some cards also requires you to patch your VBIOS romfile, check online if this is neccessary for your card!\n",
- "The VBIOS will be read from:\n",
- "%s\n\n",
- "The script to extract the vbios has to be run as sudo and without a displaymanager running for proper dumping!\n",
- "\n",
- "You can run the script with:\n",
- "%s/utils/dump_vbios.sh",
- ),
- )
-
- title = fmt.Sprintf(text, m.vbios_path, scriptdir)
-
- case VIDEO:
- title = dialogStyle.Render(
- fmt.Sprint(
- "Disabling video output in Linux for the card you want to use in a VM\n",
- "will make it easier to successfully do the passthrough without issues.\n",
- "\n",
- "Do you want to force disable video output in linux on this card?",
- ),
- )
-
- case DONE:
- title = dialogStyle.Render(
- fmt.Sprint(
- "The configuration files have been generated and are\n",
- "located inside the \"config\" folder\n",
- "\n",
- "* The \"cmdline\" file contains kernel arguments that your bootloader needs\n",
- "* The \"quickemu\" folder contains files that might be\n useable for quickemu in the future\n",
- "* The files inside the \"etc\" folder must be copied to your system.\n NOTE: Verify that these files are correctly formated/edited!\n",
- "\n",
- "A script file named \"install.sh\" has been generated, run it to copy the files to your system and make a backup of your old files.",
- ),
- )
- }
- //return listStyle.SetString(fmt.Sprintf("%s\n\n", title)).Render(m.lists[m.focused].View())
- return lipgloss.JoinVertical(lipgloss.Left, fmt.Sprintf("%s\n%s\n", title, listStyle.Render(m.lists[m.focused].View())))
- } else {
- return "Loading..."
- }
-}
-
-func NewModel() *model {
- // Create a blank model and return it
- return &model{}
-}
-
-// This is where we build everything
-func App() {
- // Make a blank model to keep our state in
- m := NewModel()
-
- // Start the program with the model
- p := tea.NewProgram(m, tea.WithAltScreen())
- _, err := p.Run()
- errorcheck.ErrorCheck(err, "Failed to initialize UI")
-}
-
-func GetIOMMU(args ...string) []string {
- var stdout, stderr bytes.Buffer
-
- // Configure the ls-iommu command
- cmd := exec.Command("utils/ls-iommu", args...)
- cmd.Stderr = &stderr
- cmd.Stdout = &stdout
-
- // Execute the command
- err := cmd.Run()
-
- // If ls-iommu returns an error then IOMMU is disabled
- errorcheck.ErrorCheck(err, "IOMMU disabled in either UEFI/BIOS or in bootloader!")
-
- // Read the output
- var items []string
- output, _ := io.ReadAll(&stdout)
-
- // Parse the output line by line
- scanner := bufio.NewScanner(strings.NewReader(string(output)))
- for scanner.Scan() {
- // Write the objects into the list
- items = append(items, scanner.Text())
- }
-
- // Return our list of items
- return items
-}
-
-func StringList2ListItem(stringList []string) []list.Item {
- // Make the []list.Item struct
- items := []list.Item{}
-
- // Parse the output line by line
- for _, v := range stringList {
- // Get the current line and split by :
- objects := strings.Split(v, ": ")
- // Write the objects into the list
- items = append(items, item{title: objects[1], desc: objects[0]})
- }
-
- // Return our list of items
- return items
-}
-
-func GenerateVBIOSDumper(m model) {
- // Get the vbios path
- m.vbios_path = GetIOMMU("-g", "-i", m.gpu_group, "--rom")[0]
-
- // Get the config directories
- config := configs.GetConfigPaths()
-
- // Get the program directory
- exe, _ := os.Executable()
- scriptdir := filepath.Dir(exe)
-
- // If we are using go run use the working directory instead
- if strings.Contains(scriptdir, "/tmp/go-build") {
- scriptdir, _ = os.Getwd()
- }
-
- vbios_script_template := fmt.Sprint(
- "#!/bin/bash\n",
- "# THIS FILE IS AUTO GENERATED!\n",
- "# IF YOU HAVE CHANGED GPU, PLEASE RE-RUN QUICKPASSTHROUGH!\n",
- "echo 1 | sudo tee %s\n",
- "sudo bash -c \"cat %s\" > %s/%s/vfio_card.rom\n",
- "echo 0 | sudo tee %s\n",
- )
-
- vbios_script := fmt.Sprintf(
- vbios_script_template,
- m.vbios_path,
- m.vbios_path,
- scriptdir,
- config.QUICKEMU,
- m.vbios_path,
- )
-
- scriptfile, err := os.Create("utils/dump_vbios.sh")
- errorcheck.ErrorCheck(err, "Cannot create file \"utils/dump_vbios.sh\"")
- defer scriptfile.Close()
-
- // Make the script executable
- scriptfile.Chmod(0775)
- errorcheck.ErrorCheck(err, "Could not change permissions of \"utils/dump_vbios.sh\"")
-
- // Write the script
- scriptfile.WriteString(vbios_script)
-}
diff --git a/internal/ui_main.go b/internal/ui_main.go
new file mode 100644
index 0000000..13fbdc3
--- /dev/null
+++ b/internal/ui_main.go
@@ -0,0 +1,77 @@
+package internal
+
+// A simple example demonstrating the use of multiple text input components
+// from the Bubbles component library.
+
+import (
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ tea "github.com/charmbracelet/bubbletea"
+)
+
+func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+ var cmd tea.Cmd
+ switch msg := msg.(type) {
+ case tea.KeyMsg:
+ // Setup keybindings
+ switch msg.String() {
+ case "ctrl+c", "q":
+ // Exit when user presses Q or CTRL+C
+ return m, tea.Quit
+
+ case "enter":
+ if m.loaded {
+ // Process the selected item
+ m.processSelection()
+ }
+ case "ctrl+z", "backspace":
+ // Go backwards in the model
+ if m.focused > 0 {
+ m.focused--
+ return m, nil
+ } else {
+ // If we are at the beginning, just exit
+ return m, tea.Quit
+ }
+ }
+ case tea.WindowSizeMsg:
+ if !m.loaded {
+ // Initialize the static lists and make sure the content
+ // does not extend past the screen
+ m.initLists(msg.Width, msg.Height)
+
+ // Set model loaded to true
+ m.loaded = true
+ } else {
+ // Else we are loaded and will update the sizing on the fly
+ m.height = msg.Height
+ m.width = msg.Width
+
+ // TODO: Find a better way to resize widgets when word wrapping happens
+ // BUG: currently breaks the UI rendering if word wrapping happens in some cases...
+ views := len(m.lists)
+ if msg.Width > 83 {
+ for i := 0; i < views; i++ {
+ m.lists[i].SetSize(m.width-m.offsetx[i], m.height-m.offsety[i])
+ // Update the styles with the correct width
+ dialogStyle = dialogStyle.Width(m.width)
+ listStyle = listStyle.Width(m.width)
+ titleStyle = titleStyle.Width(m.width - 2)
+ choiceStyle = choiceStyle.Width(m.width)
+ }
+ }
+ }
+ }
+ m.lists[m.focused], cmd = m.lists[m.focused].Update(msg)
+ return m, cmd
+}
+
+// This is where we build everything
+func Tui() {
+ // Make a blank model to keep our state in
+ m := NewModel()
+
+ // Start the program with the model
+ p := tea.NewProgram(m, tea.WithAltScreen())
+ _, err := p.Run()
+ errorcheck.ErrorCheck(err, "Failed to initialize UI")
+}
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
new file mode 100644
index 0000000..b851f3b
--- /dev/null
+++ b/internal/ui_main_functions.go
@@ -0,0 +1,72 @@
+package internal
+
+import (
+ "os"
+ "regexp"
+
+ "github.com/HikariKnight/quickpassthrough/internal/configs"
+)
+
+// This function processes the enter event
+func (m *model) processSelection() {
+ switch m.focused {
+ case GPUS:
+ configs.InitConfigs()
+
+ // Gets the selected item
+ selectedItem := m.lists[m.focused].SelectedItem()
+
+ // Gets the IOMMU group of the selected item
+ iommu_group_regex := regexp.MustCompile(`(\d{1,3})`)
+ iommu_group := iommu_group_regex.FindString(selectedItem.(item).desc)
+
+ // Add the gpu group to our model (this is so we can grab the vbios details later)
+ m.gpu_group = iommu_group
+
+ // Get all the gpu devices and related devices (same device id or in the same group)
+ items := iommuList2ListItem(getIOMMU("-grr", "-i", m.gpu_group, "-F", "vendor:,prod_name,optional_revision:,device_id"))
+
+ // Add the devices to the list
+ m.lists[GPU_GROUP].SetItems(items)
+
+ // Change focus to next index
+ m.focused++
+
+ case GPU_GROUP:
+ // Generate the VBIOS dumper script once the user has selected a GPU
+ generateVBIOSDumper(*m)
+ m.focused++
+
+ case USB:
+ // Gets the selected item
+ selectedItem := m.lists[m.focused].SelectedItem()
+
+ // Gets the IOMMU group of the selected item
+ iommu_group_regex := regexp.MustCompile(`(\d{1,3})`)
+ iommu_group := iommu_group_regex.FindString(selectedItem.(item).desc)
+
+ // Get the USB controllers in the selected iommu group
+ items := iommuList2ListItem(getIOMMU("-ur", "-i", iommu_group, "-F", "vendor:,prod_name,optional_revision:,device_id"))
+
+ // Add the items to the list
+ m.lists[USB_GROUP].SetItems(items)
+
+ // Change focus to next index
+ m.focused++
+
+ case USB_GROUP:
+ m.focused++
+
+ case VBIOS:
+ m.focused++
+
+ case VIDEO:
+ m.focused++
+
+ case INTRO:
+ m.focused++
+
+ case DONE:
+ os.Exit(0)
+ }
+}
diff --git a/internal/ui_main_view.go b/internal/ui_main_view.go
new file mode 100644
index 0000000..53de41a
--- /dev/null
+++ b/internal/ui_main_view.go
@@ -0,0 +1,117 @@
+package internal
+
+import (
+ "fmt"
+ "os"
+ "path/filepath"
+ "strings"
+
+ "github.com/charmbracelet/lipgloss"
+)
+
+func (m model) View() string {
+ if m.loaded {
+ title := ""
+ switch m.focused {
+ case INTRO:
+ title = dialogStyle.Render(
+ fmt.Sprint(
+ titleStyle.MarginLeft(0).Render("Welcome to QuickPassthrough!"),
+ "\n\n",
+ "This script is meant to make it easier to setup GPU passthrough for\n",
+ "Qemu based systems.\n",
+ "However due to the complexity of GPU passthrough\n",
+ "This script assumes you know how to do (or have done) the following.\n\n",
+ "* You have already enabled IOMMU, VT-d, SVM and/or AMD-v\n inside your UEFI/BIOS advanced settings.\n",
+ "* Know how to edit your bootloader\n",
+ "* Have a bootloader timeout of at least 3 seconds to access the menu\n",
+ "* Enable & Configure kernel modules\n",
+ "* Have a backup/snapshot of your system in case the script causes your\n system to be unbootable\n\n",
+ "By continuing you accept that I am not liable if your system\n",
+ "becomes unbootable, as you will be asked to verify the files generated",
+ ),
+ )
+ case GPUS:
+ title = titleStyle.MarginLeft(2).Render(
+ "Select a GPU to check the IOMMU groups of",
+ )
+
+ case GPU_GROUP:
+ title = titleStyle.Render(
+ fmt.Sprint(
+ "Press ENTER/RETURN to set up all these devices for passthrough.\n",
+ "This list should only contain items related to your GPU.",
+ ),
+ )
+
+ case USB:
+ title = titleStyle.Render(
+ "[OPTIONAL]: Select a USB Controller to check the IOMMU groups of",
+ )
+
+ case USB_GROUP:
+ title = titleStyle.Render(
+ fmt.Sprint(
+ "Press ENTER/RETURN to set up all these devices for passthrough.\n",
+ "This list should only contain the USB controller you want to use.",
+ ),
+ )
+
+ case VBIOS:
+ // Get the program directory
+ exe, _ := os.Executable()
+ scriptdir := filepath.Dir(exe)
+
+ // If we are using go run use the working directory instead
+ if strings.Contains(scriptdir, "/tmp/go-build") {
+ scriptdir, _ = os.Getwd()
+ }
+
+ text := dialogStyle.Render(
+ fmt.Sprint(
+ "Based on your GPU selection, a vbios extraction script has been generated for your convenience.\n",
+ "Passing a VBIOS rom to the card used for passthrough is required for some cards, but not all.\n",
+ "Some cards also requires you to patch your VBIOS romfile, check online if this is neccessary for your card!\n",
+ "The VBIOS will be read from:\n",
+ "%s\n\n",
+ "The script to extract the vbios has to be run as sudo and without a displaymanager running for proper dumping!\n",
+ "\n",
+ "You can run the script with:\n",
+ "%s/utils/dump_vbios.sh",
+ ),
+ )
+
+ title = fmt.Sprintf(text, m.vbios_path, scriptdir)
+
+ case VIDEO:
+ title = dialogStyle.Render(
+ fmt.Sprint(
+ "Disabling video output in Linux for the card you want to use in a VM\n",
+ "will make it easier to successfully do the passthrough without issues.\n",
+ "\n",
+ "Do you want to force disable video output in linux on this card?",
+ ),
+ )
+
+ case DONE:
+ title = dialogStyle.Render(
+ fmt.Sprint(
+ "The configuration files have been generated and are\n",
+ "located inside the \"config\" folder\n",
+ "\n",
+ "* The \"cmdline\" file contains kernel arguments that your bootloader needs\n",
+ "* The \"quickemu\" folder contains files that might be\n useable for quickemu in the future\n",
+ "* The files inside the \"etc\" folder must be copied to your system.\n",
+ " NOTE: Verify that these files are correctly formated/edited!\n",
+ "\n",
+ "A script file named \"install.sh\" has been generated,\n",
+ "run it to copy the files to your system and make a backup of your old files.",
+ ),
+ )
+ }
+ //return listStyle.SetString(fmt.Sprintf("%s\n\n", title)).Render(m.lists[m.focused].View())
+ return lipgloss.JoinVertical(lipgloss.Left, fmt.Sprintf("%s\n%s\n", title, listStyle.Render(m.lists[m.focused].View())))
+ } else {
+ return "Loading..."
+ }
+}
diff --git a/internal/ui_model.go b/internal/ui_model.go
new file mode 100644
index 0000000..bbe3549
--- /dev/null
+++ b/internal/ui_model.go
@@ -0,0 +1,154 @@
+package internal
+
+import (
+ "github.com/charmbracelet/bubbles/list"
+ tea "github.com/charmbracelet/bubbletea"
+)
+
+// Make a status type
+type status int
+
+// List item struct
+type item struct {
+ title, desc string
+}
+
+// Functions needed for item struct
+func (i item) Title() string { return i.title }
+func (i item) Description() string { return i.desc }
+func (i item) FilterValue() string { return i.title }
+
+// Main Model
+type model struct {
+ fetched []bool
+ lists []list.Model
+ gpu_group string
+ vbios_path string
+ loaded bool
+ focused status
+ offsetx []int
+ offsety []int
+ width int
+ height int
+}
+
+// Consts used to navigate the main model
+const (
+ INTRO status = iota
+ GPUS
+ GPU_GROUP
+ VBIOS
+ VIDEO
+ USB
+ USB_GROUP
+ DONE
+)
+
+func NewModel() *model {
+ // Create a blank model and return it
+ return &model{}
+}
+
+func (m model) Init() tea.Cmd {
+ return nil
+}
+
+func (m *model) initLists(width, height int) {
+ defaultList := list.New([]list.Item{}, list.NewDefaultDelegate(), 0, 10)
+ choiceList := list.New([]list.Item{}, choiceDelegate{}, 0, 7)
+
+ // Disable features we wont need
+ defaultList.SetShowTitle(false)
+ defaultList.SetFilteringEnabled(false)
+ defaultList.SetSize(m.width, m.height)
+ choiceList.SetShowTitle(false)
+ choiceList.SetFilteringEnabled(false)
+
+ // Add height and width to our model so we can use it later
+ m.width = width
+ m.height = height
+
+ m.lists = []list.Model{
+ choiceList,
+ defaultList,
+ defaultList,
+ choiceList,
+ choiceList,
+ defaultList,
+ defaultList,
+ choiceList,
+ }
+
+ // Configure offsets for sizing
+ m.offsetx = []int{
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ }
+ m.offsety = []int{
+ 18, 2, 3, 13, 5, 2, 3, 12,
+ }
+
+ // Update the styles with the correct width
+ dialogStyle = dialogStyle.Width(m.width)
+ listStyle = listStyle.Width(m.width)
+ titleStyle = titleStyle.Width(m.width - 2)
+ choiceStyle = choiceStyle.Width(m.width)
+
+ // Make m.fetched and set all values to FALSE
+ m.fetched = []bool{}
+ for range m.lists {
+ m.fetched = append(m.fetched, false)
+ }
+
+ // Set INTRO to the focused view
+ m.focused = INTRO
+
+ // Init INTRO choices
+ items := []list.Item{
+ item{title: "CONTINUE"},
+ }
+ //m.lists[INTRO].SetHeight(5)
+ m.lists[INTRO].SetItems(items)
+ m.lists[INTRO].SetSize(m.width-m.offsetx[INTRO], m.height-m.offsety[INTRO])
+
+ // Init GPU list
+ items = iommuList2ListItem(getIOMMU("-g", "-F", "vendor:,prod_name,optional_revision:,device_id"))
+ m.lists[GPUS].SetItems(items)
+ m.lists[GPUS].SetSize(m.width-m.offsetx[GPUS], m.height-m.offsety[GPUS])
+ m.fetched[GPUS] = true
+
+ // Setup the initial GPU_GROUP list
+ // The content in this list is generated from the selected choice from the GPU view
+ m.lists[GPU_GROUP].SetSize(m.width-m.offsetx[GPU_GROUP], m.height-m.offsety[GPU_GROUP])
+
+ // Init USB Controller list
+ items = iommuList2ListItem(getIOMMU("-u", "-F", "vendor:,prod_name,optional_revision:,device_id"))
+ m.lists[USB].SetItems(items)
+ m.lists[USB].SetSize(m.width-m.offsetx[USB], m.height-m.offsety[USB])
+ m.fetched[USB] = true
+
+ // Setup the initial USB_GROUP list
+ // The content in this list is generated from the selected choice from the USB view
+ m.lists[USB_GROUP].SetSize(m.width-m.offsetx[USB_GROUP], m.height-m.offsety[USB_GROUP])
+
+ // Init VBIOS choices
+ items = []list.Item{
+ item{title: "OK"},
+ }
+ m.lists[VBIOS].SetItems(items)
+ m.lists[VBIOS].SetSize(m.width-m.offsetx[VBIOS], m.height-m.offsety[VBIOS])
+
+ // Init VIDEO disable choises
+ items = []list.Item{
+ item{title: "YES"},
+ item{title: "NO"},
+ }
+ m.lists[VIDEO].SetItems(items)
+ m.lists[VIDEO].SetSize(m.width-m.offsetx[VIDEO], m.height-m.offsety[VIDEO])
+
+ // Init DONE choises
+ items = []list.Item{
+ item{title: "FINISH"},
+ }
+ m.lists[DONE].SetItems(items)
+ m.lists[DONE].SetSize(m.width-m.offsetx[DONE], m.height-m.offsety[DONE])
+}
diff --git a/internal/ui_style.go b/internal/ui_style.go
new file mode 100644
index 0000000..d6784af
--- /dev/null
+++ b/internal/ui_style.go
@@ -0,0 +1,55 @@
+package internal
+
+import (
+ "fmt"
+ "io"
+ "strings"
+
+ "github.com/charmbracelet/bubbles/list"
+ tea "github.com/charmbracelet/bubbletea"
+ "github.com/charmbracelet/lipgloss"
+)
+
+var (
+ titleStyle = lipgloss.NewStyle().
+ Background(lipgloss.Color("#5F5FD7")).
+ Foreground(lipgloss.Color("#FFFFFF")).
+ PaddingLeft(2).PaddingRight(2)
+ helpStyle = lipgloss.NewStyle().
+ Foreground(lipgloss.Color(241))
+ listStyle = lipgloss.NewStyle().
+ PaddingLeft(2).
+ PaddingRight(2)
+ choiceStyle = lipgloss.NewStyle().
+ PaddingLeft(4).
+ PaddingRight(4)
+ selectedChoiceStyle = lipgloss.NewStyle().
+ PaddingLeft(2).
+ Foreground(lipgloss.Color("170"))
+ dialogStyle = lipgloss.NewStyle().
+ PaddingLeft(2)
+)
+
+// Choice delegate (for our dialog boxes)
+type choiceDelegate struct{}
+
+func (d choiceDelegate) Height() int { return 1 }
+func (d choiceDelegate) Spacing() int { return 0 }
+func (d choiceDelegate) Update(msg tea.Msg, m *list.Model) tea.Cmd { return nil }
+func (d choiceDelegate) Render(w io.Writer, m list.Model, index int, listItem list.Item) {
+ i, ok := listItem.(item)
+ if !ok {
+ return
+ }
+
+ str := i.title
+
+ fn := choiceStyle.Render
+ if index == m.Index() {
+ fn = func(s ...string) string {
+ return selectedChoiceStyle.Render("| " + strings.Join(s, " "))
+ }
+ }
+
+ fmt.Fprint(w, fn(str))
+}
diff --git a/internal/utiil_ls-iommu.go b/internal/utiil_ls-iommu.go
new file mode 100644
index 0000000..11259fa
--- /dev/null
+++ b/internal/utiil_ls-iommu.go
@@ -0,0 +1,61 @@
+package internal
+
+import (
+ "bufio"
+ "bytes"
+ "fmt"
+ "io"
+ "os/exec"
+ "regexp"
+ "strings"
+
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/charmbracelet/bubbles/list"
+)
+
+func getIOMMU(args ...string) []string {
+ var stdout, stderr bytes.Buffer
+
+ // Configure the ls-iommu command
+ cmd := exec.Command("utils/ls-iommu", args...)
+ cmd.Stderr = &stderr
+ cmd.Stdout = &stdout
+
+ // Execute the command
+ err := cmd.Run()
+
+ // If ls-iommu returns an error then IOMMU is disabled
+ errorcheck.ErrorCheck(err, "IOMMU disabled in either UEFI/BIOS or in bootloader!")
+
+ // Read the output
+ var items []string
+ output, _ := io.ReadAll(&stdout)
+
+ // Parse the output line by line
+ scanner := bufio.NewScanner(strings.NewReader(string(output)))
+ for scanner.Scan() {
+ // Write the objects into the list
+ items = append(items, scanner.Text())
+ }
+
+ // Return our list of items
+ return items
+}
+
+func iommuList2ListItem(stringList []string) []list.Item {
+ // Make the []list.Item struct
+ items := []list.Item{}
+
+ deviceID := regexp.MustCompile(`\[[a-f0-9]{4}:[a-f0-9]{4}\]\s+`)
+ // Parse the output line by line
+ for _, v := range stringList {
+ // Get the current line and split by :
+ objects := strings.Split(v, ": ")
+
+ // Write the objects into the list
+ items = append(items, item{title: deviceID.ReplaceAllString(objects[2], ""), desc: fmt.Sprintf("%s: %s: DeviceID: %s", objects[0], objects[1], objects[3])})
+ }
+
+ // Return our list of items
+ return items
+}
diff --git a/internal/untar/untar.go b/pkg/untar/untar.go
similarity index 85%
rename from internal/untar/untar.go
rename to pkg/untar/untar.go
index ee605b0..96ab454 100644
--- a/internal/untar/untar.go
+++ b/pkg/untar/untar.go
@@ -3,6 +3,7 @@ package untar
import (
"archive/tar"
"compress/gzip"
+ "fmt"
"io"
"os"
"path/filepath"
@@ -10,13 +11,13 @@ import (
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
)
-// Source: https://medium.com/@skdomino/taring-untaring-files-in-go-6b07cf56bc07
+// Slightly modified from source: https://medium.com/@skdomino/taring-untaring-files-in-go-6b07cf56bc07
-// Untar takes a destination path and a reader; a tar reader loops over the tarfile
+// Untar takes a destination path and a path to a file; a tar reader loops over the tarfile
// creating the file structure at 'dst' along the way, and writing any files
func Untar(dst string, fileName string) error {
r, err := os.Open(fileName)
- errorcheck.ErrorCheck(err)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Failed to open: %s", fileName))
defer r.Close()
gzr, err := gzip.NewReader(r)
From c3be59660d758224ed0bd8475ed0ab609061d15c Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 8 Apr 2023 19:40:37 +0200
Subject: [PATCH 024/132] Split main model update function into an events file
---
internal/ui_main.go | 57 ------------------------------------
internal/ui_main_events.go | 60 ++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 57 deletions(-)
create mode 100644 internal/ui_main_events.go
diff --git a/internal/ui_main.go b/internal/ui_main.go
index 13fbdc3..a8f19c4 100644
--- a/internal/ui_main.go
+++ b/internal/ui_main.go
@@ -8,63 +8,6 @@ import (
tea "github.com/charmbracelet/bubbletea"
)
-func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
- var cmd tea.Cmd
- switch msg := msg.(type) {
- case tea.KeyMsg:
- // Setup keybindings
- switch msg.String() {
- case "ctrl+c", "q":
- // Exit when user presses Q or CTRL+C
- return m, tea.Quit
-
- case "enter":
- if m.loaded {
- // Process the selected item
- m.processSelection()
- }
- case "ctrl+z", "backspace":
- // Go backwards in the model
- if m.focused > 0 {
- m.focused--
- return m, nil
- } else {
- // If we are at the beginning, just exit
- return m, tea.Quit
- }
- }
- case tea.WindowSizeMsg:
- if !m.loaded {
- // Initialize the static lists and make sure the content
- // does not extend past the screen
- m.initLists(msg.Width, msg.Height)
-
- // Set model loaded to true
- m.loaded = true
- } else {
- // Else we are loaded and will update the sizing on the fly
- m.height = msg.Height
- m.width = msg.Width
-
- // TODO: Find a better way to resize widgets when word wrapping happens
- // BUG: currently breaks the UI rendering if word wrapping happens in some cases...
- views := len(m.lists)
- if msg.Width > 83 {
- for i := 0; i < views; i++ {
- m.lists[i].SetSize(m.width-m.offsetx[i], m.height-m.offsety[i])
- // Update the styles with the correct width
- dialogStyle = dialogStyle.Width(m.width)
- listStyle = listStyle.Width(m.width)
- titleStyle = titleStyle.Width(m.width - 2)
- choiceStyle = choiceStyle.Width(m.width)
- }
- }
- }
- }
- m.lists[m.focused], cmd = m.lists[m.focused].Update(msg)
- return m, cmd
-}
-
// This is where we build everything
func Tui() {
// Make a blank model to keep our state in
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
new file mode 100644
index 0000000..d290ffb
--- /dev/null
+++ b/internal/ui_main_events.go
@@ -0,0 +1,60 @@
+package internal
+
+import tea "github.com/charmbracelet/bubbletea"
+
+func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
+ var cmd tea.Cmd
+ switch msg := msg.(type) {
+ case tea.KeyMsg:
+ // Setup keybindings
+ switch msg.String() {
+ case "ctrl+c", "q":
+ // Exit when user presses Q or CTRL+C
+ return m, tea.Quit
+
+ case "enter":
+ if m.loaded {
+ // Process the selected item
+ m.processSelection()
+ }
+ case "ctrl+z", "backspace":
+ // Go backwards in the model
+ if m.focused > 0 {
+ m.focused--
+ return m, nil
+ } else {
+ // If we are at the beginning, just exit
+ return m, tea.Quit
+ }
+ }
+ case tea.WindowSizeMsg:
+ if !m.loaded {
+ // Initialize the static lists and make sure the content
+ // does not extend past the screen
+ m.initLists(msg.Width, msg.Height)
+
+ // Set model loaded to true
+ m.loaded = true
+ } else {
+ // Else we are loaded and will update the sizing on the fly
+ m.height = msg.Height
+ m.width = msg.Width
+
+ // TODO: Find a better way to resize widgets when word wrapping happens
+ // BUG: currently breaks the UI rendering if word wrapping happens in some cases...
+ views := len(m.lists)
+ if msg.Width > 83 {
+ for i := 0; i < views; i++ {
+ m.lists[i].SetSize(m.width-m.offsetx[i], m.height-m.offsety[i])
+ // Update the styles with the correct width
+ dialogStyle = dialogStyle.Width(m.width)
+ listStyle = listStyle.Width(m.width)
+ titleStyle = titleStyle.Width(m.width - 2)
+ choiceStyle = choiceStyle.Width(m.width)
+ }
+ }
+ }
+ }
+ m.lists[m.focused], cmd = m.lists[m.focused].Update(msg)
+ return m, cmd
+}
From ef3760879bff4866c47d9307ae93090a6bd7527b Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 8 Apr 2023 23:40:23 +0200
Subject: [PATCH 025/132] cleanup of the code and add more data to config
---
go.mod | 1 +
go.sum | 3 +++
internal/configs/config_inits.go | 28 ++++++++++++++++++++++
internal/configs/configs.go | 40 +++++++++++++++++++++++++-------
internal/ui_main_functions.go | 7 ++++--
pkg/command/command.go | 30 ++++++++++++++++++++++++
6 files changed, 99 insertions(+), 10 deletions(-)
create mode 100644 internal/configs/config_inits.go
create mode 100644 pkg/command/command.go
diff --git a/go.mod b/go.mod
index a37bab6..14e9eec 100644
--- a/go.mod
+++ b/go.mod
@@ -9,6 +9,7 @@ require (
github.com/charmbracelet/bubbles v0.15.0
github.com/charmbracelet/bubbletea v0.23.2
github.com/charmbracelet/lipgloss v0.7.1
+ github.com/klauspost/cpuid/v2 v2.2.4
)
require (
diff --git a/go.sum b/go.sum
index f82d8f1..43838bd 100644
--- a/go.sum
+++ b/go.sum
@@ -21,6 +21,8 @@ github.com/charmbracelet/lipgloss v0.7.1 h1:17WMwi7N1b1rVWOjMT+rCh7sQkvDU75B2hbZ
github.com/charmbracelet/lipgloss v0.7.1/go.mod h1:yG0k3giv8Qj8edTCbbg6AlQ5e8KNWpFujkNawKNhE2c=
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
+github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
+github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@@ -62,6 +64,7 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
diff --git a/internal/configs/config_inits.go b/internal/configs/config_inits.go
new file mode 100644
index 0000000..0e2b6c5
--- /dev/null
+++ b/internal/configs/config_inits.go
@@ -0,0 +1,28 @@
+package configs
+
+import (
+ "github.com/HikariKnight/quickpassthrough/pkg/command"
+)
+
+func getBootloader(config *Config) {
+ // Check what bootloader handler we are using
+ // Check for grub-mkconfig
+ _, err := command.Run("which", "grub-mkconfig")
+ if err == nil {
+ // Mark bootloader as grub2
+ config.bootloader = "grub2"
+ }
+
+ // Check for grubby (used by fedora)
+ _, err = command.Run("which", "grubby")
+ if err == nil {
+ // Mark it as unknown as i do not support it yet
+ config.bootloader = "unknown"
+ }
+
+ // Check for kernelstub (used by pop os)
+ _, err = command.Run("which", "kernelstub")
+ if err == nil {
+ config.bootloader = "kernelstub"
+ }
+}
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index 287fe2c..8ab3cbb 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -7,6 +7,7 @@ import (
"regexp"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/klauspost/cpuid/v2"
)
type Path struct {
@@ -19,6 +20,12 @@ type Path struct {
MKINITCPIO string
}
+type Config struct {
+ bootloader string
+ cpuvendor string
+ path *Path
+}
+
func GetConfigPaths() *Path {
Paths := &Path{
MODPROBE: "config/etc/modprobe.d",
@@ -33,14 +40,30 @@ func GetConfigPaths() *Path {
return Paths
}
+func GetConfig() *Config {
+ config := &Config{}
+ config.path = GetConfigPaths()
+
+ // Set default value for bootloader
+ config.bootloader = "unknown"
+
+ // Detect the bootloader we are using
+ getBootloader(config)
+
+ // Detect the cpu vendor
+ config.cpuvendor = cpuid.CPU.VendorID.String()
+
+ return config
+}
+
func InitConfigs() {
- config := GetConfigPaths()
+ config := GetConfig()
dirs := []string{
- config.MODPROBE,
- config.INITRAMFS,
- config.DEFAULT,
- config.DRACUT,
+ config.path.MODPROBE,
+ config.path.INITRAMFS,
+ config.path.DEFAULT,
+ config.path.DRACUT,
}
// Remove old config
@@ -63,9 +86,10 @@ func InitConfigs() {
}
files := []string{
- config.ETCMODULES,
- config.MKINITCPIO,
- fmt.Sprintf("%s/modules", config.INITRAMFS),
+ config.path.ETCMODULES,
+ config.path.MKINITCPIO,
+ fmt.Sprintf("%s/modules", config.path.INITRAMFS),
+ fmt.Sprintf("%s/grub", config.path.DEFAULT),
}
for _, conffile := range files {
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index b851f3b..df63532 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -11,8 +11,6 @@ import (
func (m *model) processSelection() {
switch m.focused {
case GPUS:
- configs.InitConfigs()
-
// Gets the selected item
selectedItem := m.lists[m.focused].SelectedItem()
@@ -58,12 +56,17 @@ func (m *model) processSelection() {
m.focused++
case VBIOS:
+ // This is just an OK Dialog
m.focused++
case VIDEO:
+ // This is a YESNO Dialog
m.focused++
case INTRO:
+ // This is an OK Dialog
+ // Create the config folder and the files related to this system
+ configs.InitConfigs()
m.focused++
case DONE:
diff --git a/pkg/command/command.go b/pkg/command/command.go
new file mode 100644
index 0000000..26978c6
--- /dev/null
+++ b/pkg/command/command.go
@@ -0,0 +1,30 @@
+package command
+
+import (
+ "bytes"
+ "io"
+ "os/exec"
+)
+
+func Run(binary string, args ...string) ([]string, error) {
+ var stdout, stderr bytes.Buffer
+
+ // Configure the ls-iommu c--ommand
+ cmd := exec.Command(binary, args...)
+ cmd.Stderr = &stderr
+ cmd.Stdout = &stdout
+
+ // Execute the command
+ err := cmd.Run()
+
+ // Read the output
+ output, _ := io.ReadAll(&stdout)
+ outerr, _ := io.ReadAll(&stderr)
+
+ outputs := []string{}
+ outputs = append(outputs, string(output))
+ outputs = append(outputs, string(outerr))
+
+ // Return our list of items
+ return outputs, err
+}
From b8c590218b6a5a4c17c00a82d921ff3926c32b78 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 03:19:12 +0200
Subject: [PATCH 026/132] add uname functionality, kinda
---
pkg/uname/uname.go | 56 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100644 pkg/uname/uname.go
diff --git a/pkg/uname/uname.go b/pkg/uname/uname.go
new file mode 100644
index 0000000..4a87c62
--- /dev/null
+++ b/pkg/uname/uname.go
@@ -0,0 +1,56 @@
+package uname
+
+import "syscall"
+
+type Uname struct {
+ Sysname string
+ Nodename string
+ Hostname string
+ Release string
+ Kernel string
+ Version string
+ Machine string
+ Arch string
+ Domainname string
+}
+
+// A utility to convert int8 values to proper strings.
+func int8ToStr(arr []int8) string {
+ b := make([]byte, 0, len(arr))
+ for _, v := range arr {
+ if v == 0x00 {
+ break
+ }
+ b = append(b, byte(v))
+ }
+ return string(b)
+}
+
+func New() *Uname {
+ var system syscall.Utsname
+ uname := &Uname{}
+ if err := syscall.Uname(&system); err == nil {
+ // extract members:
+ // type Utsname struct {
+ // Sysname [65]int8
+ // Nodename [65]int8
+ // Release [65]int8
+ // Version [65]int8
+ // Machine [65]int8
+ // Domainname [65]int8
+ // }
+
+ // Add to the uname struct for humans
+ uname.Sysname = int8ToStr(system.Sysname[:])
+ uname.Nodename = int8ToStr(system.Nodename[:])
+ uname.Hostname = uname.Nodename
+ uname.Release = int8ToStr(system.Release[:])
+ uname.Kernel = uname.Release
+ uname.Version = int8ToStr(system.Version[:])
+ uname.Machine = int8ToStr(system.Machine[:])
+ uname.Arch = uname.Machine
+ uname.Domainname = int8ToStr(system.Domainname[:])
+ }
+
+ return uname
+}
From e03c27bf7730a87be380dc7ad5122ebd773abcc4 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 03:19:35 +0200
Subject: [PATCH 027/132] Split bootloader section into its own file
---
internal/configs/config_bootloaders.go | 28 ++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 internal/configs/config_bootloaders.go
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
new file mode 100644
index 0000000..0e2b6c5
--- /dev/null
+++ b/internal/configs/config_bootloaders.go
@@ -0,0 +1,28 @@
+package configs
+
+import (
+ "github.com/HikariKnight/quickpassthrough/pkg/command"
+)
+
+func getBootloader(config *Config) {
+ // Check what bootloader handler we are using
+ // Check for grub-mkconfig
+ _, err := command.Run("which", "grub-mkconfig")
+ if err == nil {
+ // Mark bootloader as grub2
+ config.bootloader = "grub2"
+ }
+
+ // Check for grubby (used by fedora)
+ _, err = command.Run("which", "grubby")
+ if err == nil {
+ // Mark it as unknown as i do not support it yet
+ config.bootloader = "unknown"
+ }
+
+ // Check for kernelstub (used by pop os)
+ _, err = command.Run("which", "kernelstub")
+ if err == nil {
+ config.bootloader = "kernelstub"
+ }
+}
From 8c35e8d3285d3aeee2886348bd436ba974547fe5 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 03:20:56 +0200
Subject: [PATCH 028/132] Add initramfs functions
---
internal/configs/config_initramfstools.go | 83 +++++++++++++++++++++++
internal/configs/config_inits.go | 28 --------
2 files changed, 83 insertions(+), 28 deletions(-)
create mode 100644 internal/configs/config_initramfstools.go
delete mode 100644 internal/configs/config_inits.go
diff --git a/internal/configs/config_initramfstools.go b/internal/configs/config_initramfstools.go
new file mode 100644
index 0000000..62eaffe
--- /dev/null
+++ b/internal/configs/config_initramfstools.go
@@ -0,0 +1,83 @@
+package configs
+
+import (
+ "bufio"
+ "fmt"
+ "os"
+ "regexp"
+ "strings"
+
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/HikariKnight/quickpassthrough/pkg/uname"
+)
+
+func readHeader(lines int, fileName string) string {
+ // Open the file
+ f, err := os.Open(fileName)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Error opening %s", fileName))
+ defer f.Close()
+
+ header_re := regexp.MustCompile(`^#`)
+ var header []string
+
+ // Make a new scanner
+ scanner := bufio.NewScanner(f)
+
+ // Read the first N lines
+ for i := 0; i < lines; i++ {
+ scanner.Scan()
+ if header_re.MatchString(scanner.Text()) {
+ header = append(header, scanner.Text())
+ }
+ }
+
+ // Return the header
+ return fmt.Sprintf("%s\n", strings.Join(header, "\n"))
+}
+
+func addModules(conffile string) {
+ // Make a regex to get the system path instead of the config path
+ syspath_re := regexp.MustCompile(`^config`)
+
+ // Make a regex to skip specific modules and comments
+ skipmodules_re := regexp.MustCompile(`(^#|vendor-reset)`)
+
+ // Get the syspath
+ syspath := syspath_re.ReplaceAllString(conffile, "")
+
+ // Open the system file for reading
+ sysfile, err := os.Open(syspath)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Error opening file for reading %s", syspath))
+ defer sysfile.Close()
+
+ // Open config file for writing
+ out, err := os.OpenFile(conffile, os.O_APPEND|os.O_WRONLY, os.ModePerm)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Error opening file for writing %s", conffile))
+ defer out.Close()
+
+ // Make a list of modules
+ //var modules []string
+
+ // Scan the file line by line
+ scanner := bufio.NewScanner(sysfile)
+ for scanner.Scan() {
+ if scanner.Text() == "vendor-reset" {
+ out.WriteString(scanner.Text())
+ } else if !skipmodules_re.MatchString(scanner.Text()) {
+ writeContent(fmt.Sprintf("%s\n", scanner.Text()), conffile)
+ sysinfo := uname.New()
+ writeContent(fmt.Sprintf("%s\n%s\n%s\n%s\n", sysinfo.Nodename, sysinfo.Sysname, sysinfo.Domainname, sysinfo.Machine), conffile)
+ }
+ }
+}
+
+func writeContent(content string, fileName string) {
+ // Open the file
+ f, err := os.OpenFile(fileName, os.O_APPEND|os.O_WRONLY, os.ModePerm)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Error opening %s", fileName))
+ defer f.Close()
+
+ // Make a new scanner
+ _, err = f.WriteString(content)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Error writing to %s", fileName))
+}
diff --git a/internal/configs/config_inits.go b/internal/configs/config_inits.go
deleted file mode 100644
index 0e2b6c5..0000000
--- a/internal/configs/config_inits.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package configs
-
-import (
- "github.com/HikariKnight/quickpassthrough/pkg/command"
-)
-
-func getBootloader(config *Config) {
- // Check what bootloader handler we are using
- // Check for grub-mkconfig
- _, err := command.Run("which", "grub-mkconfig")
- if err == nil {
- // Mark bootloader as grub2
- config.bootloader = "grub2"
- }
-
- // Check for grubby (used by fedora)
- _, err = command.Run("which", "grubby")
- if err == nil {
- // Mark it as unknown as i do not support it yet
- config.bootloader = "unknown"
- }
-
- // Check for kernelstub (used by pop os)
- _, err = command.Run("which", "kernelstub")
- if err == nil {
- config.bootloader = "kernelstub"
- }
-}
From a2e641f8677a61a269bcf7dc95f7e89e89f96b7f Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 03:21:25 +0200
Subject: [PATCH 029/132] port more of the bash config
---
internal/configs/configs.go | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index 8ab3cbb..a49c3b2 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -59,6 +59,7 @@ func GetConfig() *Config {
func InitConfigs() {
config := GetConfig()
+ // Add all directories we need into a stringlist
dirs := []string{
config.path.MODPROBE,
config.path.INITRAMFS,
@@ -85,6 +86,7 @@ func InitConfigs() {
}
}
+ // Add all files we need to a stringlist
files := []string{
config.path.ETCMODULES,
config.path.MKINITCPIO,
@@ -101,7 +103,16 @@ func InitConfigs() {
// Create the directories for our configs
file, err := os.Create(conffile)
errorcheck.ErrorCheck(err)
- defer file.Close()
+ // Close the file so we can edit it
+ file.Close()
+ }
+
+ // If we now have a config that exists
+ if _, err := os.Stat(conffile); !errors.Is(err, os.ErrNotExist) {
+ header := readHeader(4, sysfile)
+ writeContent(header, conffile)
+ addModules(conffile)
+
}
}
}
From 36b8e441824c165323d13d0408ba2517e1190d50 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 04:20:16 +0200
Subject: [PATCH 030/132] make fileio module to make my life easier
---
pkg/fileio/fileio.go | 51 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 pkg/fileio/fileio.go
diff --git a/pkg/fileio/fileio.go b/pkg/fileio/fileio.go
new file mode 100644
index 0000000..05ca533
--- /dev/null
+++ b/pkg/fileio/fileio.go
@@ -0,0 +1,51 @@
+package fileio
+
+import (
+ "bufio"
+ "fmt"
+ "os"
+
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+)
+
+// This just implements repetetive tasks I have to do with files
+
+func AppendContent(content string, fileName string) {
+ // Open the file
+ f, err := os.OpenFile(fileName, os.O_APPEND|os.O_WRONLY, os.ModePerm)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Error opening \"%s\" for writing", fileName))
+ defer f.Close()
+
+ // Write the content
+ _, err = f.WriteString(content)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Error writing to %s", fileName))
+}
+
+func ReadLines(fileName string) []string {
+ content, err := os.Open(fileName)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Error reading file %s", fileName))
+ defer content.Close()
+
+ // Make a list of lines
+ var lines []string
+
+ // Read the file line by line
+ scanner := bufio.NewScanner(content)
+ for scanner.Scan() {
+ lines = append(lines, scanner.Text())
+ }
+
+ // Return all the lines
+ return lines
+
+}
+
+func ReadFile(fileName string) string {
+ // Read the whole file
+ content, err := os.ReadFile(fileName)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Failed to ReadFile on %s", fileName))
+
+ // Return all the lines as one string
+ return string(content)
+
+}
From 3ac59580157994b32d63a1b02bebe1fc67554db8 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 04:21:22 +0200
Subject: [PATCH 031/132] change to use fileio and also finish writing the
module manipulation for initramfstools
---
internal/configs/config_initramfstools.go | 62 ++++++++++++++---------
internal/configs/configs.go | 3 +-
2 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/internal/configs/config_initramfstools.go b/internal/configs/config_initramfstools.go
index 62eaffe..ece3076 100644
--- a/internal/configs/config_initramfstools.go
+++ b/internal/configs/config_initramfstools.go
@@ -8,9 +8,11 @@ import (
"strings"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
"github.com/HikariKnight/quickpassthrough/pkg/uname"
)
+// Special function to read the header of a file (reads the first N lines)
func readHeader(lines int, fileName string) string {
// Open the file
f, err := os.Open(fileName)
@@ -35,12 +37,14 @@ func readHeader(lines int, fileName string) string {
return fmt.Sprintf("%s\n", strings.Join(header, "\n"))
}
+// Reads the system file and copies over the content while inserting the vfio modules
+// Takes the config file as argument
func addModules(conffile string) {
// Make a regex to get the system path instead of the config path
syspath_re := regexp.MustCompile(`^config`)
// Make a regex to skip specific modules and comments
- skipmodules_re := regexp.MustCompile(`(^#|vendor-reset)`)
+ skipmodules_re := regexp.MustCompile(`(^#|vendor-reset|vfio|vfio_pci|vfio_iommu_type1|vfio_virqfd)`)
// Get the syspath
syspath := syspath_re.ReplaceAllString(conffile, "")
@@ -50,34 +54,42 @@ func addModules(conffile string) {
errorcheck.ErrorCheck(err, fmt.Sprintf("Error opening file for reading %s", syspath))
defer sysfile.Close()
- // Open config file for writing
- out, err := os.OpenFile(conffile, os.O_APPEND|os.O_WRONLY, os.ModePerm)
- errorcheck.ErrorCheck(err, fmt.Sprintf("Error opening file for writing %s", conffile))
- defer out.Close()
+ // Check if user has vendor-reset installed/enabled and make sure that is first
+ content := fileio.ReadFile(syspath)
+ if strings.Contains(content, "vendor-reset") {
+ fileio.AppendContent("vendor-reset\n", conffile)
+ }
- // Make a list of modules
- //var modules []string
+ // Write the vfio modules
+ fileio.AppendContent(
+ fmt.Sprint(
+ "# Added by quickpassthrough #\n",
+ "vfio\n",
+ "vfio_iommu_type1\n",
+ "vfio_pci\n",
+ ),
+ conffile,
+ )
- // Scan the file line by line
+ // If we are on a kernel older than 6.2
+ sysinfo := uname.New()
+ kernel_re := regexp.MustCompile(`^(6\.1|6\.0|[1-5]\.)`)
+ if kernel_re.MatchString(sysinfo.Kernel) {
+ // Include the vfio_virqfd module
+ // NOTE: this driver was merged into the vfio module in 6.2
+ fileio.AppendContent("vfio_virqfd\n", conffile)
+ }
+
+ // Write the footer
+ fileio.AppendContent("#############################\n", conffile)
+
+ // Scan the system file line by line
scanner := bufio.NewScanner(sysfile)
for scanner.Scan() {
- if scanner.Text() == "vendor-reset" {
- out.WriteString(scanner.Text())
- } else if !skipmodules_re.MatchString(scanner.Text()) {
- writeContent(fmt.Sprintf("%s\n", scanner.Text()), conffile)
- sysinfo := uname.New()
- writeContent(fmt.Sprintf("%s\n%s\n%s\n%s\n", sysinfo.Nodename, sysinfo.Sysname, sysinfo.Domainname, sysinfo.Machine), conffile)
+ // If this is not a line we skip then
+ if !skipmodules_re.MatchString(scanner.Text()) {
+ // Add the module to our config
+ fileio.AppendContent(fmt.Sprintf("%s\n", scanner.Text()), conffile)
}
}
}
-
-func writeContent(content string, fileName string) {
- // Open the file
- f, err := os.OpenFile(fileName, os.O_APPEND|os.O_WRONLY, os.ModePerm)
- errorcheck.ErrorCheck(err, fmt.Sprintf("Error opening %s", fileName))
- defer f.Close()
-
- // Make a new scanner
- _, err = f.WriteString(content)
- errorcheck.ErrorCheck(err, fmt.Sprintf("Error writing to %s", fileName))
-}
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index a49c3b2..5c15384 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -7,6 +7,7 @@ import (
"regexp"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
"github.com/klauspost/cpuid/v2"
)
@@ -110,7 +111,7 @@ func InitConfigs() {
// If we now have a config that exists
if _, err := os.Stat(conffile); !errors.Is(err, os.ErrNotExist) {
header := readHeader(4, sysfile)
- writeContent(header, conffile)
+ fileio.AppendContent(header, conffile)
addModules(conffile)
}
From efd8ae0f97ade7dede5a2a2651d409e2d43a9eb5 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 04:23:16 +0200
Subject: [PATCH 032/132] add TODO
---
internal/configs/configs.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index 5c15384..8b771e7 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -112,6 +112,7 @@ func InitConfigs() {
if _, err := os.Stat(conffile); !errors.Is(err, os.ErrNotExist) {
header := readHeader(4, sysfile)
fileio.AppendContent(header, conffile)
+ // TODO: Generalize this to a meta function
addModules(conffile)
}
From f5116648e6c38bd409a5587c6869d8288062a33e Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 12:55:37 +0200
Subject: [PATCH 033/132] futureproofing function names for the different
initramfs systems
---
internal/configs/config_initramfstools.go | 4 ++--
internal/configs/configs.go | 20 ++++++++++++++++----
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/internal/configs/config_initramfstools.go b/internal/configs/config_initramfstools.go
index ece3076..bd63a5f 100644
--- a/internal/configs/config_initramfstools.go
+++ b/internal/configs/config_initramfstools.go
@@ -13,7 +13,7 @@ import (
)
// Special function to read the header of a file (reads the first N lines)
-func readHeader(lines int, fileName string) string {
+func initramfs_readHeader(lines int, fileName string) string {
// Open the file
f, err := os.Open(fileName)
errorcheck.ErrorCheck(err, fmt.Sprintf("Error opening %s", fileName))
@@ -39,7 +39,7 @@ func readHeader(lines int, fileName string) string {
// Reads the system file and copies over the content while inserting the vfio modules
// Takes the config file as argument
-func addModules(conffile string) {
+func initramfs_addModules(conffile string) {
// Make a regex to get the system path instead of the config path
syspath_re := regexp.MustCompile(`^config`)
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index 8b771e7..e874a7a 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -110,10 +110,22 @@ func InitConfigs() {
// If we now have a config that exists
if _, err := os.Stat(conffile); !errors.Is(err, os.ErrNotExist) {
- header := readHeader(4, sysfile)
- fileio.AppendContent(header, conffile)
- // TODO: Generalize this to a meta function
- addModules(conffile)
+ switch conffile {
+ case config.path.ETCMODULES:
+ // Read the header
+ header := initramfs_readHeader(4, sysfile)
+ fileio.AppendContent(header, conffile)
+
+ // Add the modules to the config file
+ initramfs_addModules(conffile)
+ case config.path.INITRAMFS:
+ // Read the header
+ header := initramfs_readHeader(11, sysfile)
+ fileio.AppendContent(header, conffile)
+
+ // Add the modules to the config file
+ initramfs_addModules(conffile)
+ }
}
}
From 388ba638bd1c75e3a426494b29ca2f6f6500d0ad Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 16:21:27 +0200
Subject: [PATCH 034/132] add cmdline to config and fix fileio append
---
internal/configs/config_bootloaders.go | 14 ++++++++++++++
internal/configs/configs.go | 11 +++++++++--
pkg/fileio/fileio.go | 2 +-
3 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index 0e2b6c5..d5a1642 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -2,6 +2,8 @@ package configs
import (
"github.com/HikariKnight/quickpassthrough/pkg/command"
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
+ "github.com/klauspost/cpuid/v2"
)
func getBootloader(config *Config) {
@@ -26,3 +28,15 @@ func getBootloader(config *Config) {
config.bootloader = "kernelstub"
}
}
+
+func set_Cmdline() {
+ // Get the system info
+ cpuinfo := cpuid.CPU
+
+ // Get the configs
+ config := GetConfig()
+
+ // Write test file
+ fileio.AppendContent(cpuinfo.VendorString, config.path.CMDLINE)
+ fileio.AppendContent(cpuinfo.VendorString, config.path.CMDLINE)
+}
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index e874a7a..d933ece 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -12,6 +12,7 @@ import (
)
type Path struct {
+ CMDLINE string
MODPROBE string
INITRAMFS string
ETCMODULES string
@@ -29,6 +30,7 @@ type Config struct {
func GetConfigPaths() *Path {
Paths := &Path{
+ CMDLINE: "config/cmdline",
MODPROBE: "config/etc/modprobe.d",
INITRAMFS: "config/etc/initramfs-tools",
ETCMODULES: "config/etc/modules",
@@ -52,7 +54,7 @@ func GetConfig() *Config {
getBootloader(config)
// Detect the cpu vendor
- config.cpuvendor = cpuid.CPU.VendorID.String()
+ config.cpuvendor = cpuid.CPU.VendorString
return config
}
@@ -71,6 +73,12 @@ func InitConfigs() {
// Remove old config
os.RemoveAll("config")
+ // Make the config folder
+ os.Mkdir("config", os.ModePerm)
+
+ // Generate the kernel arguments
+ set_Cmdline()
+
// Make a regex to get the system path instead of the config path
syspath_re := regexp.MustCompile(`^config`)
@@ -126,7 +134,6 @@ func InitConfigs() {
// Add the modules to the config file
initramfs_addModules(conffile)
}
-
}
}
}
diff --git a/pkg/fileio/fileio.go b/pkg/fileio/fileio.go
index 05ca533..4a24a47 100644
--- a/pkg/fileio/fileio.go
+++ b/pkg/fileio/fileio.go
@@ -12,7 +12,7 @@ import (
func AppendContent(content string, fileName string) {
// Open the file
- f, err := os.OpenFile(fileName, os.O_APPEND|os.O_WRONLY, os.ModePerm)
+ f, err := os.OpenFile(fileName, os.O_CREATE|os.O_APPEND|os.O_WRONLY, os.ModePerm)
errorcheck.ErrorCheck(err, fmt.Sprintf("Error opening \"%s\" for writing", fileName))
defer f.Close()
From 3ee1062f71137e9f4af95f50182ce80961f7f7b8 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 16:59:51 +0200
Subject: [PATCH 035/132] Add FileExist function
---
pkg/fileio/fileio.go | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/pkg/fileio/fileio.go b/pkg/fileio/fileio.go
index 4a24a47..959394e 100644
--- a/pkg/fileio/fileio.go
+++ b/pkg/fileio/fileio.go
@@ -2,6 +2,7 @@ package fileio
import (
"bufio"
+ "errors"
"fmt"
"os"
@@ -49,3 +50,19 @@ func ReadFile(fileName string) string {
return string(content)
}
+
+func FileExist(fileName string) bool {
+ var exist bool
+
+ // Check if the file exists
+ if _, err := os.Stat(fileName); !errors.Is(err, os.ErrNotExist) {
+ // Set the value to true
+ exist = true
+ } else {
+ // Set the value to false
+ exist = false
+ }
+
+ // Return if the file exists
+ return exist
+}
From c3a1639dee7e5003be677fe752413b020f93788c Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 17:01:33 +0200
Subject: [PATCH 036/132] Add function for setting cmdline and writing the
config/cmdline file
---
internal/configs/config_bootloaders.go | 24 +++++++++++++++++++++---
internal/configs/configs.go | 6 +++---
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index d5a1642..d970586 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -6,6 +6,8 @@ import (
"github.com/klauspost/cpuid/v2"
)
+// This function just adds what bootloader the system has to our config.bootloader value
+// Preference is given to kernelstub because it is WAY easier to safely edit compared to grub2
func getBootloader(config *Config) {
// Check what bootloader handler we are using
// Check for grub-mkconfig
@@ -29,6 +31,9 @@ func getBootloader(config *Config) {
}
}
+// This function adds the default kernel arguments we want to the config/cmdline file
+// This gives us a file we can read all the kernel arguments this system needs
+// in case of an unknown bootloader
func set_Cmdline() {
// Get the system info
cpuinfo := cpuid.CPU
@@ -36,7 +41,20 @@ func set_Cmdline() {
// Get the configs
config := GetConfig()
- // Write test file
- fileio.AppendContent(cpuinfo.VendorString, config.path.CMDLINE)
- fileio.AppendContent(cpuinfo.VendorString, config.path.CMDLINE)
+ // Write the file containing our kernel arguments to feed the bootloader
+ fileio.AppendContent("iommu=pt", config.path.CMDLINE)
+
+ // Write the argument based on which cpu the user got
+ switch cpuinfo.VendorString {
+ case "AuthenticAMD":
+ fileio.AppendContent(" amd_iommu=on", config.path.CMDLINE)
+ case "GenuineIntel":
+ fileio.AppendContent(" intel_iommu=on", config.path.CMDLINE)
+ }
+
+ // If the config folder for dracut exists in our configs
+ if fileio.FileExist(config.path.DRACUT) {
+ // Add an extra kernel argument needed for dracut users
+ fileio.AppendContent(" rd.driver.pre=vfio_pci", config.path.CMDLINE)
+ }
}
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index d933ece..2dea325 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -76,9 +76,6 @@ func InitConfigs() {
// Make the config folder
os.Mkdir("config", os.ModePerm)
- // Generate the kernel arguments
- set_Cmdline()
-
// Make a regex to get the system path instead of the config path
syspath_re := regexp.MustCompile(`^config`)
@@ -136,4 +133,7 @@ func InitConfigs() {
}
}
}
+
+ // Generate the kernel arguments
+ set_Cmdline()
}
From f3032966b96b68670be4698789c5d8f93d1e5a98 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 17:04:13 +0200
Subject: [PATCH 037/132] move over to using fileio for checking for files
existing
---
internal/configs/configs.go | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index 2dea325..f10845f 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -1,7 +1,6 @@
package configs
import (
- "errors"
"fmt"
"os"
"regexp"
@@ -85,7 +84,7 @@ func InitConfigs() {
syspath := syspath_re.ReplaceAllString(confpath, "")
// If the path exists
- if _, err := os.Stat(syspath); !errors.Is(err, os.ErrNotExist) {
+ if fileio.FileExist(syspath) {
// Create the directories for our configs
err := os.MkdirAll(confpath, os.ModePerm)
errorcheck.ErrorCheck(err)
@@ -105,7 +104,7 @@ func InitConfigs() {
sysfile := syspath_re.ReplaceAllString(conffile, "")
// If the file exists
- if _, err := os.Stat(sysfile); !errors.Is(err, os.ErrNotExist) {
+ if fileio.FileExist(sysfile) {
// Create the directories for our configs
file, err := os.Create(conffile)
errorcheck.ErrorCheck(err)
@@ -114,7 +113,7 @@ func InitConfigs() {
}
// If we now have a config that exists
- if _, err := os.Stat(conffile); !errors.Is(err, os.ErrNotExist) {
+ if fileio.FileExist(conffile) {
switch conffile {
case config.path.ETCMODULES:
// Read the header
From 855f197650f8058120d49fb8343c317b57b14bb5 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 17:17:04 +0200
Subject: [PATCH 038/132] move over to fileio for checking if file exists
---
internal/ls_iommu_downloader/ls_iommu_downloader.go | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/internal/ls_iommu_downloader/ls_iommu_downloader.go b/internal/ls_iommu_downloader/ls_iommu_downloader.go
index 8fd5032..52ab94d 100644
--- a/internal/ls_iommu_downloader/ls_iommu_downloader.go
+++ b/internal/ls_iommu_downloader/ls_iommu_downloader.go
@@ -4,7 +4,6 @@ import (
"crypto/sha256"
"encoding/hex"
"encoding/json"
- "errors"
"fmt"
"io"
"log"
@@ -14,6 +13,7 @@ import (
"time"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
"github.com/HikariKnight/quickpassthrough/pkg/untar"
"github.com/cavaliergopher/grab/v3"
)
@@ -111,7 +111,7 @@ func CheckLsIOMMU() {
// Make the directory for ls-iommu if it does not exist
path := "utils"
- if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
+ if !fileio.FileExist(path) {
err := os.Mkdir(path, os.ModePerm)
errorcheck.ErrorCheck(err)
}
@@ -139,9 +139,7 @@ func CheckLsIOMMU() {
errorcheck.ErrorCheck(err)
// Check if the tar.gz exists
- _, err = os.Stat(fileName)
-
- if errors.Is(err, os.ErrNotExist) {
+ if !fileio.FileExist(fileName) {
downloadNewVersion(path, fileName, downloadUrl)
if checkSum(string(checksums_txt), fileName) {
err = untar.Untar(fmt.Sprintf("%s/", path), fileName)
@@ -184,7 +182,7 @@ func downloadNewVersion(path, fileName, downloadUrl string) {
// check for errors
if err := download.Err(); err != nil {
fmt.Fprintf(os.Stderr, "Download failed: %v\n", err)
- if _, err := os.Stat("utils/ls-iommu"); errors.Is(err, os.ErrNotExist) {
+ if !fileio.FileExist("utils/ls-iommu") {
log.Fatal("If the above error is 404, then we could not communicate with the GitHub API\n Please manually download and extract ls-iommu to: utils/\nYou can download it from: https://github.com/HikariKnight/ls-iommu/releases")
} else {
fmt.Println("Existing ls-iommu binary detected in \"utils/\", will use that instead as the GitHub API did not respond.")
From f38d3f3445de2422ef470dac03b4fae103b873a3 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 17:17:33 +0200
Subject: [PATCH 039/132] remove extra line from config/initramfs-tools/modules
---
internal/configs/config_initramfstools.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/internal/configs/config_initramfstools.go b/internal/configs/config_initramfstools.go
index bd63a5f..4d63521 100644
--- a/internal/configs/config_initramfstools.go
+++ b/internal/configs/config_initramfstools.go
@@ -81,7 +81,7 @@ func initramfs_addModules(conffile string) {
}
// Write the footer
- fileio.AppendContent("#############################\n", conffile)
+ fileio.AppendContent("#############################", conffile)
// Scan the system file line by line
scanner := bufio.NewScanner(sysfile)
From 583ccc1586d1b05834a792bbbf2d3d35e9bad3d0 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 17:17:59 +0200
Subject: [PATCH 040/132] fix generating initramfs-tools modules file
---
internal/configs/configs.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index f10845f..338efcb 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -122,7 +122,7 @@ func InitConfigs() {
// Add the modules to the config file
initramfs_addModules(conffile)
- case config.path.INITRAMFS:
+ case fmt.Sprintf("%s/modules", config.path.INITRAMFS):
// Read the header
header := initramfs_readHeader(11, sysfile)
fileio.AppendContent(header, conffile)
From c64da46cce8957cb22b41460880bd7eb30f37d6f Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 17:18:29 +0200
Subject: [PATCH 041/132] make empty package for modprobe when i get to the
point of writing this
---
internal/configs/config_modprobe.go | 1 +
1 file changed, 1 insertion(+)
create mode 100644 internal/configs/config_modprobe.go
diff --git a/internal/configs/config_modprobe.go b/internal/configs/config_modprobe.go
new file mode 100644
index 0000000..27459e6
--- /dev/null
+++ b/internal/configs/config_modprobe.go
@@ -0,0 +1 @@
+package configs
From 8a2ddeb2613e0152c07eaa991f686c9c1b1dd554 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 17:59:10 +0200
Subject: [PATCH 042/132] Fix config struct exports
---
internal/configs/config_bootloaders.go | 16 +++++------
internal/configs/configs.go | 39 ++++++++++++--------------
2 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index d970586..5f038ff 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -14,20 +14,20 @@ func getBootloader(config *Config) {
_, err := command.Run("which", "grub-mkconfig")
if err == nil {
// Mark bootloader as grub2
- config.bootloader = "grub2"
+ config.Bootloader = "grub2"
}
// Check for grubby (used by fedora)
_, err = command.Run("which", "grubby")
if err == nil {
// Mark it as unknown as i do not support it yet
- config.bootloader = "unknown"
+ config.Bootloader = "unknown"
}
// Check for kernelstub (used by pop os)
_, err = command.Run("which", "kernelstub")
if err == nil {
- config.bootloader = "kernelstub"
+ config.Bootloader = "kernelstub"
}
}
@@ -42,19 +42,19 @@ func set_Cmdline() {
config := GetConfig()
// Write the file containing our kernel arguments to feed the bootloader
- fileio.AppendContent("iommu=pt", config.path.CMDLINE)
+ fileio.AppendContent("iommu=pt", config.Path.CMDLINE)
// Write the argument based on which cpu the user got
switch cpuinfo.VendorString {
case "AuthenticAMD":
- fileio.AppendContent(" amd_iommu=on", config.path.CMDLINE)
+ fileio.AppendContent(" amd_iommu=on", config.Path.CMDLINE)
case "GenuineIntel":
- fileio.AppendContent(" intel_iommu=on", config.path.CMDLINE)
+ fileio.AppendContent(" intel_iommu=on", config.Path.CMDLINE)
}
// If the config folder for dracut exists in our configs
- if fileio.FileExist(config.path.DRACUT) {
+ if fileio.FileExist(config.Path.DRACUT) {
// Add an extra kernel argument needed for dracut users
- fileio.AppendContent(" rd.driver.pre=vfio_pci", config.path.CMDLINE)
+ fileio.AppendContent(" rd.driver.pre=vfio_pci", config.Path.CMDLINE)
}
}
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index 338efcb..b1eb384 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -22,9 +22,9 @@ type Path struct {
}
type Config struct {
- bootloader string
- cpuvendor string
- path *Path
+ Bootloader string
+ Cpuvendor string
+ Path *Path
}
func GetConfigPaths() *Path {
@@ -43,18 +43,15 @@ func GetConfigPaths() *Path {
}
func GetConfig() *Config {
- config := &Config{}
- config.path = GetConfigPaths()
-
- // Set default value for bootloader
- config.bootloader = "unknown"
+ config := &Config{
+ Bootloader: "unknown",
+ Cpuvendor: cpuid.CPU.VendorString,
+ Path: GetConfigPaths(),
+ }
// Detect the bootloader we are using
getBootloader(config)
- // Detect the cpu vendor
- config.cpuvendor = cpuid.CPU.VendorString
-
return config
}
@@ -63,10 +60,10 @@ func InitConfigs() {
// Add all directories we need into a stringlist
dirs := []string{
- config.path.MODPROBE,
- config.path.INITRAMFS,
- config.path.DEFAULT,
- config.path.DRACUT,
+ config.Path.MODPROBE,
+ config.Path.INITRAMFS,
+ config.Path.DEFAULT,
+ config.Path.DRACUT,
}
// Remove old config
@@ -93,10 +90,10 @@ func InitConfigs() {
// Add all files we need to a stringlist
files := []string{
- config.path.ETCMODULES,
- config.path.MKINITCPIO,
- fmt.Sprintf("%s/modules", config.path.INITRAMFS),
- fmt.Sprintf("%s/grub", config.path.DEFAULT),
+ config.Path.ETCMODULES,
+ config.Path.MKINITCPIO,
+ fmt.Sprintf("%s/modules", config.Path.INITRAMFS),
+ fmt.Sprintf("%s/grub", config.Path.DEFAULT),
}
for _, conffile := range files {
@@ -115,14 +112,14 @@ func InitConfigs() {
// If we now have a config that exists
if fileio.FileExist(conffile) {
switch conffile {
- case config.path.ETCMODULES:
+ case config.Path.ETCMODULES:
// Read the header
header := initramfs_readHeader(4, sysfile)
fileio.AppendContent(header, conffile)
// Add the modules to the config file
initramfs_addModules(conffile)
- case fmt.Sprintf("%s/modules", config.path.INITRAMFS):
+ case fmt.Sprintf("%s/modules", config.Path.INITRAMFS):
// Read the header
header := initramfs_readHeader(11, sysfile)
fileio.AppendContent(header, conffile)
From 15e475749d6a714fd126cf6d46f7a698138dce95 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 17:59:40 +0200
Subject: [PATCH 043/132] Disable vfio video if requested to
---
internal/ui_main_functions.go | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index df63532..a872cbf 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -5,6 +5,7 @@ import (
"regexp"
"github.com/HikariKnight/quickpassthrough/internal/configs"
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
// This function processes the enter event
@@ -61,6 +62,12 @@ func (m *model) processSelection() {
case VIDEO:
// This is a YESNO Dialog
+ // Gets the selected item
+ selectedItem := m.lists[m.focused].SelectedItem()
+
+ if selectedItem.(item).title == "YES" {
+ m.disableVFIOVideo()
+ }
m.focused++
case INTRO:
@@ -73,3 +80,9 @@ func (m *model) processSelection() {
os.Exit(0)
}
}
+
+func (m *model) disableVFIOVideo() {
+ // Get the config
+ config := configs.GetConfig()
+ fileio.AppendContent(" vfio_pci.disable_vga=1", config.Path.CMDLINE)
+}
From 7affa8d06dcedd56edfd27a03213af477bc2e4c4 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 18:16:21 +0200
Subject: [PATCH 044/132] Prepare a set_modprobe function
---
internal/configs/config_modprobe.go | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/internal/configs/config_modprobe.go b/internal/configs/config_modprobe.go
index 27459e6..775ce5d 100644
--- a/internal/configs/config_modprobe.go
+++ b/internal/configs/config_modprobe.go
@@ -1 +1,5 @@
package configs
+
+func Set_Modprobe() {
+
+}
From be3bcb02f7d5d96c91f4a6ae62739cb105f00b1b Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 18:16:59 +0200
Subject: [PATCH 045/132] Gracefully shut down the program when we are done
---
internal/ui_main_events.go | 6 ++++--
internal/ui_main_functions.go | 18 +++++++++++++++---
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
index d290ffb..a69c8ba 100644
--- a/internal/ui_main_events.go
+++ b/internal/ui_main_events.go
@@ -14,8 +14,10 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case "enter":
if m.loaded {
- // Process the selected item
- m.processSelection()
+ // Process the selected item, if the return value is true then exit the application
+ if m.processSelection() {
+ return m, tea.Quit
+ }
}
case "ctrl+z", "backspace":
// Go backwards in the model
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index a872cbf..5e00eea 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -1,7 +1,6 @@
package internal
import (
- "os"
"regexp"
"github.com/HikariKnight/quickpassthrough/internal/configs"
@@ -9,7 +8,7 @@ import (
)
// This function processes the enter event
-func (m *model) processSelection() {
+func (m *model) processSelection() bool {
switch m.focused {
case GPUS:
// Gets the selected item
@@ -65,24 +64,37 @@ func (m *model) processSelection() {
// Gets the selected item
selectedItem := m.lists[m.focused].SelectedItem()
+ // If user selected yes then
if selectedItem.(item).title == "YES" {
+ // Add disable VFIO video to the config
m.disableVFIOVideo()
}
+
+ // Configure modprobe
+ configs.Set_Modprobe()
+
+ // Go to the next view
m.focused++
case INTRO:
// This is an OK Dialog
// Create the config folder and the files related to this system
configs.InitConfigs()
+
+ // Go to the next view
m.focused++
case DONE:
- os.Exit(0)
+ return true
}
+
+ return false
}
func (m *model) disableVFIOVideo() {
// Get the config
config := configs.GetConfig()
+
+ // Add to the kernel arguments that we want to disable VFIO video output on the host
fileio.AppendContent(" vfio_pci.disable_vga=1", config.Path.CMDLINE)
}
From ca1eedad1cc4a9bbdeb3522d6cc4e7699791583c Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 18:20:34 +0200
Subject: [PATCH 046/132] add comments and change cmdline file to kernel_args
---
internal/configs/configs.go | 2 +-
internal/ui_main_functions.go | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index b1eb384..7a76a15 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -29,7 +29,7 @@ type Config struct {
func GetConfigPaths() *Path {
Paths := &Path{
- CMDLINE: "config/cmdline",
+ CMDLINE: "config/kernel_args",
MODPROBE: "config/etc/modprobe.d",
INITRAMFS: "config/etc/initramfs-tools",
ETCMODULES: "config/etc/modules",
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index 5e00eea..d505fd7 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -85,9 +85,11 @@ func (m *model) processSelection() bool {
m.focused++
case DONE:
+ // Return true so that the application will exit nicely
return true
}
+ // Return false as we are not done
return false
}
From 9d131fa566dde718de54762b8e59127356b7e9cd Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 19:05:49 +0200
Subject: [PATCH 047/132] implement set_Modprobe
---
internal/configs/config_modprobe.go | 44 ++++++++++++++++++++++++++++-
internal/ui_main_functions.go | 7 ++++-
2 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/internal/configs/config_modprobe.go b/internal/configs/config_modprobe.go
index 775ce5d..76c0063 100644
--- a/internal/configs/config_modprobe.go
+++ b/internal/configs/config_modprobe.go
@@ -1,5 +1,47 @@
package configs
-func Set_Modprobe() {
+import (
+ "fmt"
+ "strings"
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
+)
+
+func Set_Modprobe(gpu_IDs []string) {
+ // Get the config
+ config := GetConfig()
+
+ // Read our current kernel arguments
+ kernel_args := fileio.ReadFile(config.Path.CMDLINE)
+
+ var vfio_pci_options []string
+ vfio_pci_options = append(vfio_pci_options, strings.Join(gpu_IDs, ","))
+
+ if strings.Contains(kernel_args, "vfio_pci.disable_vga=1") {
+ vfio_pci_options = append(vfio_pci_options, "disable_vga=1")
+ }
+
+ // Write the vfio.conf file to our modprobe config
+ fileio.AppendContent(
+ fmt.Sprint(
+ "## This is an autogenerated file that stubs your graphic card for use with vfio\n",
+ "## This file should be placed inside /etc/modprobe.d/\n",
+ "# Uncomment the line below to \"hardcode\" your graphic card to be bound to the vfio-pci driver.\n",
+ "# In most cases this should not be neccessary, it will also prevent you from turning off vfio in the bootloader.\n",
+ fmt.Sprintf(
+ "#options vfio_pci ids=%s\n",
+ strings.Join(vfio_pci_options, " "),
+ ),
+ "\n",
+ "# Make sure vfio_pci is loaded before these modules: nvidia, nouveau, amdgpu and radeon\n",
+ "softdep nvidia pre: vfio vfio_pci\n",
+ "softdep nouveau pre: vfio vfio_pci\n",
+ "softdep amdgpu pre: vfio vfio_pci\n",
+ "softdep radeon pre: vfio vfio_pci\n",
+ ),
+ fmt.Sprintf(
+ "%s/vfio.conf",
+ config.Path.MODPROBE,
+ ),
+ )
}
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index d505fd7..d51685e 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -33,6 +33,8 @@ func (m *model) processSelection() bool {
case GPU_GROUP:
// Generate the VBIOS dumper script once the user has selected a GPU
generateVBIOSDumper(*m)
+
+ // Change focus to the next view
m.focused++
case USB:
@@ -70,8 +72,11 @@ func (m *model) processSelection() bool {
m.disableVFIOVideo()
}
+ // Get the device ids for the selected gpu using ls-iommu
+ gpu_IDs := getIOMMU("-gr", "-i", m.gpu_group, "--id")
+
// Configure modprobe
- configs.Set_Modprobe()
+ configs.Set_Modprobe(gpu_IDs)
// Go to the next view
m.focused++
From 5f38467e238dbf1a5b1cd63fda1eb275f921c36c Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 19:11:30 +0200
Subject: [PATCH 048/132] Move disableVFIOVideo into its own file
---
internal/configs/config_vfio_video.go | 11 +++++++++++
internal/ui_main_functions.go | 11 +----------
2 files changed, 12 insertions(+), 10 deletions(-)
create mode 100644 internal/configs/config_vfio_video.go
diff --git a/internal/configs/config_vfio_video.go b/internal/configs/config_vfio_video.go
new file mode 100644
index 0000000..f99f04b
--- /dev/null
+++ b/internal/configs/config_vfio_video.go
@@ -0,0 +1,11 @@
+package configs
+
+import "github.com/HikariKnight/quickpassthrough/pkg/fileio"
+
+func DisableVFIOVideo() {
+ // Get the config
+ config := GetConfig()
+
+ // Add to the kernel arguments that we want to disable VFIO video output on the host
+ fileio.AppendContent(" vfio_pci.disable_vga=1", config.Path.CMDLINE)
+}
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index d51685e..3c4e37d 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -4,7 +4,6 @@ import (
"regexp"
"github.com/HikariKnight/quickpassthrough/internal/configs"
- "github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
// This function processes the enter event
@@ -69,7 +68,7 @@ func (m *model) processSelection() bool {
// If user selected yes then
if selectedItem.(item).title == "YES" {
// Add disable VFIO video to the config
- m.disableVFIOVideo()
+ configs.DisableVFIOVideo()
}
// Get the device ids for the selected gpu using ls-iommu
@@ -97,11 +96,3 @@ func (m *model) processSelection() bool {
// Return false as we are not done
return false
}
-
-func (m *model) disableVFIOVideo() {
- // Get the config
- config := configs.GetConfig()
-
- // Add to the kernel arguments that we want to disable VFIO video output on the host
- fileio.AppendContent(" vfio_pci.disable_vga=1", config.Path.CMDLINE)
-}
From b4abc350e03ed88806f166d0889627357e999612 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 19:23:35 +0200
Subject: [PATCH 049/132] Skip the USB controller views while we do not have
QuickEmu support
---
internal/ui_main_events.go | 5 ++++-
internal/ui_main_functions.go | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
index a69c8ba..d308a57 100644
--- a/internal/ui_main_events.go
+++ b/internal/ui_main_events.go
@@ -21,9 +21,12 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
case "ctrl+z", "backspace":
// Go backwards in the model
- if m.focused > 0 {
+ if m.focused > 0 && m.focused != DONE {
m.focused--
return m, nil
+ } else if m.focused == DONE {
+ // Since we have no QuickEmu support, skip the usb controller configuration
+ m.focused = VIDEO
} else {
// If we are at the beginning, just exit
return m, tea.Quit
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index 3c4e37d..9438859 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -78,7 +78,10 @@ func (m *model) processSelection() bool {
configs.Set_Modprobe(gpu_IDs)
// Go to the next view
- m.focused++
+ //m.focused++
+
+ // Because we have no QuickEmu support yet, just skip USB Controller configuration
+ m.focused = DONE
case INTRO:
// This is an OK Dialog
From 18d9d928e5a7d61cb98698e03dde05d3dfaef8a0 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 19:48:49 +0200
Subject: [PATCH 050/132] add dracut support and make it possible to change
your video disable choice
---
internal/configs/config_dracut.go | 17 +++++++++++++++++
internal/configs/config_vfio_video.go | 15 ++++++++++++---
internal/ui_main_functions.go | 26 +++++++++++++++++++++-----
3 files changed, 50 insertions(+), 8 deletions(-)
create mode 100644 internal/configs/config_dracut.go
diff --git a/internal/configs/config_dracut.go b/internal/configs/config_dracut.go
new file mode 100644
index 0000000..fce039f
--- /dev/null
+++ b/internal/configs/config_dracut.go
@@ -0,0 +1,17 @@
+package configs
+
+import (
+ "fmt"
+
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
+)
+
+func Set_Dracut() {
+ config := GetConfig()
+
+ // Write the dracut config file
+ fileio.AppendContent("add_drivers+=\" vfio_pci vfio vfio_iommu_type1 vfio_virqfd \"\n", fmt.Sprintf("%s/vfio.conf", config.Path.DRACUT))
+
+ // Add to our kernel arguments file that vfio_pci should load early (dracut does this using kernel arguments)
+ fileio.AppendContent(" rd.driver.pre=vfio_pci", config.Path.CMDLINE)
+}
diff --git a/internal/configs/config_vfio_video.go b/internal/configs/config_vfio_video.go
index f99f04b..5dd976f 100644
--- a/internal/configs/config_vfio_video.go
+++ b/internal/configs/config_vfio_video.go
@@ -1,11 +1,20 @@
package configs
-import "github.com/HikariKnight/quickpassthrough/pkg/fileio"
+import (
+ "fmt"
-func DisableVFIOVideo() {
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
+)
+
+func DisableVFIOVideo(i int) {
// Get the config
config := GetConfig()
// Add to the kernel arguments that we want to disable VFIO video output on the host
- fileio.AppendContent(" vfio_pci.disable_vga=1", config.Path.CMDLINE)
+ fileio.AppendContent(
+ fmt.Sprintf(
+ " vfio_pci.disable_vga=%v", i,
+ ),
+ config.Path.CMDLINE,
+ )
}
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index 9438859..60750d6 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -4,6 +4,7 @@ import (
"regexp"
"github.com/HikariKnight/quickpassthrough/internal/configs"
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
// This function processes the enter event
@@ -68,14 +69,29 @@ func (m *model) processSelection() bool {
// If user selected yes then
if selectedItem.(item).title == "YES" {
// Add disable VFIO video to the config
- configs.DisableVFIOVideo()
+ configs.DisableVFIOVideo(1)
+ } else {
+ // Add disable VFIO video to the config
+ configs.DisableVFIOVideo(0)
}
- // Get the device ids for the selected gpu using ls-iommu
- gpu_IDs := getIOMMU("-gr", "-i", m.gpu_group, "--id")
+ // Get our config struct
+ config := configs.GetConfig()
- // Configure modprobe
- configs.Set_Modprobe(gpu_IDs)
+ // If we have files for modprobe
+ if fileio.FileExist(config.Path.MODPROBE) {
+ // Get the device ids for the selected gpu using ls-iommu
+ gpu_IDs := getIOMMU("-gr", "-i", m.gpu_group, "--id")
+
+ // Configure modprobe
+ configs.Set_Modprobe(gpu_IDs)
+ }
+
+ // If we have a folder for dracut
+ if fileio.FileExist(config.Path.DRACUT) {
+ // Configure dracut
+ configs.Set_Dracut()
+ }
// Go to the next view
//m.focused++
From 8312d8853c0eedb4e3dcc3b9ab8b35c6b2ccb86d Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 20:37:49 +0200
Subject: [PATCH 051/132] fix order of operations
---
internal/ui_main_functions.go | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index 60750d6..c72f8e0 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -1,6 +1,7 @@
package internal
import (
+ "os"
"regexp"
"github.com/HikariKnight/quickpassthrough/internal/configs"
@@ -66,6 +67,21 @@ func (m *model) processSelection() bool {
// Gets the selected item
selectedItem := m.lists[m.focused].SelectedItem()
+ // Get our config struct
+ config := configs.GetConfig()
+
+ // Get the device ids for the selected gpu using ls-iommu
+ gpu_IDs := getIOMMU("-gr", "-i", m.gpu_group, "--id")
+
+ // If the kernel_args file already exists
+ if fileio.FileExist(config.Path.CMDLINE) {
+ // Delete it as we will have to make a new one anyway
+ os.Remove(config.Path.CMDLINE)
+ }
+
+ // Write initial kernel_arg file
+ configs.Set_Cmdline(gpu_IDs)
+
// If user selected yes then
if selectedItem.(item).title == "YES" {
// Add disable VFIO video to the config
@@ -75,14 +91,8 @@ func (m *model) processSelection() bool {
configs.DisableVFIOVideo(0)
}
- // Get our config struct
- config := configs.GetConfig()
-
// If we have files for modprobe
if fileio.FileExist(config.Path.MODPROBE) {
- // Get the device ids for the selected gpu using ls-iommu
- gpu_IDs := getIOMMU("-gr", "-i", m.gpu_group, "--id")
-
// Configure modprobe
configs.Set_Modprobe(gpu_IDs)
}
From e93d2156695c2e5858843e7886c6d117bb42a67e Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 20:40:33 +0200
Subject: [PATCH 052/132] make generating the module list its own function and
fix minor things
---
internal/configs/config_bootloaders.go | 8 +++++++-
internal/configs/config_dracut.go | 3 ++-
internal/configs/config_initramfstools.go | 21 +++++--------------
internal/configs/config_modprobe.go | 15 ++++++++++----
internal/configs/configs.go | 25 ++++++++++++++++++++---
5 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index 5f038ff..60bbf1d 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -1,6 +1,9 @@
package configs
import (
+ "fmt"
+ "strings"
+
"github.com/HikariKnight/quickpassthrough/pkg/command"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
"github.com/klauspost/cpuid/v2"
@@ -34,7 +37,7 @@ func getBootloader(config *Config) {
// This function adds the default kernel arguments we want to the config/cmdline file
// This gives us a file we can read all the kernel arguments this system needs
// in case of an unknown bootloader
-func set_Cmdline() {
+func Set_Cmdline(gpu_IDs []string) {
// Get the system info
cpuinfo := cpuid.CPU
@@ -52,6 +55,9 @@ func set_Cmdline() {
fileio.AppendContent(" intel_iommu=on", config.Path.CMDLINE)
}
+ // Add the GPU ids for vfio to the kernel arguments
+ fileio.AppendContent(fmt.Sprintf(" vfio_pci.ids=%s", strings.Join(gpu_IDs, ",")), config.Path.CMDLINE)
+
// If the config folder for dracut exists in our configs
if fileio.FileExist(config.Path.DRACUT) {
// Add an extra kernel argument needed for dracut users
diff --git a/internal/configs/config_dracut.go b/internal/configs/config_dracut.go
index fce039f..1c145d2 100644
--- a/internal/configs/config_dracut.go
+++ b/internal/configs/config_dracut.go
@@ -2,6 +2,7 @@ package configs
import (
"fmt"
+ "strings"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
@@ -10,7 +11,7 @@ func Set_Dracut() {
config := GetConfig()
// Write the dracut config file
- fileio.AppendContent("add_drivers+=\" vfio_pci vfio vfio_iommu_type1 vfio_virqfd \"\n", fmt.Sprintf("%s/vfio.conf", config.Path.DRACUT))
+ fileio.AppendContent(fmt.Sprintf("add_drivers+=\" %s \"\n", strings.Join(vfio_modules(), " ")), fmt.Sprintf("%s/vfio.conf", config.Path.DRACUT))
// Add to our kernel arguments file that vfio_pci should load early (dracut does this using kernel arguments)
fileio.AppendContent(" rd.driver.pre=vfio_pci", config.Path.CMDLINE)
diff --git a/internal/configs/config_initramfstools.go b/internal/configs/config_initramfstools.go
index 4d63521..f198959 100644
--- a/internal/configs/config_initramfstools.go
+++ b/internal/configs/config_initramfstools.go
@@ -9,7 +9,6 @@ import (
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
- "github.com/HikariKnight/quickpassthrough/pkg/uname"
)
// Special function to read the header of a file (reads the first N lines)
@@ -64,25 +63,15 @@ func initramfs_addModules(conffile string) {
fileio.AppendContent(
fmt.Sprint(
"# Added by quickpassthrough #\n",
- "vfio\n",
- "vfio_iommu_type1\n",
- "vfio_pci\n",
+ fmt.Sprintf(
+ "%s\n",
+ strings.Join(vfio_modules(), "\n"),
+ ),
+ "#############################\n",
),
conffile,
)
- // If we are on a kernel older than 6.2
- sysinfo := uname.New()
- kernel_re := regexp.MustCompile(`^(6\.1|6\.0|[1-5]\.)`)
- if kernel_re.MatchString(sysinfo.Kernel) {
- // Include the vfio_virqfd module
- // NOTE: this driver was merged into the vfio module in 6.2
- fileio.AppendContent("vfio_virqfd\n", conffile)
- }
-
- // Write the footer
- fileio.AppendContent("#############################", conffile)
-
// Scan the system file line by line
scanner := bufio.NewScanner(sysfile)
for scanner.Scan() {
diff --git a/internal/configs/config_modprobe.go b/internal/configs/config_modprobe.go
index 76c0063..c3095b4 100644
--- a/internal/configs/config_modprobe.go
+++ b/internal/configs/config_modprobe.go
@@ -2,6 +2,7 @@ package configs
import (
"fmt"
+ "os"
"strings"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
@@ -21,6 +22,15 @@ func Set_Modprobe(gpu_IDs []string) {
vfio_pci_options = append(vfio_pci_options, "disable_vga=1")
}
+ // Put our config file path into a string
+ conffile := fmt.Sprintf("%s/vfio.conf", config.Path.MODPROBE)
+
+ // If the file exists
+ if fileio.FileExist(conffile) {
+ // Delete the old file
+ os.Remove(conffile)
+ }
+
// Write the vfio.conf file to our modprobe config
fileio.AppendContent(
fmt.Sprint(
@@ -39,9 +49,6 @@ func Set_Modprobe(gpu_IDs []string) {
"softdep amdgpu pre: vfio vfio_pci\n",
"softdep radeon pre: vfio vfio_pci\n",
),
- fmt.Sprintf(
- "%s/vfio.conf",
- config.Path.MODPROBE,
- ),
+ conffile,
)
}
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index 7a76a15..15d43dd 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -7,6 +7,7 @@ import (
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
+ "github.com/HikariKnight/quickpassthrough/pkg/uname"
"github.com/klauspost/cpuid/v2"
)
@@ -129,7 +130,25 @@ func InitConfigs() {
}
}
}
-
- // Generate the kernel arguments
- set_Cmdline()
+}
+
+func vfio_modules() []string {
+ // Make the list of modules
+ modules := []string{
+ "vfio_pci",
+ "vfio",
+ "vfio_iommu_type1",
+ }
+
+ // If we are on a kernel older than 6.2
+ sysinfo := uname.New()
+ kernel_re := regexp.MustCompile(`^(6\.1|6\.0|[1-5]\.)`)
+ if kernel_re.MatchString(sysinfo.Kernel) {
+ // Include the vfio_virqfd module
+ // NOTE: this driver was merged into the vfio module in 6.2
+ modules = append(modules, "vfio_virqfd")
+ }
+
+ // Return the modules
+ return modules
}
From a6fddcd683ed521742cd8c84753e89100afa4930 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 20:47:47 +0200
Subject: [PATCH 053/132] Make sure we always start with a new file
---
internal/configs/config_dracut.go | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/internal/configs/config_dracut.go b/internal/configs/config_dracut.go
index 1c145d2..52a6507 100644
--- a/internal/configs/config_dracut.go
+++ b/internal/configs/config_dracut.go
@@ -2,6 +2,7 @@ package configs
import (
"fmt"
+ "os"
"strings"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
@@ -10,8 +11,16 @@ import (
func Set_Dracut() {
config := GetConfig()
+ // Set the dracut config file
+ dracutConf := fmt.Sprintf("%s/vfio.conf", config.Path.DRACUT)
+
+ // If the file already exists then delete it
+ if fileio.FileExist(dracutConf) {
+ os.Remove(dracutConf)
+ }
+
// Write the dracut config file
- fileio.AppendContent(fmt.Sprintf("add_drivers+=\" %s \"\n", strings.Join(vfio_modules(), " ")), fmt.Sprintf("%s/vfio.conf", config.Path.DRACUT))
+ fileio.AppendContent(fmt.Sprintf("add_drivers+=\" %s \"\n", strings.Join(vfio_modules(), " ")), dracutConf)
// Add to our kernel arguments file that vfio_pci should load early (dracut does this using kernel arguments)
fileio.AppendContent(" rd.driver.pre=vfio_pci", config.Path.CMDLINE)
From 45c7dcf7a31496ddff49018e56ea1e15809adbde Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sun, 9 Apr 2023 22:01:38 +0200
Subject: [PATCH 054/132] Add support for mkinitcpio config
---
internal/configs/config_mkinitcpio.go | 64 +++++++++++++++++++++++++++
internal/ui_main_functions.go | 5 +++
2 files changed, 69 insertions(+)
create mode 100644 internal/configs/config_mkinitcpio.go
diff --git a/internal/configs/config_mkinitcpio.go b/internal/configs/config_mkinitcpio.go
new file mode 100644
index 0000000..fdd76c0
--- /dev/null
+++ b/internal/configs/config_mkinitcpio.go
@@ -0,0 +1,64 @@
+package configs
+
+import (
+ "fmt"
+ "os"
+ "regexp"
+ "strings"
+
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
+)
+
+func Set_Mkinitcpio() {
+ // Get the config struct
+ config := GetConfig()
+
+ // Make sure we start from scratch by deleting any old file
+ if fileio.FileExist(config.Path.MKINITCPIO) {
+ os.Remove(config.Path.MKINITCPIO)
+ }
+
+ // Make a regex to get the system path instead of the config path
+ syspath_re := regexp.MustCompile(`^config`)
+ sysfile := syspath_re.ReplaceAllString(config.Path.MKINITCPIO, "")
+
+ // Make a regex to find the modules line
+ module_line_re := regexp.MustCompile(`^MODULES=`)
+ modules_re := regexp.MustCompile(`MODULES=\((.+?)\)`)
+ vfio_modules_re := regexp.MustCompile(`(vfio_iommu_type1|vfio_pci|vfio_virqfd|vfio|vendor-reset)`)
+
+ // Read the mkinitcpio file
+ mkinitcpio_content := fileio.ReadLines(sysfile)
+
+ for _, line := range mkinitcpio_content {
+ // If we are at the line starting with MODULES=
+ if module_line_re.MatchString(line) {
+ // Get the current modules
+ currentmodules := strings.Split(modules_re.ReplaceAllString(line, "${1}"), " ")
+
+ // Get the vfio modules we need to use
+ modules := vfio_modules()
+
+ // If vendor-reset is in the current modules
+ if strings.Contains(line, "vendor-reset") {
+ // Add vendor-reset first
+ modules = append([]string{"vendor-reset"}, modules...)
+ }
+
+ // Loop through current modules and add anything that isnt vfio or vendor-reset related
+ for _, v := range currentmodules {
+ // If what we find is not a vfio module or vendor-reset module
+ if !vfio_modules_re.MatchString(v) {
+ // Add module to module list
+ modules = append(modules, v)
+ }
+ }
+
+ // Write the modules line we generated
+ fileio.AppendContent(fmt.Sprintf("MODULES=(%s)\n", strings.Join(modules, " ")), config.Path.MKINITCPIO)
+ } else {
+ // Else just write the line to the config
+ fileio.AppendContent(fmt.Sprintf("%s\n", line), config.Path.MKINITCPIO)
+ }
+ }
+}
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index c72f8e0..4240456 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -103,6 +103,11 @@ func (m *model) processSelection() bool {
configs.Set_Dracut()
}
+ // If we have a mkinitcpio.conf file
+ if fileio.FileExist(config.Path.MKINITCPIO) {
+ configs.Set_Mkinitcpio()
+ }
+
// Go to the next view
//m.focused++
From f99a5a5ad71d943a94273e3c3d80ab95695a05d8 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 01:40:43 +0200
Subject: [PATCH 055/132] Write in the ability to elevate to sudo
---
pkg/command/command.go | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/pkg/command/command.go b/pkg/command/command.go
index 26978c6..2070c1b 100644
--- a/pkg/command/command.go
+++ b/pkg/command/command.go
@@ -2,8 +2,12 @@ package command
import (
"bytes"
+ "encoding/base64"
"io"
"os/exec"
+ "time"
+
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
)
func Run(binary string, args ...string) ([]string, error) {
@@ -21,6 +25,7 @@ func Run(binary string, args ...string) ([]string, error) {
output, _ := io.ReadAll(&stdout)
outerr, _ := io.ReadAll(&stderr)
+ // Get the output
outputs := []string{}
outputs = append(outputs, string(output))
outputs = append(outputs, string(outerr))
@@ -28,3 +33,32 @@ func Run(binary string, args ...string) ([]string, error) {
// Return our list of items
return outputs, err
}
+
+// This functions runs the command "sudo -Sk -- echo", this forces sudo
+// to re-authenticate and lets us enter the password to STDIN
+// giving us the ability to run sudo commands
+func Elevate(password string) {
+ // Do a simple sudo command to just authenticate with sudo
+ cmd := exec.Command("sudo", "-Sk", "--", "echo")
+
+ // Wait for 500ms, if the password is correct, sudo will return immediately
+ cmd.WaitDelay = 500 * time.Millisecond
+
+ // Open STDIN
+ stdin, err := cmd.StdinPipe()
+ errorcheck.ErrorCheck(err, "Failed to get sudo STDIN")
+
+ // Start the authentication
+ cmd.Start()
+
+ // Get the passed password
+ pw, _ := base64.StdEncoding.DecodeString(password)
+ _, err = stdin.Write([]byte(string(pw) + "\n"))
+ errorcheck.ErrorCheck(err, "Failed at typing to STDIN")
+ // Clear the password
+ pw = nil
+ stdin.Close()
+
+ err = cmd.Wait()
+ errorcheck.ErrorCheck(err)
+}
From e19090942a380ab0cdb790472047f59a945cc041 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 02:09:58 +0200
Subject: [PATCH 056/132] update gitignore
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 6b4c177..db11c2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ utils.old/
bin/
dist/
main
+quickpassthrough
\ No newline at end of file
From 42a017a58ba5bc16fe78adbe7d5b1a4845437e2d Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 02:10:12 +0200
Subject: [PATCH 057/132] update readme for the golang version
---
README.md | 56 +++++++++++++++++++++++++++----------------------------
1 file changed, 27 insertions(+), 29 deletions(-)
diff --git a/README.md b/README.md
index db2b61a..03d0f10 100644
--- a/README.md
+++ b/README.md
@@ -2,59 +2,57 @@
A project to simplify setting up GPU passthrough on your Linux host for [QuickEMU](https://github.com/quickemu-project/quickemu)(vfio support not developed yet) and libvirt/virt-manager
-You can use it by simply running
+You can use it by simply downloading the latest release and run it inside a terminal/shell or by downloading and compiling it yourself with the commands below.
```bash
git clone https://github.com/HikariKnight/quickpassthrough.git
cd quickpassthrough
-./vfio-setup
+go mod download
+go build -o quickpassthrough cmd/main.go
```
## Features
-
* General warning and info about what you will be needing
* Enable and configure vfio modules
-* Configure 2nd GPU for GPU Passthrough
-* Dump the selected GPU rom (as some cards require a romfile for passthrough to work), however no rom patching support planned.
+* Configure 2nd GPU for GPU Passthrough (1 for host, 1 for VM)
+* Generate script to use for dumping the vbios rom (as some cards require a romfile for passthrough to work), however no rom patching support planned.
* Enable and configure the correct kernel modules and load them early (initramfs-tools, dracut and mkinitcpio)
* Configure kernel arguments for systemd-boot (using kernelstub)
* Configure kernel arguments for grub2
* Provides you with the correct kernel arguments to add to your bootloader entry if a supported bootloader is not found
## Contributing
-
-I know my bash skills are not great, so help is always welcome! And help is wanted here.
-If you know bash well, you will be able to help! Just make a pull request to the [dev branch](https://github.com/HikariKnight/quickpassthrough/tree/dev) with your changes!
+This project originally started out as a bash only project, upon completing the proof of concept it became very clear that bash would become very messy with all the weird quirks and regex and inline editing of files.
+So the project moved over to golang, this lets us utilize TUI toolkits like [Bubble Tea](https://github.com/charmbracelet/bubbletea) to build a proper menu system for the project.
+
+If you know golang, bubbletea, passthrough or qemu, you are welcome to help! Just make a pull request to the [dev branch](https://github.com/HikariKnight/quickpassthrough/tree/dev) with your changes!
Just remember to add comments to document the work and explain it for people who are less familiar with the bash syntax or anything else you use. 😄
Also if you know English, you can help by just proof reading. English is not my native language, plus I have dyslexia so I often make spelling mistakes.
Proof reading is still contribution!
-## TODO
+## Features
+* Show general warning to user and inform about making a backup and general expectations
+* Detect if user has an amd or intel CPU and provide the correct IOMMU kernel args based on that
+* Use [ls-iommu](https://github.com/HikariKnight/ls-iommu) to find PCI devices like graphic cards, usb controllers, etc and see what IOMMU group they are in
+* Enable and configure vfio modules
+* Generate the correct kernel arguments for grub and systemd-boot~~
+* Dump the GPU rom, just in case it will be needed for passthrough~~ (no rom patching planned due to complexity)
+* A system you can navigate through, built using [Bubble Tea](https://github.com/charmbracelet/bubbletea) (Help appreciated to make this menu better!)
+* ~~Coloured highlight/text for important information?~~ (not implemented yet)
+* Make sure [vendor-reset](https://github.com/gnif/vendor-reset) module is loaded before vfio, check the repository for the list of cards that require it!
-* ~~Everything~~
-* ~~Show general warning to user and inform about making a backup and general expectations~~
-* ~~Detect if user has an amd or intel CPU and provide the correct IOMMU kernel args based on that~~
-* ~~Tell user to enable IOMMU (VT-d/AMD-v) on their motherboard and bootloader~~
-* ~~Integrate ls-iommu and locate graphic cards and see what IOMMU group they are in~~
-* ~~Enable and configure vfio modules~~
-* ~~Fetch the ID for the GPUs and generate the correct kernel arguments for grub and systemd-boot~~
-* ~~Dump the GPU rom, just in case it will be needed for passthrough~~ (no rom patching planned due to complexity)
-* ~~Get help to actually make the scripts better~~
-* Automatically handle GPUs where parts of it might be in separate IOMMU groups (ex: RX5600XT)
-* A non-hacky menu system? (I will need help by some bash wizards for this)
-* Coloured highlight/text for important information?
-* Install vendor\_reset kernel module? (maybe far future, need to detect if user is using a card that needs it, can however mention where to get it)
-* Suggest looking-glass if they are going to run Windows
+## Features now handled by [ls-iommu](https://github.com/HikariKnight/ls-iommu)
+* Automatically handle GPUs where parts of it might be in separate IOMMU groups (ex: RX6600XT)
+* Fetch the ID and PCI Address of devices
+* Locate the vbios rom path on the system
+* Tell the user to enable IOMMU (VT-d/AMD-v) on their motherboard and bootloader
+* Get a list of devices, their IOMMU groups and various other information
----
-### Why bash?
+### Why GO?
-I wanted the dependencies to be minimal without the need for compilation and to avoid potential breaking changes in the future (like with the transition from python2 to python3).
-
-I know enough bash to make things work, but I am in no way a professional in writing bash scripts as I usually write python and golang.
-
-There is also quite a lot of perl usage as I am quite familiar with the perl regex format over something like sed
+I wanted to learn it, while also using a language that would potentially not create system dependencies. GO fits this criteria when you compile using CGO_ENABLED=0 as this will statically link the libraries and still produce a fairly small (when compressed with upx) binary.
From 86b5ce77e6c36c87f1542a84754c0d94a446abdc Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 02:22:47 +0200
Subject: [PATCH 058/132] move vbios_dumper into configs
---
.../config_vbios_dumper.go} | 18 +++++++-----------
internal/ui_main_functions.go | 5 ++++-
internal/ui_main_view.go | 10 ++++++++--
3 files changed, 19 insertions(+), 14 deletions(-)
rename internal/{gen_vbios_dumper.go => configs/config_vbios_dumper.go} (78%)
diff --git a/internal/gen_vbios_dumper.go b/internal/configs/config_vbios_dumper.go
similarity index 78%
rename from internal/gen_vbios_dumper.go
rename to internal/configs/config_vbios_dumper.go
index 942793d..364361c 100644
--- a/internal/gen_vbios_dumper.go
+++ b/internal/configs/config_vbios_dumper.go
@@ -1,4 +1,4 @@
-package internal
+package configs
import (
"fmt"
@@ -7,15 +7,11 @@ import (
"strings"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
- "github.com/HikariKnight/quickpassthrough/internal/configs"
)
-func generateVBIOSDumper(m model) {
- // Get the vbios path
- m.vbios_path = getIOMMU("-g", "-i", m.gpu_group, "--rom")[0]
-
+func GenerateVBIOSDumper(vbios_path string) {
// Get the config directories
- config := configs.GetConfigPaths()
+ config := GetConfig()
// Get the program directory
exe, _ := os.Executable()
@@ -37,11 +33,11 @@ func generateVBIOSDumper(m model) {
vbios_script := fmt.Sprintf(
vbios_script_template,
- m.vbios_path,
- m.vbios_path,
+ vbios_path,
+ vbios_path,
scriptdir,
- config.QUICKEMU,
- m.vbios_path,
+ config.Path.QUICKEMU,
+ vbios_path,
)
scriptfile, err := os.Create("utils/dump_vbios.sh")
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index 4240456..60cc193 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -32,8 +32,11 @@ func (m *model) processSelection() bool {
m.focused++
case GPU_GROUP:
+ // Get the vbios path
+ m.vbios_path = getIOMMU("-g", "-i", m.gpu_group, "--rom")[0]
+
// Generate the VBIOS dumper script once the user has selected a GPU
- generateVBIOSDumper(*m)
+ configs.GenerateVBIOSDumper(m.vbios_path)
// Change focus to the next view
m.focused++
diff --git a/internal/ui_main_view.go b/internal/ui_main_view.go
index 53de41a..f9a6e0c 100644
--- a/internal/ui_main_view.go
+++ b/internal/ui_main_view.go
@@ -73,11 +73,17 @@ func (m model) View() string {
"Passing a VBIOS rom to the card used for passthrough is required for some cards, but not all.\n",
"Some cards also requires you to patch your VBIOS romfile, check online if this is neccessary for your card!\n",
"The VBIOS will be read from:\n",
- "%s\n\n",
+ fmt.Sprintf(
+ "%s\n\n",
+ m.vbios_path,
+ ),
"The script to extract the vbios has to be run as sudo and without a displaymanager running for proper dumping!\n",
"\n",
"You can run the script with:\n",
- "%s/utils/dump_vbios.sh",
+ fmt.Sprintf(
+ "%s/utils/dump_vbios.sh",
+ scriptdir,
+ ),
),
)
From f0cd5e408da4231fda6caa934f09680bd0efb185 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 02:40:50 +0200
Subject: [PATCH 059/132] update the generated script
---
internal/configs/config_vbios_dumper.go | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/internal/configs/config_vbios_dumper.go b/internal/configs/config_vbios_dumper.go
index 364361c..7b60c36 100644
--- a/internal/configs/config_vbios_dumper.go
+++ b/internal/configs/config_vbios_dumper.go
@@ -26,17 +26,25 @@ func GenerateVBIOSDumper(vbios_path string) {
"#!/bin/bash\n",
"# THIS FILE IS AUTO GENERATED!\n",
"# IF YOU HAVE CHANGED GPU, PLEASE RE-RUN QUICKPASSTHROUGH!\n",
+ "mkdir -p \"%s\"\n",
+ "echo Attempting to enable reading from rom\n",
"echo 1 | sudo tee %s\n",
+ "echo Attempting to dump VBIOS\n",
"sudo bash -c \"cat %s\" > %s/%s/vfio_card.rom\n",
+ "file \"%s/%s/vfio_card.rom\"\n",
+ "echo Attempting to disable reading from rom \\(cleanup\\)\n",
"echo 0 | sudo tee %s\n",
)
vbios_script := fmt.Sprintf(
vbios_script_template,
+ config.Path.QUICKEMU,
vbios_path,
vbios_path,
scriptdir,
config.Path.QUICKEMU,
+ scriptdir,
+ config.Path.QUICKEMU,
vbios_path,
)
From 4ed469b578b6e07858f704daf224493e6fb0a93a Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 02:53:46 +0200
Subject: [PATCH 060/132] Add a failure message to the script
---
internal/configs/config_vbios_dumper.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/internal/configs/config_vbios_dumper.go b/internal/configs/config_vbios_dumper.go
index 7b60c36..c64b773 100644
--- a/internal/configs/config_vbios_dumper.go
+++ b/internal/configs/config_vbios_dumper.go
@@ -29,9 +29,11 @@ func GenerateVBIOSDumper(vbios_path string) {
"mkdir -p \"%s\"\n",
"echo Attempting to enable reading from rom\n",
"echo 1 | sudo tee %s\n",
+ "echo\n",
"echo Attempting to dump VBIOS\n",
- "sudo bash -c \"cat %s\" > %s/%s/vfio_card.rom\n",
+ "sudo bash -c \"cat %s\" > %s/%s/vfio_card.rom || echo \"Failed to dump the VBIOS, in most cases a reboot can fix this.\nOr you have to bind the gpu to the vfio-pci driver, reboot the machine and try dumping again\"\n",
"file \"%s/%s/vfio_card.rom\"\n",
+ "echo\n",
"echo Attempting to disable reading from rom \\(cleanup\\)\n",
"echo 0 | sudo tee %s\n",
)
From 9204f72e9138e421ec62846656963a49022225af Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 12:29:23 +0200
Subject: [PATCH 061/132] remove loaded from our model struct as we dont need
it
---
internal/ui_main_events.go | 6 ++----
internal/ui_main_view.go | 2 +-
internal/ui_model.go | 1 -
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
index d308a57..22f9262 100644
--- a/internal/ui_main_events.go
+++ b/internal/ui_main_events.go
@@ -13,7 +13,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
return m, tea.Quit
case "enter":
- if m.loaded {
+ if m.width != 0 {
// Process the selected item, if the return value is true then exit the application
if m.processSelection() {
return m, tea.Quit
@@ -33,13 +33,11 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
}
case tea.WindowSizeMsg:
- if !m.loaded {
+ if m.width == 0 {
// Initialize the static lists and make sure the content
// does not extend past the screen
m.initLists(msg.Width, msg.Height)
- // Set model loaded to true
- m.loaded = true
} else {
// Else we are loaded and will update the sizing on the fly
m.height = msg.Height
diff --git a/internal/ui_main_view.go b/internal/ui_main_view.go
index f9a6e0c..247262d 100644
--- a/internal/ui_main_view.go
+++ b/internal/ui_main_view.go
@@ -10,7 +10,7 @@ import (
)
func (m model) View() string {
- if m.loaded {
+ if m.width != 0 {
title := ""
switch m.focused {
case INTRO:
diff --git a/internal/ui_model.go b/internal/ui_model.go
index bbe3549..31bf881 100644
--- a/internal/ui_model.go
+++ b/internal/ui_model.go
@@ -24,7 +24,6 @@ type model struct {
lists []list.Model
gpu_group string
vbios_path string
- loaded bool
focused status
offsetx []int
offsety []int
From 7f5a75dd94abb3aab728367c206574b948f30324 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 13:10:19 +0200
Subject: [PATCH 062/132] Start logging to file for debugging
---
.gitignore | 3 ++-
internal/configs/configs.go | 7 +++++++
internal/logger/logger.go | 12 ++++++++++++
internal/ui_main.go | 10 +++++++++-
4 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644 internal/logger/logger.go
diff --git a/.gitignore b/.gitignore
index db11c2e..f0eea18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ utils.old/
bin/
dist/
main
-quickpassthrough
\ No newline at end of file
+quickpassthrough
+debug.log
\ No newline at end of file
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index 15d43dd..e2c49b3 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -6,6 +6,7 @@ import (
"regexp"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
"github.com/HikariKnight/quickpassthrough/pkg/uname"
"github.com/klauspost/cpuid/v2"
@@ -83,6 +84,9 @@ func InitConfigs() {
// If the path exists
if fileio.FileExist(syspath) {
+ // Write to log
+ logger.Printf("%s found on the system\nCreating %s", syspath, confpath)
+
// Create the directories for our configs
err := os.MkdirAll(confpath, os.ModePerm)
errorcheck.ErrorCheck(err)
@@ -103,6 +107,9 @@ func InitConfigs() {
// If the file exists
if fileio.FileExist(sysfile) {
+ // Write to log
+ logger.Printf("%s found on the system\nCreating %s", sysfile, conffile)
+
// Create the directories for our configs
file, err := os.Create(conffile)
errorcheck.ErrorCheck(err)
diff --git a/internal/logger/logger.go b/internal/logger/logger.go
new file mode 100644
index 0000000..522feb7
--- /dev/null
+++ b/internal/logger/logger.go
@@ -0,0 +1,12 @@
+package logger
+
+import (
+ "fmt"
+ "log"
+)
+
+// Formats our log output to \n%s\n\n for readability
+func Printf(content string, v ...any) {
+ content = fmt.Sprintf("\n%s\n\n", content)
+ log.Printf(content, v...)
+}
diff --git a/internal/ui_main.go b/internal/ui_main.go
index a8f19c4..05410e7 100644
--- a/internal/ui_main.go
+++ b/internal/ui_main.go
@@ -4,17 +4,25 @@ package internal
// from the Bubbles component library.
import (
+ "os"
+
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
tea "github.com/charmbracelet/bubbletea"
)
// This is where we build everything
func Tui() {
+ // Log all errors to a new logfile
+ os.Remove("debug.log")
+ logfile, err := tea.LogToFile("debug.log", "")
+ errorcheck.ErrorCheck(err, "Error creating log file")
+ defer logfile.Close()
+
// Make a blank model to keep our state in
m := NewModel()
// Start the program with the model
p := tea.NewProgram(m, tea.WithAltScreen())
- _, err := p.Run()
+ _, err = p.Run()
errorcheck.ErrorCheck(err, "Failed to initialize UI")
}
From 27a52cda1f9da9faac1e66db4aa270e5a48c96e8 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 13:55:44 +0200
Subject: [PATCH 063/132] update vbios dumper script
---
internal/configs/config_vbios_dumper.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/internal/configs/config_vbios_dumper.go b/internal/configs/config_vbios_dumper.go
index c64b773..4aa1861 100644
--- a/internal/configs/config_vbios_dumper.go
+++ b/internal/configs/config_vbios_dumper.go
@@ -31,7 +31,7 @@ func GenerateVBIOSDumper(vbios_path string) {
"echo 1 | sudo tee %s\n",
"echo\n",
"echo Attempting to dump VBIOS\n",
- "sudo bash -c \"cat %s\" > %s/%s/vfio_card.rom || echo \"Failed to dump the VBIOS, in most cases a reboot can fix this.\nOr you have to bind the gpu to the vfio-pci driver, reboot the machine and try dumping again\"\n",
+ "sudo bash -c \"cat %s\" > %s/%s/vfio_card.rom || echo \"\nFailed to dump the VBIOS, in most cases a reboot can fix this.\nOr you have to bind the gpu to the vfio-pci driver, reboot the machine and try dumping again.\nIf that still fails, you might find your VBIOS at: https://www.techpowerup.com/vgabios/\n\"\n",
"file \"%s/%s/vfio_card.rom\"\n",
"echo\n",
"echo Attempting to disable reading from rom \\(cleanup\\)\n",
From 639d056abe3663d1a443df5d3bba000d12e353a6 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 14:26:50 +0200
Subject: [PATCH 064/132] Add logger debug output
---
internal/configs/config_dracut.go | 4 +++
internal/configs/config_mkinitcpio.go | 10 +++++++
internal/configs/config_modprobe.go | 40 +++++++++++++++----------
internal/configs/config_vbios_dumper.go | 5 ++++
internal/configs/config_vfio_video.go | 4 +++
internal/configs/configs.go | 20 +++++++++++--
internal/utiil_ls-iommu.go | 6 ++++
7 files changed, 71 insertions(+), 18 deletions(-)
diff --git a/internal/configs/config_dracut.go b/internal/configs/config_dracut.go
index 52a6507..1e7c137 100644
--- a/internal/configs/config_dracut.go
+++ b/internal/configs/config_dracut.go
@@ -5,6 +5,7 @@ import (
"os"
"strings"
+ "github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
@@ -19,6 +20,9 @@ func Set_Dracut() {
os.Remove(dracutConf)
}
+ // Write to logger
+ logger.Printf("Writing to %s:\nadd_drivers+=\" %s \"", dracutConf, strings.Join(vfio_modules(), " "))
+
// Write the dracut config file
fileio.AppendContent(fmt.Sprintf("add_drivers+=\" %s \"\n", strings.Join(vfio_modules(), " ")), dracutConf)
diff --git a/internal/configs/config_mkinitcpio.go b/internal/configs/config_mkinitcpio.go
index fdd76c0..7173356 100644
--- a/internal/configs/config_mkinitcpio.go
+++ b/internal/configs/config_mkinitcpio.go
@@ -6,6 +6,7 @@ import (
"regexp"
"strings"
+ "github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
@@ -30,6 +31,9 @@ func Set_Mkinitcpio() {
// Read the mkinitcpio file
mkinitcpio_content := fileio.ReadLines(sysfile)
+ // Write to logger
+ logger.Printf("Read %s:\n%s", sysfile, strings.Join(mkinitcpio_content, "\n"))
+
for _, line := range mkinitcpio_content {
// If we are at the line starting with MODULES=
if module_line_re.MatchString(line) {
@@ -41,6 +45,9 @@ func Set_Mkinitcpio() {
// If vendor-reset is in the current modules
if strings.Contains(line, "vendor-reset") {
+ // Write to logger
+ logger.Printf("vendor-reset module detected in %s\nMaking sure it will be loaded before vfio", sysfile)
+
// Add vendor-reset first
modules = append([]string{"vendor-reset"}, modules...)
}
@@ -54,6 +61,9 @@ func Set_Mkinitcpio() {
}
}
+ // Write to logger
+ logger.Printf("Replacing line in %s:\n%s\nWith:\nMODULES=(%s)\n", config.Path.MKINITCPIO, line, strings.Join(modules, " "))
+
// Write the modules line we generated
fileio.AppendContent(fmt.Sprintf("MODULES=(%s)\n", strings.Join(modules, " ")), config.Path.MKINITCPIO)
} else {
diff --git a/internal/configs/config_modprobe.go b/internal/configs/config_modprobe.go
index c3095b4..308e465 100644
--- a/internal/configs/config_modprobe.go
+++ b/internal/configs/config_modprobe.go
@@ -5,6 +5,7 @@ import (
"os"
"strings"
+ "github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
@@ -19,6 +20,8 @@ func Set_Modprobe(gpu_IDs []string) {
vfio_pci_options = append(vfio_pci_options, strings.Join(gpu_IDs, ","))
if strings.Contains(kernel_args, "vfio_pci.disable_vga=1") {
+ // Write to logger
+ logger.Printf("User has disabled vfio video output on host, adding disable_vga=1 to the optional hardcoded vfio_pci options")
vfio_pci_options = append(vfio_pci_options, "disable_vga=1")
}
@@ -31,24 +34,29 @@ func Set_Modprobe(gpu_IDs []string) {
os.Remove(conffile)
}
+ content := fmt.Sprint(
+ "## This is an autogenerated file that stubs your graphic card for use with vfio\n",
+ "## This file should be placed inside /etc/modprobe.d/\n",
+ "# Uncomment the line below to \"hardcode\" your graphic card to be bound to the vfio-pci driver.\n",
+ "# In most cases this should not be neccessary, it will also prevent you from turning off vfio in the bootloader.\n",
+ fmt.Sprintf(
+ "#options vfio_pci ids=%s\n",
+ strings.Join(vfio_pci_options, " "),
+ ),
+ "\n",
+ "# Make sure vfio_pci is loaded before these modules: nvidia, nouveau, amdgpu and radeon\n",
+ "softdep nvidia pre: vfio vfio_pci\n",
+ "softdep nouveau pre: vfio vfio_pci\n",
+ "softdep amdgpu pre: vfio vfio_pci\n",
+ "softdep radeon pre: vfio vfio_pci\n",
+ )
+
+ // Write to logger
+ logger.Printf("Writing %s:\n%s", conffile, content)
+
// Write the vfio.conf file to our modprobe config
fileio.AppendContent(
- fmt.Sprint(
- "## This is an autogenerated file that stubs your graphic card for use with vfio\n",
- "## This file should be placed inside /etc/modprobe.d/\n",
- "# Uncomment the line below to \"hardcode\" your graphic card to be bound to the vfio-pci driver.\n",
- "# In most cases this should not be neccessary, it will also prevent you from turning off vfio in the bootloader.\n",
- fmt.Sprintf(
- "#options vfio_pci ids=%s\n",
- strings.Join(vfio_pci_options, " "),
- ),
- "\n",
- "# Make sure vfio_pci is loaded before these modules: nvidia, nouveau, amdgpu and radeon\n",
- "softdep nvidia pre: vfio vfio_pci\n",
- "softdep nouveau pre: vfio vfio_pci\n",
- "softdep amdgpu pre: vfio vfio_pci\n",
- "softdep radeon pre: vfio vfio_pci\n",
- ),
+ content,
conffile,
)
}
diff --git a/internal/configs/config_vbios_dumper.go b/internal/configs/config_vbios_dumper.go
index 4aa1861..6328af6 100644
--- a/internal/configs/config_vbios_dumper.go
+++ b/internal/configs/config_vbios_dumper.go
@@ -7,6 +7,7 @@ import (
"strings"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/HikariKnight/quickpassthrough/internal/logger"
)
func GenerateVBIOSDumper(vbios_path string) {
@@ -50,6 +51,7 @@ func GenerateVBIOSDumper(vbios_path string) {
vbios_path,
)
+ // Make the script file
scriptfile, err := os.Create("utils/dump_vbios.sh")
errorcheck.ErrorCheck(err, "Cannot create file \"utils/dump_vbios.sh\"")
defer scriptfile.Close()
@@ -58,6 +60,9 @@ func GenerateVBIOSDumper(vbios_path string) {
scriptfile.Chmod(0775)
errorcheck.ErrorCheck(err, "Could not change permissions of \"utils/dump_vbios.sh\"")
+ // Write to logger
+ logger.Printf("Writing utils/dump_vbios.sh")
+
// Write the script
scriptfile.WriteString(vbios_script)
}
diff --git a/internal/configs/config_vfio_video.go b/internal/configs/config_vfio_video.go
index 5dd976f..d654d81 100644
--- a/internal/configs/config_vfio_video.go
+++ b/internal/configs/config_vfio_video.go
@@ -3,6 +3,7 @@ package configs
import (
"fmt"
+ "github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
@@ -10,6 +11,9 @@ func DisableVFIOVideo(i int) {
// Get the config
config := GetConfig()
+ // Write to logger
+ logger.Printf("Adding vfio_pci.disable_vga=%v to %s", i, config.Path.CMDLINE)
+
// Add to the kernel arguments that we want to disable VFIO video output on the host
fileio.AppendContent(
fmt.Sprintf(
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index e2c49b3..d720708 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -85,7 +85,12 @@ func InitConfigs() {
// If the path exists
if fileio.FileExist(syspath) {
// Write to log
- logger.Printf("%s found on the system\nCreating %s", syspath, confpath)
+ logger.Printf(
+ "%s found on the system\n"+
+ "Creating %s",
+ syspath,
+ confpath,
+ )
// Create the directories for our configs
err := os.MkdirAll(confpath, os.ModePerm)
@@ -108,7 +113,12 @@ func InitConfigs() {
// If the file exists
if fileio.FileExist(sysfile) {
// Write to log
- logger.Printf("%s found on the system\nCreating %s", sysfile, conffile)
+ logger.Printf(
+ "%s found on the system\n"+
+ "Creating %s",
+ sysfile,
+ conffile,
+ )
// Create the directories for our configs
file, err := os.Create(conffile)
@@ -119,6 +129,9 @@ func InitConfigs() {
// If we now have a config that exists
if fileio.FileExist(conffile) {
+ // Write to logger
+ logger.Printf("Getting the header (if it is there) from %s", conffile)
+
switch conffile {
case config.Path.ETCMODULES:
// Read the header
@@ -151,6 +164,9 @@ func vfio_modules() []string {
sysinfo := uname.New()
kernel_re := regexp.MustCompile(`^(6\.1|6\.0|[1-5]\.)`)
if kernel_re.MatchString(sysinfo.Kernel) {
+ // Write to the debug log
+ logger.Printf("Linux kernel version %s detected!\nIncluding vfio_virqfd module")
+
// Include the vfio_virqfd module
// NOTE: this driver was merged into the vfio module in 6.2
modules = append(modules, "vfio_virqfd")
diff --git a/internal/utiil_ls-iommu.go b/internal/utiil_ls-iommu.go
index 11259fa..71e65d2 100644
--- a/internal/utiil_ls-iommu.go
+++ b/internal/utiil_ls-iommu.go
@@ -10,11 +10,14 @@ import (
"strings"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
+ "github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/charmbracelet/bubbles/list"
)
func getIOMMU(args ...string) []string {
var stdout, stderr bytes.Buffer
+ // Write to logger
+ logger.Printf("Executing: utils/ls-iommu %s", strings.Join(args, " "))
// Configure the ls-iommu command
cmd := exec.Command("utils/ls-iommu", args...)
@@ -31,6 +34,9 @@ func getIOMMU(args ...string) []string {
var items []string
output, _ := io.ReadAll(&stdout)
+ // Write to logger
+ logger.Printf("ls-iommu query returned\n%s", string(output))
+
// Parse the output line by line
scanner := bufio.NewScanner(strings.NewReader(string(output)))
for scanner.Scan() {
From 798427280bfafd0561bcce8cbfe1a00d991ff037 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 14:36:57 +0200
Subject: [PATCH 065/132] Add documentation
---
internal/configs/config_dracut.go | 1 +
internal/configs/config_mkinitcpio.go | 1 +
internal/configs/config_modprobe.go | 1 +
internal/configs/config_vbios_dumper.go | 2 ++
internal/configs/config_vfio_video.go | 2 ++
internal/configs/configs.go | 4 ++++
6 files changed, 11 insertions(+)
diff --git a/internal/configs/config_dracut.go b/internal/configs/config_dracut.go
index 1e7c137..0a87da5 100644
--- a/internal/configs/config_dracut.go
+++ b/internal/configs/config_dracut.go
@@ -9,6 +9,7 @@ import (
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
+// This function writes a dracut configuration file for /etc/dracut.conf.d/
func Set_Dracut() {
config := GetConfig()
diff --git a/internal/configs/config_mkinitcpio.go b/internal/configs/config_mkinitcpio.go
index 7173356..369d1ab 100644
--- a/internal/configs/config_mkinitcpio.go
+++ b/internal/configs/config_mkinitcpio.go
@@ -10,6 +10,7 @@ import (
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
+// This function copies the content of /etc/mkinitcpio.conf to the config folder and does an inline replace/insert on the MODULES=() line
func Set_Mkinitcpio() {
// Get the config struct
config := GetConfig()
diff --git a/internal/configs/config_modprobe.go b/internal/configs/config_modprobe.go
index 308e465..ba8cc3e 100644
--- a/internal/configs/config_modprobe.go
+++ b/internal/configs/config_modprobe.go
@@ -9,6 +9,7 @@ import (
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
+// This function generates a modprobe file for /etc/modprobe.d/
func Set_Modprobe(gpu_IDs []string) {
// Get the config
config := GetConfig()
diff --git a/internal/configs/config_vbios_dumper.go b/internal/configs/config_vbios_dumper.go
index 6328af6..afc4260 100644
--- a/internal/configs/config_vbios_dumper.go
+++ b/internal/configs/config_vbios_dumper.go
@@ -10,6 +10,8 @@ import (
"github.com/HikariKnight/quickpassthrough/internal/logger"
)
+// Generates a script file named dump_vbios.sh and places it inside the utils folder.
+// This script has to be run without a display manager or display server running
func GenerateVBIOSDumper(vbios_path string) {
// Get the config directories
config := GetConfig()
diff --git a/internal/configs/config_vfio_video.go b/internal/configs/config_vfio_video.go
index d654d81..a439237 100644
--- a/internal/configs/config_vfio_video.go
+++ b/internal/configs/config_vfio_video.go
@@ -7,6 +7,8 @@ import (
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
+// This function adds the disable vfio video output on host option to the config
+// The function will use the given int as the value for the option
func DisableVFIOVideo(i int) {
// Get the config
config := GetConfig()
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index d720708..1602ede 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -29,6 +29,7 @@ type Config struct {
Path *Path
}
+// Gets the path to all the config files
func GetConfigPaths() *Path {
Paths := &Path{
CMDLINE: "config/kernel_args",
@@ -44,6 +45,7 @@ func GetConfigPaths() *Path {
return Paths
}
+// Gets all the configs and returns the struct
func GetConfig() *Config {
config := &Config{
Bootloader: "unknown",
@@ -57,6 +59,7 @@ func GetConfig() *Config {
return config
}
+// Constructs the empty config files and folders based on what exists on the system
func InitConfigs() {
config := GetConfig()
@@ -152,6 +155,7 @@ func InitConfigs() {
}
}
+// Returns a list of modules used for vfio based on the systems kernel version
func vfio_modules() []string {
// Make the list of modules
modules := []string{
From 7eb7e2fa1c64db5509fdcf0ba262a6fdab43e013 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 16:28:12 +0200
Subject: [PATCH 066/132] Starting work on the authDialog needed for Elevate
---
internal/ui_main_events.go | 64 ++++++++++++++++++++++++++------------
internal/ui_main_view.go | 22 +++++++++++--
internal/ui_model.go | 23 ++++++++++++--
3 files changed, 85 insertions(+), 24 deletions(-)
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
index 22f9262..7de865f 100644
--- a/internal/ui_main_events.go
+++ b/internal/ui_main_events.go
@@ -6,31 +6,53 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var cmd tea.Cmd
switch msg := msg.(type) {
case tea.KeyMsg:
- // Setup keybindings
- switch msg.String() {
- case "ctrl+c", "q":
- // Exit when user presses Q or CTRL+C
- return m, tea.Quit
- case "enter":
- if m.width != 0 {
- // Process the selected item, if the return value is true then exit the application
- if m.processSelection() {
+ // If we are not done
+ if m.focused != DONE {
+ // Setup keybindings
+ switch msg.String() {
+ case "ctrl+c", "q":
+ // Exit when user presses Q or CTRL+C
+ return m, tea.Quit
+
+ case "enter":
+ if m.width != 0 {
+ // Process the selected item, if the return value is true then exit the application
+ if m.processSelection() {
+ return m, tea.Quit
+ }
+ }
+ case "ctrl+z", "backspace":
+ // Go backwards in the model
+ if m.focused > 0 && m.focused != DONE {
+ m.focused--
+ return m, nil
+ } else if m.focused == DONE {
+ // Since we have no QuickEmu support, skip the usb controller configuration
+ m.focused = VIDEO
+ } else {
+ // If we are at the beginning, just exit
return m, tea.Quit
}
}
- case "ctrl+z", "backspace":
- // Go backwards in the model
- if m.focused > 0 && m.focused != DONE {
- m.focused--
- return m, nil
- } else if m.focused == DONE {
- // Since we have no QuickEmu support, skip the usb controller configuration
- m.focused = VIDEO
- } else {
- // If we are at the beginning, just exit
+ } else {
+ // If we are done then handle keybindings a bit differently
+ // Setup keybindings for authDialog
+ switch msg.String() {
+ case "ctrl+c":
+ // Exit when user presses CTRL+C
return m, tea.Quit
+
+ case "enter":
+ if m.width != 0 {
+ // Process the selected item, if the return value is true then exit the application
+ if m.processSelection() {
+ return m, tea.Quit
+ }
+ }
}
+ m.authDialog, cmd = m.authDialog.Update(msg)
+ return m, cmd
}
case tea.WindowSizeMsg:
if m.width == 0 {
@@ -52,12 +74,14 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
// Update the styles with the correct width
dialogStyle = dialogStyle.Width(m.width)
listStyle = listStyle.Width(m.width)
- titleStyle = titleStyle.Width(m.width - 2)
+ titleStyle = titleStyle.Width(m.width - 4)
choiceStyle = choiceStyle.Width(m.width)
}
}
}
}
+
+ // Run another update loop
m.lists[m.focused], cmd = m.lists[m.focused].Update(msg)
return m, cmd
}
diff --git a/internal/ui_main_view.go b/internal/ui_main_view.go
index 247262d..7d0651e 100644
--- a/internal/ui_main_view.go
+++ b/internal/ui_main_view.go
@@ -12,6 +12,7 @@ import (
func (m model) View() string {
if m.width != 0 {
title := ""
+ view := "Empty View :("
switch m.focused {
case INTRO:
title = dialogStyle.Render(
@@ -31,11 +32,16 @@ func (m model) View() string {
"becomes unbootable, as you will be asked to verify the files generated",
),
)
+
+ view = listStyle.Render(m.lists[m.focused].View())
+
case GPUS:
title = titleStyle.MarginLeft(2).Render(
"Select a GPU to check the IOMMU groups of",
)
+ view = listStyle.Render(m.lists[m.focused].View())
+
case GPU_GROUP:
title = titleStyle.Render(
fmt.Sprint(
@@ -44,11 +50,15 @@ func (m model) View() string {
),
)
+ view = listStyle.Render(m.lists[m.focused].View())
+
case USB:
title = titleStyle.Render(
"[OPTIONAL]: Select a USB Controller to check the IOMMU groups of",
)
+ view = listStyle.Render(m.lists[m.focused].View())
+
case USB_GROUP:
title = titleStyle.Render(
fmt.Sprint(
@@ -57,6 +67,8 @@ func (m model) View() string {
),
)
+ view = listStyle.Render(m.lists[m.focused].View())
+
case VBIOS:
// Get the program directory
exe, _ := os.Executable()
@@ -89,6 +101,8 @@ func (m model) View() string {
title = fmt.Sprintf(text, m.vbios_path, scriptdir)
+ view = listStyle.Render(m.lists[m.focused].View())
+
case VIDEO:
title = dialogStyle.Render(
fmt.Sprint(
@@ -99,13 +113,15 @@ func (m model) View() string {
),
)
+ view = listStyle.Render(m.lists[m.focused].View())
+
case DONE:
title = dialogStyle.Render(
fmt.Sprint(
"The configuration files have been generated and are\n",
"located inside the \"config\" folder\n",
"\n",
- "* The \"cmdline\" file contains kernel arguments that your bootloader needs\n",
+ "* The \"kernel_args\" file contains kernel arguments that your bootloader needs\n",
"* The \"quickemu\" folder contains files that might be\n useable for quickemu in the future\n",
"* The files inside the \"etc\" folder must be copied to your system.\n",
" NOTE: Verify that these files are correctly formated/edited!\n",
@@ -114,9 +130,11 @@ func (m model) View() string {
"run it to copy the files to your system and make a backup of your old files.",
),
)
+
+ view = m.authDialog.View()
}
//return listStyle.SetString(fmt.Sprintf("%s\n\n", title)).Render(m.lists[m.focused].View())
- return lipgloss.JoinVertical(lipgloss.Left, fmt.Sprintf("%s\n%s\n", title, listStyle.Render(m.lists[m.focused].View())))
+ return lipgloss.JoinVertical(lipgloss.Left, fmt.Sprintf("%s\n%s\n", title, view))
} else {
return "Loading..."
}
diff --git a/internal/ui_model.go b/internal/ui_model.go
index 31bf881..721ec49 100644
--- a/internal/ui_model.go
+++ b/internal/ui_model.go
@@ -1,7 +1,12 @@
package internal
import (
+ "fmt"
+ "os/user"
+
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
"github.com/charmbracelet/bubbles/list"
+ "github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
)
@@ -29,6 +34,7 @@ type model struct {
offsety []int
width int
height int
+ authDialog textinput.Model
}
// Consts used to navigate the main model
@@ -44,8 +50,21 @@ const (
)
func NewModel() *model {
+ // Get the username
+ user, err := user.Current()
+ errorcheck.ErrorCheck(err, "Error getting username")
+ username := user.Username
+
+ // Create the auth input and focus it
+ authInput := textinput.New()
+ authInput.EchoMode = textinput.EchoPassword
+ authInput.Prompt = fmt.Sprintf("\n[sudo] password for %s: ", username)
+ authInput.Focus()
+
// Create a blank model and return it
- return &model{}
+ return &model{
+ authDialog: authInput,
+ }
}
func (m model) Init() tea.Cmd {
@@ -89,7 +108,7 @@ func (m *model) initLists(width, height int) {
// Update the styles with the correct width
dialogStyle = dialogStyle.Width(m.width)
listStyle = listStyle.Width(m.width)
- titleStyle = titleStyle.Width(m.width - 2)
+ titleStyle = titleStyle.Width(m.width - 4)
choiceStyle = choiceStyle.Width(m.width)
// Make m.fetched and set all values to FALSE
From 300ca653cc1b7f3af22edd121d6b7aa441036f96 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 18:33:48 +0200
Subject: [PATCH 067/132] implement backup system
---
internal/configs/config_dracut.go | 3 +++
internal/configs/config_modprobe.go | 3 +++
internal/configs/configs.go | 39 +++++++++++++++++++++++++++++
internal/ui_main_events.go | 7 +++---
internal/ui_main_view.go | 9 +++++--
pkg/fileio/fileio.go | 33 +++++++++++++++++++++++-
6 files changed, 88 insertions(+), 6 deletions(-)
diff --git a/internal/configs/config_dracut.go b/internal/configs/config_dracut.go
index 0a87da5..8330031 100644
--- a/internal/configs/config_dracut.go
+++ b/internal/configs/config_dracut.go
@@ -29,4 +29,7 @@ func Set_Dracut() {
// Add to our kernel arguments file that vfio_pci should load early (dracut does this using kernel arguments)
fileio.AppendContent(" rd.driver.pre=vfio_pci", config.Path.CMDLINE)
+
+ // Make a backup of dracutConf if there is one there
+ backupFile(strings.Replace(dracutConf, "config", "", 1))
}
diff --git a/internal/configs/config_modprobe.go b/internal/configs/config_modprobe.go
index ba8cc3e..227cd61 100644
--- a/internal/configs/config_modprobe.go
+++ b/internal/configs/config_modprobe.go
@@ -60,4 +60,7 @@ func Set_Modprobe(gpu_IDs []string) {
content,
conffile,
)
+
+ // Make a backup of dracutConf if there is one there
+ backupFile(strings.Replace(conffile, "config", "", 1))
}
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index 1602ede..dc0096f 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -95,6 +95,9 @@ func InitConfigs() {
confpath,
)
+ // Make a backup directory
+ makeBackupDir(syspath)
+
// Create the directories for our configs
err := os.MkdirAll(confpath, os.ModePerm)
errorcheck.ErrorCheck(err)
@@ -128,6 +131,9 @@ func InitConfigs() {
errorcheck.ErrorCheck(err)
// Close the file so we can edit it
file.Close()
+
+ // Backup the sysfile if we do not have a backup
+ backupFile(sysfile)
}
// If we now have a config that exists
@@ -179,3 +185,36 @@ func vfio_modules() []string {
// Return the modules
return modules
}
+
+func backupFile(source string) {
+ // Make a destination path
+ dest := fmt.Sprintf("backup%s", source)
+
+ // If the file exists in the config but not on the system it is a file we make
+ if fileio.FileExist(fmt.Sprintf("config%s", source)) && !fileio.FileExist(source) {
+ // Create the blank file so that a copy of the backup folder to /etc
+ file, err := os.Create(dest)
+ errorcheck.ErrorCheck(err, "Error creating file %s", dest)
+ file.Close()
+ } else if !fileio.FileExist(dest) {
+ // If a backup of the file does not exist
+ // Write to the logger
+ logger.Printf("No first time backup of %s detected.\nCreating a backup at %s", source, dest)
+
+ // Copy the file
+ fileio.FileCopy(source, dest)
+ }
+
+}
+
+func makeBackupDir(dest string) {
+ // If a backup directory does not exist
+ if !fileio.FileExist("backup/") {
+ // Write to the logger
+ logger.Printf("Backup directory does not exist!\nCreating backup directory for first run backup")
+ }
+
+ // Make the empty directories
+ err := os.MkdirAll(fmt.Sprintf("backup/%s", dest), os.ModePerm)
+ errorcheck.ErrorCheck(err, "Error making backup/ folder")
+}
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
index 7de865f..83a3758 100644
--- a/internal/ui_main_events.go
+++ b/internal/ui_main_events.go
@@ -27,9 +27,6 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
if m.focused > 0 && m.focused != DONE {
m.focused--
return m, nil
- } else if m.focused == DONE {
- // Since we have no QuickEmu support, skip the usb controller configuration
- m.focused = VIDEO
} else {
// If we are at the beginning, just exit
return m, tea.Quit
@@ -39,6 +36,10 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
// If we are done then handle keybindings a bit differently
// Setup keybindings for authDialog
switch msg.String() {
+ case "ctrl+z":
+ // Since we have no QuickEmu support, skip the usb controller configuration
+ m.focused = VIDEO
+
case "ctrl+c":
// Exit when user presses CTRL+C
return m, tea.Quit
diff --git a/internal/ui_main_view.go b/internal/ui_main_view.go
index 7d0651e..d0b448f 100644
--- a/internal/ui_main_view.go
+++ b/internal/ui_main_view.go
@@ -125,9 +125,14 @@ func (m model) View() string {
"* The \"quickemu\" folder contains files that might be\n useable for quickemu in the future\n",
"* The files inside the \"etc\" folder must be copied to your system.\n",
" NOTE: Verify that these files are correctly formated/edited!\n",
+ "* Once all files have been copied, you need to update your bootloader and rebuild\n",
+ " your initramfs using the tools to do so by your system.\n",
"\n",
- "A script file named \"install.sh\" has been generated,\n",
- "run it to copy the files to your system and make a backup of your old files.",
+ "This program can do this for you, however the program will have to\n",
+ "type your password to sudo using STDIN, to avoid using STDIN press CTRL+C\n",
+ "and copy the files, update your bootloader and rebuild your initramfs manually.\n",
+ "If you want to go back and change something, press CTRL+Z\n",
+ "\nNOTE: A backup of the original files from the first run can be found in the backup folder",
),
)
diff --git a/pkg/fileio/fileio.go b/pkg/fileio/fileio.go
index 959394e..38c5a7a 100644
--- a/pkg/fileio/fileio.go
+++ b/pkg/fileio/fileio.go
@@ -4,13 +4,17 @@ import (
"bufio"
"errors"
"fmt"
+ "io"
"os"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
)
-// This just implements repetetive tasks I have to do with files
+/*
+ * This just implements repetetive tasks I have to do with files
+ */
+// Creates a file and appends the content to the file (ending newline must be supplied with content string)
func AppendContent(content string, fileName string) {
// Open the file
f, err := os.OpenFile(fileName, os.O_CREATE|os.O_APPEND|os.O_WRONLY, os.ModePerm)
@@ -22,6 +26,7 @@ func AppendContent(content string, fileName string) {
errorcheck.ErrorCheck(err, fmt.Sprintf("Error writing to %s", fileName))
}
+// Reads the file and returns a stringlist with each line
func ReadLines(fileName string) []string {
content, err := os.Open(fileName)
errorcheck.ErrorCheck(err, fmt.Sprintf("Error reading file %s", fileName))
@@ -41,6 +46,7 @@ func ReadLines(fileName string) []string {
}
+// Reads a file and returns all the content as a string
func ReadFile(fileName string) string {
// Read the whole file
content, err := os.ReadFile(fileName)
@@ -51,6 +57,7 @@ func ReadFile(fileName string) string {
}
+// Checks if a file exists and returns a bool
func FileExist(fileName string) bool {
var exist bool
@@ -66,3 +73,27 @@ func FileExist(fileName string) bool {
// Return if the file exists
return exist
}
+
+// Copies a FILE from source to dest
+func FileCopy(sourceFile, destFile string) {
+ // Get the file info
+ filestat, err := os.Stat(sourceFile)
+ errorcheck.ErrorCheck(err, "Error getting fileinfo of: %s", sourceFile)
+
+ // If the file is a regular file
+ if filestat.Mode().IsRegular() {
+ // Open the source file for reading
+ source, err := os.Open(sourceFile)
+ errorcheck.ErrorCheck(err, "Error opening %s for copying", sourceFile)
+ defer source.Close()
+
+ // Create the destination file
+ dest, err := os.Create(destFile)
+ errorcheck.ErrorCheck(err, "Error creating %s", destFile)
+ defer dest.Close()
+
+ // Copy the contents of source to dest using io
+ _, err = io.Copy(dest, source)
+ errorcheck.ErrorCheck(err, "Failed to copy \"%s\" to \"%s\"", sourceFile, destFile)
+ }
+}
From ca992bf864bfa7c6f89e8b5155271b20804e109a Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 10 Apr 2023 19:35:12 +0200
Subject: [PATCH 068/132] Fixes a bug that would add rd.driver=vfio_pci to the
kernel args twice
---
internal/configs/config_bootloaders.go | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index 60bbf1d..fa92e74 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -57,10 +57,11 @@ func Set_Cmdline(gpu_IDs []string) {
// Add the GPU ids for vfio to the kernel arguments
fileio.AppendContent(fmt.Sprintf(" vfio_pci.ids=%s", strings.Join(gpu_IDs, ",")), config.Path.CMDLINE)
-
- // If the config folder for dracut exists in our configs
- if fileio.FileExist(config.Path.DRACUT) {
- // Add an extra kernel argument needed for dracut users
- fileio.AppendContent(" rd.driver.pre=vfio_pci", config.Path.CMDLINE)
- }
+}
+
+// TODO: write functions to configure kernelstub and grub
+// TODO2: look into grubby
+// TODO3: if unknown bootloader, tell user what to add a kernel arguments
+func Set_KernelStub() {
+
}
From 7081bfa8d7fb027bd78bf6fdf10b4b8b5d6bb501 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 11 Apr 2023 01:03:59 +0200
Subject: [PATCH 069/132] Implement Set_Kernelstub and attempt to elevate to
sudo using STDIN and then attempt to remove the password from the program
memory
---
internal/configs/config_bootloaders.go | 11 ++++++++
internal/ui_main_events.go | 29 +++++++++++++-------
internal/ui_main_functions.go | 37 +++++++++++++++++++++++++-
internal/ui_main_view.go | 2 +-
internal/ui_model.go | 15 +++++++++--
5 files changed, 81 insertions(+), 13 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index fa92e74..7d20d41 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -4,6 +4,7 @@ import (
"fmt"
"strings"
+ "github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/HikariKnight/quickpassthrough/pkg/command"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
"github.com/klauspost/cpuid/v2"
@@ -63,5 +64,15 @@ func Set_Cmdline(gpu_IDs []string) {
// TODO2: look into grubby
// TODO3: if unknown bootloader, tell user what to add a kernel arguments
func Set_KernelStub() {
+ // Get the config
+ config := GetConfig()
+ // Get the kernel args
+ kernel_args := fileio.ReadFile(config.Path.CMDLINE)
+
+ // Write to logger
+ logger.Printf("Running command:\nsudo kernelstub -a \"%s\"", kernel_args)
+
+ // Run the command
+ command.Run("sudo", "kernelstub", "-a", kernel_args)
}
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
index 83a3758..4314d70 100644
--- a/internal/ui_main_events.go
+++ b/internal/ui_main_events.go
@@ -1,6 +1,10 @@
package internal
-import tea "github.com/charmbracelet/bubbletea"
+import (
+ "encoding/base64"
+
+ tea "github.com/charmbracelet/bubbletea"
+)
func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var cmd tea.Cmd
@@ -8,7 +12,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case tea.KeyMsg:
// If we are not done
- if m.focused != DONE {
+ if m.focused != INSTALL {
// Setup keybindings
switch msg.String() {
case "ctrl+c", "q":
@@ -19,7 +23,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
if m.width != 0 {
// Process the selected item, if the return value is true then exit the application
if m.processSelection() {
- return m, tea.Quit
+ return m, tea.ExitAltScreen
}
}
case "ctrl+z", "backspace":
@@ -45,13 +49,20 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
return m, tea.Quit
case "enter":
- if m.width != 0 {
- // Process the selected item, if the return value is true then exit the application
- if m.processSelection() {
- return m, tea.Quit
- }
- }
+ // Start installation and send the password to the command
+ m.install(
+ base64.StdEncoding.EncodeToString(
+ []byte(
+ m.authDialog.Value(),
+ ),
+ ),
+ )
+
+ // Blank the password field
+ m.authDialog.SetValue("")
}
+
+ // Issue an UI update
m.authDialog, cmd = m.authDialog.Update(msg)
return m, cmd
}
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index 60cc193..930ca83 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -1,10 +1,13 @@
package internal
import (
+ "fmt"
"os"
"regexp"
"github.com/HikariKnight/quickpassthrough/internal/configs"
+ "github.com/HikariKnight/quickpassthrough/internal/logger"
+ "github.com/HikariKnight/quickpassthrough/pkg/command"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
@@ -115,7 +118,8 @@ func (m *model) processSelection() bool {
//m.focused++
// Because we have no QuickEmu support yet, just skip USB Controller configuration
- m.focused = DONE
+ m.focused = INSTALL
+ return true
case INTRO:
// This is an OK Dialog
@@ -133,3 +137,34 @@ func (m *model) processSelection() bool {
// Return false as we are not done
return false
}
+
+// This function starts the install process
+// It takes 1 auth string as variable
+func (m *model) install(auth string) {
+ // Get the config
+ config := configs.GetConfig()
+
+ // Write to logger
+ logger.Printf("Getting authentication token by elevating with sudo once")
+
+ // Elevate to sudo
+ command.Elevate(auth)
+
+ // Write to logger
+ logger.Printf("Attempting to free hash from memory")
+
+ // Blank out the variable
+ auth = ""
+
+ // Based on the bootloader, setup the configuration
+ if config.Bootloader == "kernelstub" {
+ // Write to logger
+ logger.Printf("Configuring systemd-boot using kernelstub")
+
+ // Configure kernelstub
+ configs.Set_KernelStub()
+ } else if config.Bootloader == "unknown" {
+ kernel_args := fileio.ReadFile(config.Path.CMDLINE)
+ fmt.Printf("Unsupported bootloader, please add the below line to your bootloaders kernel arguments\n%s", kernel_args)
+ }
+}
diff --git a/internal/ui_main_view.go b/internal/ui_main_view.go
index d0b448f..dc15225 100644
--- a/internal/ui_main_view.go
+++ b/internal/ui_main_view.go
@@ -115,7 +115,7 @@ func (m model) View() string {
view = listStyle.Render(m.lists[m.focused].View())
- case DONE:
+ case INSTALL:
title = dialogStyle.Render(
fmt.Sprint(
"The configuration files have been generated and are\n",
diff --git a/internal/ui_model.go b/internal/ui_model.go
index 721ec49..da1b3ec 100644
--- a/internal/ui_model.go
+++ b/internal/ui_model.go
@@ -46,6 +46,8 @@ const (
VIDEO
USB
USB_GROUP
+ INSTALL
+ UNKNOWN_BOOTLOADER
DONE
)
@@ -95,14 +97,16 @@ func (m *model) initLists(width, height int) {
defaultList,
defaultList,
choiceList,
+ choiceList,
+ choiceList,
}
// Configure offsets for sizing
m.offsetx = []int{
- 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
}
m.offsety = []int{
- 18, 2, 3, 13, 5, 2, 3, 12,
+ 18, 2, 3, 13, 5, 2, 3, 12, 0, 0,
}
// Update the styles with the correct width
@@ -169,4 +173,11 @@ func (m *model) initLists(width, height int) {
}
m.lists[DONE].SetItems(items)
m.lists[DONE].SetSize(m.width-m.offsetx[DONE], m.height-m.offsety[DONE])
+
+ // Init DONE choises
+ items = []list.Item{
+ item{title: "FINISH"},
+ }
+ m.lists[UNKNOWN_BOOTLOADER].SetItems(items)
+ m.lists[UNKNOWN_BOOTLOADER].SetSize(m.width-m.offsetx[UNKNOWN_BOOTLOADER], m.height-m.offsety[UNKNOWN_BOOTLOADER])
}
From ff5d20f4f9295e7f8caa8e18f67a6357014bfd0e Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 11 Apr 2023 01:49:06 +0200
Subject: [PATCH 070/132] Implement grubby support
---
internal/configs/config_bootloaders.go | 24 ++++++++++++++++++++----
internal/ui_main_functions.go | 8 ++++++++
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index 7d20d41..651f34a 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -15,7 +15,7 @@ import (
func getBootloader(config *Config) {
// Check what bootloader handler we are using
// Check for grub-mkconfig
- _, err := command.Run("which", "grub-mkconfig")
+ _, err := command.Run("which", "grub2-mkconfig")
if err == nil {
// Mark bootloader as grub2
config.Bootloader = "grub2"
@@ -25,7 +25,7 @@ func getBootloader(config *Config) {
_, err = command.Run("which", "grubby")
if err == nil {
// Mark it as unknown as i do not support it yet
- config.Bootloader = "unknown"
+ config.Bootloader = "grubby"
}
// Check for kernelstub (used by pop os)
@@ -60,9 +60,10 @@ func Set_Cmdline(gpu_IDs []string) {
fileio.AppendContent(fmt.Sprintf(" vfio_pci.ids=%s", strings.Join(gpu_IDs, ",")), config.Path.CMDLINE)
}
-// TODO: write functions to configure kernelstub and grub
-// TODO2: look into grubby
+// TODO: write functions to configure grub
// TODO3: if unknown bootloader, tell user what to add a kernel arguments
+
+// Configures systemd-boot using kernelstub
func Set_KernelStub() {
// Get the config
config := GetConfig()
@@ -76,3 +77,18 @@ func Set_KernelStub() {
// Run the command
command.Run("sudo", "kernelstub", "-a", kernel_args)
}
+
+// Configures grub2 or systemd-boot using grubby
+func Set_Grubby() {
+ // Get the config
+ config := GetConfig()
+
+ // Get the kernel args
+ kernel_args := fileio.ReadFile(config.Path.CMDLINE)
+
+ // Write to logger
+ logger.Printf("Running command:\nsudo grubby --update-kernel=ALL --args=\"%s\"", kernel_args)
+
+ // Run the command
+ command.Run("sudo", "grubby", "--update-kernel=ALL", fmt.Sprintf("--args=%s", kernel_args))
+}
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index 930ca83..b0efdc5 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -163,6 +163,14 @@ func (m *model) install(auth string) {
// Configure kernelstub
configs.Set_KernelStub()
+
+ } else if config.Bootloader == "grubby" {
+ // Write to logger
+ logger.Printf("Configuring bootloader using grubby")
+
+ // Configure kernelstub
+ configs.Set_Grubby()
+
} else if config.Bootloader == "unknown" {
kernel_args := fileio.ReadFile(config.Path.CMDLINE)
fmt.Printf("Unsupported bootloader, please add the below line to your bootloaders kernel arguments\n%s", kernel_args)
From 68aec7fdb89e0215e3b24f5d6b5a1d689a9e764a Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 11 Apr 2023 02:44:00 +0200
Subject: [PATCH 071/132] Prevent appending multiple times to the file
---
internal/configs/config_dracut.go | 10 +++++--
internal/configs/config_vfio_video.go | 38 ++++++++++++++++++++++-----
2 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/internal/configs/config_dracut.go b/internal/configs/config_dracut.go
index 8330031..fb392b9 100644
--- a/internal/configs/config_dracut.go
+++ b/internal/configs/config_dracut.go
@@ -27,8 +27,14 @@ func Set_Dracut() {
// Write the dracut config file
fileio.AppendContent(fmt.Sprintf("add_drivers+=\" %s \"\n", strings.Join(vfio_modules(), " ")), dracutConf)
- // Add to our kernel arguments file that vfio_pci should load early (dracut does this using kernel arguments)
- fileio.AppendContent(" rd.driver.pre=vfio_pci", config.Path.CMDLINE)
+ // Get the current kernel arguments we have generated
+ kernel_args := fileio.ReadFile(config.Path.CMDLINE)
+
+ // If the kernel argument is not already in the file
+ if !strings.Contains(kernel_args, "rd.driver.pre=vfio_pci") {
+ // Add to our kernel arguments file that vfio_pci should load early (dracut does this using kernel arguments)
+ fileio.AppendContent(" rd.driver.pre=vfio_pci", config.Path.CMDLINE)
+ }
// Make a backup of dracutConf if there is one there
backupFile(strings.Replace(dracutConf, "config", "", 1))
diff --git a/internal/configs/config_vfio_video.go b/internal/configs/config_vfio_video.go
index a439237..a438cba 100644
--- a/internal/configs/config_vfio_video.go
+++ b/internal/configs/config_vfio_video.go
@@ -2,7 +2,10 @@ package configs
import (
"fmt"
+ "os"
+ "strings"
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
"github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
@@ -16,11 +19,32 @@ func DisableVFIOVideo(i int) {
// Write to logger
logger.Printf("Adding vfio_pci.disable_vga=%v to %s", i, config.Path.CMDLINE)
- // Add to the kernel arguments that we want to disable VFIO video output on the host
- fileio.AppendContent(
- fmt.Sprintf(
- " vfio_pci.disable_vga=%v", i,
- ),
- config.Path.CMDLINE,
- )
+ // Get the current kernel arguments we have generated
+ kernel_args := fileio.ReadFile(config.Path.CMDLINE)
+
+ // If the kernel argument is already in the file
+ if strings.Contains(kernel_args, "vfio_pci.disable_vga") {
+ // Remove the old file
+ err := os.Remove(config.Path.CMDLINE)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Could not rewrite %s", config.Path.CMDLINE))
+
+ // Enable or disable the VGA based on our given value
+ if i == 0 {
+ kernel_args = strings.Replace(kernel_args, "vfio_pci.disable_vga=1", "vfio_pci.disable_vga=0", 1)
+
+ } else {
+ kernel_args = strings.Replace(kernel_args, "vfio_pci.disable_vga=0", "vfio_pci.disable_vga=1", 1)
+ }
+
+ // Rewrite the kernel_args file
+ fileio.AppendContent(kernel_args, config.Path.CMDLINE)
+ } else {
+ // Add to the kernel arguments that we want to disable VFIO video output on the host
+ fileio.AppendContent(
+ fmt.Sprintf(
+ " vfio_pci.disable_vga=%v", i,
+ ),
+ config.Path.CMDLINE,
+ )
+ }
}
From 84befa6f8520e3afbd14f70845b972e0443e5563 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 11 Apr 2023 02:45:01 +0200
Subject: [PATCH 072/132] Move some code around to places it makes more sense
to do the tasks given
---
internal/configs/config_bootloaders.go | 8 ++++--
internal/ui_main_functions.go | 36 ++++++++++++++++----------
internal/ui_model.go | 1 +
3 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index 651f34a..15e6f7d 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -60,7 +60,7 @@ func Set_Cmdline(gpu_IDs []string) {
fileio.AppendContent(fmt.Sprintf(" vfio_pci.ids=%s", strings.Join(gpu_IDs, ",")), config.Path.CMDLINE)
}
-// TODO: write functions to configure grub
+// TODO: write function to configure grub
// TODO3: if unknown bootloader, tell user what to add a kernel arguments
// Configures systemd-boot using kernelstub
@@ -78,7 +78,7 @@ func Set_KernelStub() {
command.Run("sudo", "kernelstub", "-a", kernel_args)
}
-// Configures grub2 or systemd-boot using grubby
+// Configures grub2 and/or systemd-boot using grubby
func Set_Grubby() {
// Get the config
config := GetConfig()
@@ -92,3 +92,7 @@ func Set_Grubby() {
// Run the command
command.Run("sudo", "grubby", "--update-kernel=ALL", fmt.Sprintf("--args=%s", kernel_args))
}
+
+func Set_Grub2() {
+
+}
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index b0efdc5..9146ec1 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -5,6 +5,7 @@ import (
"os"
"regexp"
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
"github.com/HikariKnight/quickpassthrough/internal/configs"
"github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/HikariKnight/quickpassthrough/pkg/command"
@@ -35,12 +36,28 @@ func (m *model) processSelection() bool {
m.focused++
case GPU_GROUP:
+ // Get the config
+ config := configs.GetConfig()
+
// Get the vbios path
m.vbios_path = getIOMMU("-g", "-i", m.gpu_group, "--rom")[0]
// Generate the VBIOS dumper script once the user has selected a GPU
configs.GenerateVBIOSDumper(m.vbios_path)
+ // Get the device ids for the selected gpu using ls-iommu
+ m.gpu_IDs = getIOMMU("-gr", "-i", m.gpu_group, "--id")
+
+ // If the kernel_args file already exists
+ if fileio.FileExist(config.Path.CMDLINE) {
+ // Delete it as we will have to make a new one anyway
+ err := os.Remove(config.Path.CMDLINE)
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Could not remove %s", config.Path.CMDLINE))
+ }
+
+ // Write initial kernel_arg file
+ configs.Set_Cmdline(m.gpu_IDs)
+
// Change focus to the next view
m.focused++
@@ -76,18 +93,6 @@ func (m *model) processSelection() bool {
// Get our config struct
config := configs.GetConfig()
- // Get the device ids for the selected gpu using ls-iommu
- gpu_IDs := getIOMMU("-gr", "-i", m.gpu_group, "--id")
-
- // If the kernel_args file already exists
- if fileio.FileExist(config.Path.CMDLINE) {
- // Delete it as we will have to make a new one anyway
- os.Remove(config.Path.CMDLINE)
- }
-
- // Write initial kernel_arg file
- configs.Set_Cmdline(gpu_IDs)
-
// If user selected yes then
if selectedItem.(item).title == "YES" {
// Add disable VFIO video to the config
@@ -100,7 +105,7 @@ func (m *model) processSelection() bool {
// If we have files for modprobe
if fileio.FileExist(config.Path.MODPROBE) {
// Configure modprobe
- configs.Set_Modprobe(gpu_IDs)
+ configs.Set_Modprobe(m.gpu_IDs)
}
// If we have a folder for dracut
@@ -171,7 +176,10 @@ func (m *model) install(auth string) {
// Configure kernelstub
configs.Set_Grubby()
- } else if config.Bootloader == "unknown" {
+ } else if config.Bootloader == "grub2" {
+ // Write to logger
+ logger.Printf("Configuring grub2 manually")
+ } else {
kernel_args := fileio.ReadFile(config.Path.CMDLINE)
fmt.Printf("Unsupported bootloader, please add the below line to your bootloaders kernel arguments\n%s", kernel_args)
}
diff --git a/internal/ui_model.go b/internal/ui_model.go
index da1b3ec..2fad848 100644
--- a/internal/ui_model.go
+++ b/internal/ui_model.go
@@ -28,6 +28,7 @@ type model struct {
fetched []bool
lists []list.Model
gpu_group string
+ gpu_IDs []string
vbios_path string
focused status
offsetx []int
From 70d725913f44f4de758d50fbb551d194624bfeca Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 11 Apr 2023 08:55:30 +0200
Subject: [PATCH 073/132] switch unsupported bootloader message to be written
to the log
---
internal/ui_main_functions.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index 9146ec1..f843443 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -179,8 +179,9 @@ func (m *model) install(auth string) {
} else if config.Bootloader == "grub2" {
// Write to logger
logger.Printf("Configuring grub2 manually")
+ configs.Set_Grub2()
} else {
kernel_args := fileio.ReadFile(config.Path.CMDLINE)
- fmt.Printf("Unsupported bootloader, please add the below line to your bootloaders kernel arguments\n%s", kernel_args)
+ logger.Printf("Unsupported bootloader, please add the below line to your bootloaders kernel arguments\n%s", kernel_args)
}
}
From 7b8923f68e1087c392666bcc7da690eb7de1f854 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 11 Apr 2023 08:56:06 +0200
Subject: [PATCH 074/132] Add missing error checks
---
internal/configs/config_bootloaders.go | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index 15e6f7d..2e5a5f5 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -4,6 +4,7 @@ import (
"fmt"
"strings"
+ "github.com/HikariKnight/ls-iommu/pkg/errorcheck"
"github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/HikariKnight/quickpassthrough/pkg/command"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
@@ -75,7 +76,8 @@ func Set_KernelStub() {
logger.Printf("Running command:\nsudo kernelstub -a \"%s\"", kernel_args)
// Run the command
- command.Run("sudo", "kernelstub", "-a", kernel_args)
+ _, err := command.Run("sudo", "kernelstub", "-a", kernel_args)
+ errorcheck.ErrorCheck(err, "Error, kernelstub command returned exit code 1")
}
// Configures grub2 and/or systemd-boot using grubby
@@ -90,7 +92,8 @@ func Set_Grubby() {
logger.Printf("Running command:\nsudo grubby --update-kernel=ALL --args=\"%s\"", kernel_args)
// Run the command
- command.Run("sudo", "grubby", "--update-kernel=ALL", fmt.Sprintf("--args=%s", kernel_args))
+ _, err := command.Run("sudo", "grubby", "--update-kernel=ALL", fmt.Sprintf("--args=%s", kernel_args))
+ errorcheck.ErrorCheck(err, "Error, grubby command returned exit code 1")
}
func Set_Grub2() {
From d76f1fedd0a4e66a8346fe5f15616eb8fbdc9923 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 11 Apr 2023 08:58:36 +0200
Subject: [PATCH 075/132] update the elevate command, add missing error text
---
pkg/command/command.go | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pkg/command/command.go b/pkg/command/command.go
index 2070c1b..4c4698f 100644
--- a/pkg/command/command.go
+++ b/pkg/command/command.go
@@ -42,11 +42,11 @@ func Elevate(password string) {
cmd := exec.Command("sudo", "-Sk", "--", "echo")
// Wait for 500ms, if the password is correct, sudo will return immediately
- cmd.WaitDelay = 500 * time.Millisecond
+ cmd.WaitDelay = 1000 * time.Millisecond
// Open STDIN
stdin, err := cmd.StdinPipe()
- errorcheck.ErrorCheck(err, "Failed to get sudo STDIN")
+ errorcheck.ErrorCheck(err, "\nFailed to get sudo STDIN")
// Start the authentication
cmd.Start()
@@ -54,11 +54,12 @@ func Elevate(password string) {
// Get the passed password
pw, _ := base64.StdEncoding.DecodeString(password)
_, err = stdin.Write([]byte(string(pw) + "\n"))
- errorcheck.ErrorCheck(err, "Failed at typing to STDIN")
+ errorcheck.ErrorCheck(err, "\nFailed at typing to STDIN")
// Clear the password
pw = nil
stdin.Close()
+ // Wait for the sudo prompt (If the correct password was given, it will not stay behind)
err = cmd.Wait()
- errorcheck.ErrorCheck(err)
+ errorcheck.ErrorCheck(err, "\nError, password given was wrong")
}
From 57895a1901da11388dc88187cdc90f085cb94e88 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 11 Apr 2023 08:59:08 +0200
Subject: [PATCH 076/132] Remove UNKNOWN_BOOTLOADER dialog
---
internal/ui_model.go | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/internal/ui_model.go b/internal/ui_model.go
index 2fad848..0846553 100644
--- a/internal/ui_model.go
+++ b/internal/ui_model.go
@@ -48,7 +48,6 @@ const (
USB
USB_GROUP
INSTALL
- UNKNOWN_BOOTLOADER
DONE
)
@@ -99,15 +98,14 @@ func (m *model) initLists(width, height int) {
defaultList,
choiceList,
choiceList,
- choiceList,
}
// Configure offsets for sizing
m.offsetx = []int{
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
}
m.offsety = []int{
- 18, 2, 3, 13, 5, 2, 3, 12, 0, 0,
+ 18, 2, 3, 13, 5, 2, 3, 12, 0,
}
// Update the styles with the correct width
@@ -174,11 +172,4 @@ func (m *model) initLists(width, height int) {
}
m.lists[DONE].SetItems(items)
m.lists[DONE].SetSize(m.width-m.offsetx[DONE], m.height-m.offsety[DONE])
-
- // Init DONE choises
- items = []list.Item{
- item{title: "FINISH"},
- }
- m.lists[UNKNOWN_BOOTLOADER].SetItems(items)
- m.lists[UNKNOWN_BOOTLOADER].SetSize(m.width-m.offsetx[UNKNOWN_BOOTLOADER], m.height-m.offsety[UNKNOWN_BOOTLOADER])
}
From e412a2ffbf65ce18c0bc312272b43e0f96ec4250 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 11 Apr 2023 09:06:49 +0200
Subject: [PATCH 077/132] Move to the next view when we are done elevating
---
internal/ui_main_events.go | 50 +++++++++++++++++++++++++----------
internal/ui_main_functions.go | 15 +----------
2 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
index 4314d70..398780d 100644
--- a/internal/ui_main_events.go
+++ b/internal/ui_main_events.go
@@ -3,6 +3,8 @@ package internal
import (
"encoding/base64"
+ "github.com/HikariKnight/quickpassthrough/internal/logger"
+ "github.com/HikariKnight/quickpassthrough/pkg/command"
tea "github.com/charmbracelet/bubbletea"
)
@@ -12,7 +14,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case tea.KeyMsg:
// If we are not done
- if m.focused != INSTALL {
+ if m.focused != INSTALL && m.focused != DONE {
// Setup keybindings
switch msg.String() {
case "ctrl+c", "q":
@@ -22,9 +24,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case "enter":
if m.width != 0 {
// Process the selected item, if the return value is true then exit the application
- if m.processSelection() {
- return m, tea.ExitAltScreen
- }
+ m.processSelection()
}
case "ctrl+z", "backspace":
// Go backwards in the model
@@ -49,17 +49,39 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
return m, tea.Quit
case "enter":
- // Start installation and send the password to the command
- m.install(
- base64.StdEncoding.EncodeToString(
- []byte(
- m.authDialog.Value(),
- ),
- ),
- )
+ // If we are on the INSTALL dialog
+ if m.focused == INSTALL {
+ // Write to logger
+ logger.Printf("Getting authentication token by elevating with sudo once")
- // Blank the password field
- m.authDialog.SetValue("")
+ // Elevate with sudo
+ command.Elevate(
+ base64.StdEncoding.EncodeToString(
+ []byte(
+ m.authDialog.Value(),
+ ),
+ ),
+ )
+
+ // Write to logger
+ logger.Printf("Attempting to free hash from memory")
+
+ // Blank the password field
+ m.authDialog.SetValue("")
+
+ // Start installation and send the password to the command
+ m.install()
+
+ // Move to the DONE dialog
+ m.focused++
+
+ // Exit the alt screen as the output on the done dialog needs to be scrollable
+ return m, tea.ExitAltScreen
+
+ } else {
+ // Quit the application if we are on a different view
+ return m, tea.Quit
+ }
}
// Issue an UI update
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index f843443..4b8f058 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -8,7 +8,6 @@ import (
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
"github.com/HikariKnight/quickpassthrough/internal/configs"
"github.com/HikariKnight/quickpassthrough/internal/logger"
- "github.com/HikariKnight/quickpassthrough/pkg/command"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
)
@@ -145,22 +144,10 @@ func (m *model) processSelection() bool {
// This function starts the install process
// It takes 1 auth string as variable
-func (m *model) install(auth string) {
+func (m *model) install() {
// Get the config
config := configs.GetConfig()
- // Write to logger
- logger.Printf("Getting authentication token by elevating with sudo once")
-
- // Elevate to sudo
- command.Elevate(auth)
-
- // Write to logger
- logger.Printf("Attempting to free hash from memory")
-
- // Blank out the variable
- auth = ""
-
// Based on the bootloader, setup the configuration
if config.Bootloader == "kernelstub" {
// Write to logger
From 935adeb14093bdc3b6609ddf03116696c55e87d1 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 11 Apr 2023 09:07:24 +0200
Subject: [PATCH 078/132] Attempt to clear the password and encoded password
from memory
---
pkg/command/command.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pkg/command/command.go b/pkg/command/command.go
index 4c4698f..d6a1c55 100644
--- a/pkg/command/command.go
+++ b/pkg/command/command.go
@@ -57,6 +57,8 @@ func Elevate(password string) {
errorcheck.ErrorCheck(err, "\nFailed at typing to STDIN")
// Clear the password
pw = nil
+ password = ""
+
stdin.Close()
// Wait for the sudo prompt (If the correct password was given, it will not stay behind)
From 7b305a87d24e7255730de79c18936c38e30fd21b Mon Sep 17 00:00:00 2001
From: HikariKnight
Date: Tue, 11 Apr 2023 12:34:27 +0200
Subject: [PATCH 079/132] implement Set_Grub
---
internal/configs/config_bootloaders.go | 91 +++++++++++++++++++++++++-
1 file changed, 88 insertions(+), 3 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index 2e5a5f5..5d33e99 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -2,6 +2,8 @@ package configs
import (
"fmt"
+ "os"
+ "regexp"
"strings"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
@@ -61,9 +63,6 @@ func Set_Cmdline(gpu_IDs []string) {
fileio.AppendContent(fmt.Sprintf(" vfio_pci.ids=%s", strings.Join(gpu_IDs, ",")), config.Path.CMDLINE)
}
-// TODO: write function to configure grub
-// TODO3: if unknown bootloader, tell user what to add a kernel arguments
-
// Configures systemd-boot using kernelstub
func Set_KernelStub() {
// Get the config
@@ -97,5 +96,91 @@ func Set_Grubby() {
}
func Set_Grub2() {
+ // Get the config struct
+ config := GetConfig()
+ // Make the config file path
+ conffile := fmt.Sprintf("%s/grub", config.Path.DEFAULT)
+
+ // Make sure we start from scratch by deleting any old file
+ if fileio.FileExist(conffile) {
+ os.Remove(conffile)
+ }
+
+ // Make a regex to get the system path instead of the config path
+ syspath_re := regexp.MustCompile(`^config`)
+ sysfile := syspath_re.ReplaceAllString(conffile, "")
+
+ // Make a regex to find the LINUX lines
+ cmdline_default_re := regexp.MustCompile(`^GRUB_CMDLINE_LINUX_DEFAULT=\"(.+)\"$`)
+ currentargs_re := regexp.MustCompile(`^GRUB_CMDLINE_LINUX(_DEFAULT|)=\"(.?|.+)\"$`)
+
+ // Make a bool so we know if we edited the default line if both are in the template
+ default_edited := false
+
+ // Read the mkinitcpio file
+ grub_content := fileio.ReadLines(sysfile)
+
+ // Write to logger
+ logger.Printf("Read %s:\n%s", sysfile, strings.Join(grub_content, "\n"))
+
+ for _, line := range grub_content {
+ if currentargs_re.MatchString(line) {
+ // Get the current modules
+ old_kernel_args := strings.Split(currentargs_re.ReplaceAllString(line, "${2}"), " ")
+
+ // Clean up the old arguments by removing vfio related kernel arguments
+ new_kernel_args := clean_Grub2_Args(old_kernel_args)
+
+ // Get the kernel args from our config
+ kernel_args := fileio.ReadFile(config.Path.CMDLINE)
+
+ // Add our kernel args to the list
+ new_kernel_args = append(new_kernel_args, kernel_args)
+
+ // If we are at the line starting with MODULES=
+ if cmdline_default_re.MatchString(line) {
+ // Write to logger
+ logger.Printf("Replacing line in %s:\n%s\nWith:\nGRUB_CMDLINE_LINUX_DEFAULT=\"%s\"\n", conffile, line, strings.Join(new_kernel_args, " "))
+
+ // Write the modules line we generated
+ fileio.AppendContent(fmt.Sprintf("GRUB_CMDLINE_LINUX_DEFAULT=\"%s\"\n", strings.Join(new_kernel_args, " ")), conffile)
+
+ // Mark the default line as edited so we can skip the non default line
+ default_edited = true
+ } else {
+ // If we have not edited the GRUB_CMDLINE_LINUX_DEFAULT line
+ if !default_edited {
+ // Write to logger
+ logger.Printf("Replacing line in %s:\n%s\nWith:\nGRUB_CMDLINE_LINUX=\"%s\"\n", conffile, line, strings.Join(new_kernel_args, " "))
+
+ // Write the modules line we generated
+ fileio.AppendContent(fmt.Sprintf("GRUB_CMDLINE_LINUX=\"%s\"\n", strings.Join(new_kernel_args, " ")), conffile)
+ }
+ }
+ } else {
+ // Write the line to the file since it does not match our regex
+ fileio.AppendContent(fmt.Sprintf("%s\n", line), conffile)
+ }
+ }
+}
+
+func clean_Grub2_Args(old_kernel_args []string) []string {
+ // Make a regex to get the VFIO related kernel arguments removed, if they already existed
+ vfio_args_re := regexp.MustCompile(`(amd|intel)_iommu=(on|1)|iommu=(pt|on)|vfio_pci.ids=.+|vfio_pci.disable_vga=\d{1}`)
+
+ // Make a stringlist to keep our new arguments
+ var clean_kernel_args []string
+
+ // Loop through current kernel_args and add anything that isnt vfio or vendor-reset related
+ for _, v := range old_kernel_args {
+ // If what we find is not a vfio module or vendor-reset module
+ if !vfio_args_re.MatchString(v) {
+ // Add module to module list
+ clean_kernel_args = append(clean_kernel_args, v)
+ }
+ }
+
+ // Return cleaned up arguments
+ return clean_kernel_args
}
From 167de85fe922fbd651f65eb691d7df0b37e1d472 Mon Sep 17 00:00:00 2001
From: HikariKnight
Date: Tue, 11 Apr 2023 13:04:02 +0200
Subject: [PATCH 080/132] the -k flag can break the elevation prompt when used
in go
---
pkg/command/command.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/command/command.go b/pkg/command/command.go
index d6a1c55..ef785f2 100644
--- a/pkg/command/command.go
+++ b/pkg/command/command.go
@@ -39,7 +39,7 @@ func Run(binary string, args ...string) ([]string, error) {
// giving us the ability to run sudo commands
func Elevate(password string) {
// Do a simple sudo command to just authenticate with sudo
- cmd := exec.Command("sudo", "-Sk", "--", "echo")
+ cmd := exec.Command("sudo", "-S", "--", "echo")
// Wait for 500ms, if the password is correct, sudo will return immediately
cmd.WaitDelay = 1000 * time.Millisecond
From 5ee76f5ece4bd8641c6903b7b43fc1f3051589a1 Mon Sep 17 00:00:00 2001
From: HikariKnight
Date: Tue, 11 Apr 2023 14:40:10 +0200
Subject: [PATCH 081/132] move Run with stderr output to its own command
---
pkg/command/command.go | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/pkg/command/command.go b/pkg/command/command.go
index ef785f2..0d033d4 100644
--- a/pkg/command/command.go
+++ b/pkg/command/command.go
@@ -23,17 +23,40 @@ func Run(binary string, args ...string) ([]string, error) {
// Read the output
output, _ := io.ReadAll(&stdout)
- outerr, _ := io.ReadAll(&stderr)
// Get the output
outputs := []string{}
outputs = append(outputs, string(output))
- outputs = append(outputs, string(outerr))
// Return our list of items
return outputs, err
}
+// This function is just like command.Run() but also returns STDERR
+func RunErr(binary string, args ...string) ([]string, []string, error) {
+ var stdout, stderr bytes.Buffer
+
+ // Configure the ls-iommu c--ommand
+ cmd := exec.Command(binary, args...)
+ cmd.Stderr = &stderr
+ cmd.Stdout = &stdout
+
+ // Execute the command
+ err := cmd.Run()
+
+ // Read the output
+ output, _ := io.ReadAll(&stdout)
+ outerr, _ := io.ReadAll(&stderr)
+
+ // Get the output
+ var outputs, outerrs []string
+ outputs = append(outputs, string(output))
+ outerrs = append(outerrs, string(outerr))
+
+ // Return our list of items
+ return outputs, outerrs, err
+}
+
// This functions runs the command "sudo -Sk -- echo", this forces sudo
// to re-authenticate and lets us enter the password to STDIN
// giving us the ability to run sudo commands
From e7c61c564e3386c9aba833c9a952dc7d6e49809e Mon Sep 17 00:00:00 2001
From: HikariKnight
Date: Tue, 11 Apr 2023 14:45:14 +0200
Subject: [PATCH 082/132] Start working on applying the config to the system
---
internal/configs/config_bootloaders.go | 67 ++++++++++++++++++++++++--
internal/ui_main_events.go | 10 ++--
internal/ui_main_functions.go | 26 +++++++---
internal/ui_main_view.go | 6 ++-
internal/ui_model.go | 23 ++++-----
5 files changed, 106 insertions(+), 26 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index 5d33e99..0ba4128 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -17,13 +17,20 @@ import (
// Preference is given to kernelstub because it is WAY easier to safely edit compared to grub2
func getBootloader(config *Config) {
// Check what bootloader handler we are using
- // Check for grub-mkconfig
+ // Check for grub2-mkconfig
_, err := command.Run("which", "grub2-mkconfig")
if err == nil {
// Mark bootloader as grub2
config.Bootloader = "grub2"
}
+ // Check for grub2-mkconfig
+ _, err = command.Run("which", "grub-mkconfig")
+ if err == nil {
+ // Mark bootloader as grub2
+ config.Bootloader = "grub2"
+ }
+
// Check for grubby (used by fedora)
_, err = command.Run("which", "grubby")
if err == nil {
@@ -64,7 +71,7 @@ func Set_Cmdline(gpu_IDs []string) {
}
// Configures systemd-boot using kernelstub
-func Set_KernelStub() {
+func Set_KernelStub() string {
// Get the config
config := GetConfig()
@@ -77,10 +84,13 @@ func Set_KernelStub() {
// Run the command
_, err := command.Run("sudo", "kernelstub", "-a", kernel_args)
errorcheck.ErrorCheck(err, "Error, kernelstub command returned exit code 1")
+
+ // Return what we did
+ return fmt.Sprintf("sudo kernelstub -a \"%s\"", kernel_args)
}
// Configures grub2 and/or systemd-boot using grubby
-func Set_Grubby() {
+func Set_Grubby() string {
// Get the config
config := GetConfig()
@@ -93,9 +103,12 @@ func Set_Grubby() {
// Run the command
_, err := command.Run("sudo", "grubby", "--update-kernel=ALL", fmt.Sprintf("--args=%s", kernel_args))
errorcheck.ErrorCheck(err, "Error, grubby command returned exit code 1")
+
+ // Return what we did
+ return fmt.Sprintf("sudo grubby --update-kernel=ALL --args=\"%s\"", kernel_args)
}
-func Set_Grub2() {
+func Configure_Grub2() {
// Get the config struct
config := GetConfig()
@@ -184,3 +197,49 @@ func clean_Grub2_Args(old_kernel_args []string) []string {
// Return cleaned up arguments
return clean_kernel_args
}
+
+// This function copies our config to /etc/default/grub and updates grub
+func Set_Grub2() ([]string, error) {
+ // Get the config
+ config := GetConfig()
+
+ // Get the conf file
+ conffile := fmt.Sprintf("%s/grub", config.Path.DEFAULT)
+
+ // Write to logger
+ logger.Printf("Executing command:\nsudo cp -v \"%s\" /etc/default/grub", conffile)
+
+ // Since we should be elevated with our sudo token we will copy with cp
+ // (using built in functions will not work as we are running as the normal user)
+ output, err := command.Run("sudo", "cp", "-v", conffile, "/etc/default/grub")
+ errorcheck.ErrorCheck(err, fmt.Sprintf("Failed to copy %s to /etc/default/grub", conffile))
+
+ // Write output to logger
+ logger.Printf(strings.Join(output, "\n"))
+
+ // Set a variable for the mkconfig command
+ mkconfig := "grub-mkconfig"
+ // Check for grub-mkconfig
+ _, err = command.Run("which", "grub-mkconfig")
+ if err == nil {
+ // Set binary as grub-mkconfig
+ mkconfig = "grub-mkconfig"
+ } else {
+ mkconfig = "grub2-mkconfig"
+ }
+
+ // Update grub.cfg
+ if fileio.FileExist("/boot/grub/grub.cfg") {
+ output = append(output, fmt.Sprintf("sudo %s -o /boot/grub/grub.cfg", mkconfig))
+ mklog, err := command.Run("sudo", mkconfig, "-o", "/boot/grub/grub.cfg")
+ logger.Printf(strings.Join(mklog, "\n"))
+ errorcheck.ErrorCheck(err, "Failed to update /boot/grub/grub.cfg")
+ } else {
+ output = append(output, fmt.Sprintf("sudo %s -o /boot/grub/grub.cfg\nSee debug.log for more detailed output", mkconfig))
+ mklog, err := command.Run("sudo", mkconfig, "-o", "/boot/grub2/grub.cfg")
+ logger.Printf(strings.Join(mklog, "\n"))
+ errorcheck.ErrorCheck(err, "Failed to update /boot/grub/grub.cfg")
+ }
+
+ return output, err
+}
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
index 398780d..c85259f 100644
--- a/internal/ui_main_events.go
+++ b/internal/ui_main_events.go
@@ -23,8 +23,10 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case "enter":
if m.width != 0 {
- // Process the selected item, if the return value is true then exit the application
- m.processSelection()
+ // Process the selected item, if the return value is true then exit alt screen
+ if !m.processSelection() {
+ return m, tea.ExitAltScreen
+ }
}
case "ctrl+z", "backspace":
// Go backwards in the model
@@ -70,13 +72,13 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.authDialog.SetValue("")
// Start installation and send the password to the command
- m.install()
+ m.installOutput = m.install()
// Move to the DONE dialog
m.focused++
// Exit the alt screen as the output on the done dialog needs to be scrollable
- return m, tea.ExitAltScreen
+ //return m, tea.ExitAltScreen
} else {
// Quit the application if we are on a different view
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index 4b8f058..265d722 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -118,6 +118,13 @@ func (m *model) processSelection() bool {
configs.Set_Mkinitcpio()
}
+ // Configure grub2 here as we can make the config without sudo
+ if config.Bootloader == "grub2" {
+ // Write to logger
+ logger.Printf("Configuring grub2 manually")
+ configs.Configure_Grub2()
+ }
+
// Go to the next view
//m.focused++
@@ -144,31 +151,38 @@ func (m *model) processSelection() bool {
// This function starts the install process
// It takes 1 auth string as variable
-func (m *model) install() {
+func (m *model) install() []string {
// Get the config
config := configs.GetConfig()
+ // Make a stringlist to keep the output to show the user
+ var output []string
+
// Based on the bootloader, setup the configuration
- if config.Bootloader == "kernelstub" {
+ if config.Bootloader != "kernelstub" {
// Write to logger
logger.Printf("Configuring systemd-boot using kernelstub")
// Configure kernelstub
- configs.Set_KernelStub()
+ output = append(output, configs.Set_KernelStub())
} else if config.Bootloader == "grubby" {
// Write to logger
logger.Printf("Configuring bootloader using grubby")
// Configure kernelstub
- configs.Set_Grubby()
+ output = append(output, configs.Set_Grubby())
- } else if config.Bootloader == "grub2" {
+ } else if config.Bootloader != "grub2" {
// Write to logger
logger.Printf("Configuring grub2 manually")
- configs.Set_Grub2()
+ grub_output, _ := configs.Set_Grub2()
+ output = append(output, grub_output...)
+
} else {
kernel_args := fileio.ReadFile(config.Path.CMDLINE)
logger.Printf("Unsupported bootloader, please add the below line to your bootloaders kernel arguments\n%s", kernel_args)
}
+
+ return output
}
diff --git a/internal/ui_main_view.go b/internal/ui_main_view.go
index dc15225..b4c52ea 100644
--- a/internal/ui_main_view.go
+++ b/internal/ui_main_view.go
@@ -12,7 +12,7 @@ import (
func (m model) View() string {
if m.width != 0 {
title := ""
- view := "Empty View :("
+ view := ""
switch m.focused {
case INTRO:
title = dialogStyle.Render(
@@ -137,6 +137,10 @@ func (m model) View() string {
)
view = m.authDialog.View()
+
+ case DONE:
+ title = titleStyle.Render("Applying configurations!")
+ view = dialogStyle.Render(strings.Join(m.installOutput, "\n"))
}
//return listStyle.SetString(fmt.Sprintf("%s\n\n", title)).Render(m.lists[m.focused].View())
return lipgloss.JoinVertical(lipgloss.Left, fmt.Sprintf("%s\n%s\n", title, view))
diff --git a/internal/ui_model.go b/internal/ui_model.go
index 0846553..257019d 100644
--- a/internal/ui_model.go
+++ b/internal/ui_model.go
@@ -25,17 +25,18 @@ func (i item) FilterValue() string { return i.title }
// Main Model
type model struct {
- fetched []bool
- lists []list.Model
- gpu_group string
- gpu_IDs []string
- vbios_path string
- focused status
- offsetx []int
- offsety []int
- width int
- height int
- authDialog textinput.Model
+ fetched []bool
+ lists []list.Model
+ gpu_group string
+ gpu_IDs []string
+ vbios_path string
+ focused status
+ offsetx []int
+ offsety []int
+ width int
+ height int
+ authDialog textinput.Model
+ installOutput []string
}
// Consts used to navigate the main model
From 4c99baeed81074557f2d3e863da879e73bbe6ebd Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 12 Apr 2023 01:19:02 +0200
Subject: [PATCH 083/132] Finish writing the apply changes functions
---
internal/configs/config_bootloaders.go | 26 +++++----
internal/configs/configs.go | 18 ++++++
internal/ui_main_events.go | 11 ++--
internal/ui_main_functions.go | 77 ++++++++++++++++++++++++--
internal/ui_main_view.go | 12 +++-
internal/ui_model.go | 13 ++++-
6 files changed, 133 insertions(+), 24 deletions(-)
diff --git a/internal/configs/config_bootloaders.go b/internal/configs/config_bootloaders.go
index 0ba4128..3e1e25e 100644
--- a/internal/configs/config_bootloaders.go
+++ b/internal/configs/config_bootloaders.go
@@ -86,7 +86,7 @@ func Set_KernelStub() string {
errorcheck.ErrorCheck(err, "Error, kernelstub command returned exit code 1")
// Return what we did
- return fmt.Sprintf("sudo kernelstub -a \"%s\"", kernel_args)
+ return fmt.Sprintf("Executed: sudo kernelstub -a \"%s\"", kernel_args)
}
// Configures grub2 and/or systemd-boot using grubby
@@ -105,7 +105,7 @@ func Set_Grubby() string {
errorcheck.ErrorCheck(err, "Error, grubby command returned exit code 1")
// Return what we did
- return fmt.Sprintf("sudo grubby --update-kernel=ALL --args=\"%s\"", kernel_args)
+ return fmt.Sprintf("Executed: sudo grubby --update-kernel=ALL --args=\"%s\"", kernel_args)
}
func Configure_Grub2() {
@@ -206,21 +206,23 @@ func Set_Grub2() ([]string, error) {
// Get the conf file
conffile := fmt.Sprintf("%s/grub", config.Path.DEFAULT)
+ // Get the sysfile
+ sysfile_re := regexp.MustCompile(`^config`)
+ sysfile := sysfile_re.ReplaceAllString(conffile, "")
+
// Write to logger
- logger.Printf("Executing command:\nsudo cp -v \"%s\" /etc/default/grub", conffile)
+ logger.Printf("Executing command:\nsudo cp -v \"%s\" %s", conffile, sysfile)
- // Since we should be elevated with our sudo token we will copy with cp
- // (using built in functions will not work as we are running as the normal user)
- output, err := command.Run("sudo", "cp", "-v", conffile, "/etc/default/grub")
- errorcheck.ErrorCheck(err, fmt.Sprintf("Failed to copy %s to /etc/default/grub", conffile))
+ // Make our output slice
+ var output []string
- // Write output to logger
- logger.Printf(strings.Join(output, "\n"))
+ // Copy files to system
+ output = append(output, CopyToSystem(conffile, sysfile))
// Set a variable for the mkconfig command
mkconfig := "grub-mkconfig"
// Check for grub-mkconfig
- _, err = command.Run("which", "grub-mkconfig")
+ _, err := command.Run("which", "grub-mkconfig")
if err == nil {
// Set binary as grub-mkconfig
mkconfig = "grub-mkconfig"
@@ -230,12 +232,12 @@ func Set_Grub2() ([]string, error) {
// Update grub.cfg
if fileio.FileExist("/boot/grub/grub.cfg") {
- output = append(output, fmt.Sprintf("sudo %s -o /boot/grub/grub.cfg", mkconfig))
+ output = append(output, fmt.Sprintf("Executed: sudo %s -o /boot/grub/grub.cfg\nSee debug.log for more detailed output", mkconfig))
mklog, err := command.Run("sudo", mkconfig, "-o", "/boot/grub/grub.cfg")
logger.Printf(strings.Join(mklog, "\n"))
errorcheck.ErrorCheck(err, "Failed to update /boot/grub/grub.cfg")
} else {
- output = append(output, fmt.Sprintf("sudo %s -o /boot/grub/grub.cfg\nSee debug.log for more detailed output", mkconfig))
+ output = append(output, fmt.Sprintf("Executed: sudo %s -o /boot/grub/grub.cfg\nSee debug.log for more detailed output", mkconfig))
mklog, err := command.Run("sudo", mkconfig, "-o", "/boot/grub2/grub.cfg")
logger.Printf(strings.Join(mklog, "\n"))
errorcheck.ErrorCheck(err, "Failed to update /boot/grub/grub.cfg")
diff --git a/internal/configs/configs.go b/internal/configs/configs.go
index dc0096f..acd7077 100644
--- a/internal/configs/configs.go
+++ b/internal/configs/configs.go
@@ -7,6 +7,7 @@ import (
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
"github.com/HikariKnight/quickpassthrough/internal/logger"
+ "github.com/HikariKnight/quickpassthrough/pkg/command"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
"github.com/HikariKnight/quickpassthrough/pkg/uname"
"github.com/klauspost/cpuid/v2"
@@ -218,3 +219,20 @@ func makeBackupDir(dest string) {
err := os.MkdirAll(fmt.Sprintf("backup/%s", dest), os.ModePerm)
errorcheck.ErrorCheck(err, "Error making backup/ folder")
}
+
+// Copy a file to the system, make sure you have run command.Elevate() recently
+func CopyToSystem(conffile, sysfile string) string {
+ // Since we should be elevated with our sudo token we will copy with cp
+ // (using built in functions will not work as we are running as the normal user)
+ output, _ := command.Run("sudo", "cp", "-v", conffile, sysfile)
+
+ // Clean the output
+ clean_re := regexp.MustCompile(`\n`)
+ clean_output := clean_re.ReplaceAllString(output[0], "")
+
+ // Write output to logger
+ logger.Printf(clean_output)
+
+ // Return the output
+ return fmt.Sprintf("Copying: %s", clean_output)
+}
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
index c85259f..b85e1ee 100644
--- a/internal/ui_main_events.go
+++ b/internal/ui_main_events.go
@@ -2,6 +2,7 @@ package internal
import (
"encoding/base64"
+ "fmt"
"github.com/HikariKnight/quickpassthrough/internal/logger"
"github.com/HikariKnight/quickpassthrough/pkg/command"
@@ -52,7 +53,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case "enter":
// If we are on the INSTALL dialog
- if m.focused == INSTALL {
+ if m.focused == INSTALL && m.authDialog.Value() != "" {
// Write to logger
logger.Printf("Getting authentication token by elevating with sudo once")
@@ -71,14 +72,16 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
// Blank the password field
m.authDialog.SetValue("")
+ fmt.Println("Working... Application frozen until done, check debug.log for progress")
+
// Start installation and send the password to the command
- m.installOutput = m.install()
+ m.install()
// Move to the DONE dialog
- m.focused++
+ m.focused = DONE
// Exit the alt screen as the output on the done dialog needs to be scrollable
- //return m, tea.ExitAltScreen
+ return m, tea.ClearScreen
} else {
// Quit the application if we are on a different view
diff --git a/internal/ui_main_functions.go b/internal/ui_main_functions.go
index 265d722..2b66a28 100644
--- a/internal/ui_main_functions.go
+++ b/internal/ui_main_functions.go
@@ -4,11 +4,14 @@ import (
"fmt"
"os"
"regexp"
+ "strings"
"github.com/HikariKnight/ls-iommu/pkg/errorcheck"
"github.com/HikariKnight/quickpassthrough/internal/configs"
"github.com/HikariKnight/quickpassthrough/internal/logger"
+ "github.com/HikariKnight/quickpassthrough/pkg/command"
"github.com/HikariKnight/quickpassthrough/pkg/fileio"
+ "github.com/HikariKnight/quickpassthrough/pkg/uname"
)
// This function processes the enter event
@@ -151,7 +154,7 @@ func (m *model) processSelection() bool {
// This function starts the install process
// It takes 1 auth string as variable
-func (m *model) install() []string {
+func (m *model) install() {
// Get the config
config := configs.GetConfig()
@@ -159,7 +162,7 @@ func (m *model) install() []string {
var output []string
// Based on the bootloader, setup the configuration
- if config.Bootloader != "kernelstub" {
+ if config.Bootloader == "kernelstub" {
// Write to logger
logger.Printf("Configuring systemd-boot using kernelstub")
@@ -173,7 +176,7 @@ func (m *model) install() []string {
// Configure kernelstub
output = append(output, configs.Set_Grubby())
- } else if config.Bootloader != "grub2" {
+ } else if config.Bootloader == "grub2" {
// Write to logger
logger.Printf("Configuring grub2 manually")
grub_output, _ := configs.Set_Grub2()
@@ -184,5 +187,71 @@ func (m *model) install() []string {
logger.Printf("Unsupported bootloader, please add the below line to your bootloaders kernel arguments\n%s", kernel_args)
}
- return output
+ // A lot of linux systems support modprobe along with their own module system
+ // So copy the modprobe files if we have them
+ modprobeFile := fmt.Sprintf("%s/vfio.conf", config.Path.MODPROBE)
+ if fileio.FileExist(modprobeFile) {
+ // Copy initramfs-tools module to system
+ output = append(output, configs.CopyToSystem(modprobeFile, "/etc/modprobe.d/vfio.conf"))
+ }
+
+ // Copy the config files for the system we have
+ initramfsFile := fmt.Sprintf("%s/modules", config.Path.INITRAMFS)
+ dracutFile := fmt.Sprintf("%s/vfio.conf", config.Path.DRACUT)
+ if fileio.FileExist(initramfsFile) {
+ // Copy initramfs-tools module to system
+ output = append(output, configs.CopyToSystem(initramfsFile, "/etc/initramfs-tools/modules"))
+
+ // Copy the modules file to /etc/modules
+ output = append(output, configs.CopyToSystem(config.Path.ETCMODULES, "/etc/modules"))
+
+ // Write to logger
+ logger.Printf("Executing: sudo update-initramfs -u")
+
+ // Update initramfs
+ output = append(output, "Executed: sudo update-initramfs -u\nSee debug.log for detailed output")
+ cmd_out, cmd_err, _ := command.RunErr("sudo", "update-initramfs", "-u")
+
+ cmd_out = append(cmd_out, cmd_err...)
+
+ // Write to logger
+ logger.Printf(strings.Join(cmd_out, "\n"))
+ } else if fileio.FileExist(dracutFile) {
+ // Copy dracut config to /etc/dracut.conf.d/vfio
+ output = append(output, configs.CopyToSystem(dracutFile, "/etc/dracut.conf.d/vfio"))
+
+ // Get systeminfo
+ sysinfo := uname.New()
+
+ // Write to logger
+ logger.Printf("Executing: sudo dracut -f -v --kver %s", sysinfo.Release)
+
+ // Update initramfs
+ output = append(output, fmt.Sprintf("Executed: sudo dracut -f -v --kver %s\nSee debug.log for detailed output", sysinfo.Release))
+ cmd_out, cmd_err, _ := command.RunErr("sudo", "dracut", "-f", "-v", "--kver", sysinfo.Release)
+
+ cmd_out = append(cmd_out, cmd_err...)
+
+ // Write to logger
+ logger.Printf(strings.Join(cmd_out, "\n"))
+ } else if fileio.FileExist(config.Path.MKINITCPIO) {
+ // Copy dracut config to /etc/dracut.conf.d/vfio
+ output = append(output, configs.CopyToSystem(config.Path.MKINITCPIO, "/etc/mkinitcpio.conf"))
+
+ // Write to logger
+ logger.Printf("Executing: sudo mkinitcpio -P")
+
+ // Update initramfs
+ output = append(output, "Executed: sudo mkinitcpio -P\nSee debug.log for detailed output")
+ cmd_out, cmd_err, _ := command.RunErr("sudo", "mkinitcpio", "-P")
+
+ cmd_out = append(cmd_out, cmd_err...)
+
+ // Write to logger
+ logger.Printf(strings.Join(cmd_out, "\n"))
+ }
+
+ m.installOutput = output
+ m.focused++
+
}
diff --git a/internal/ui_main_view.go b/internal/ui_main_view.go
index b4c52ea..a02e6f7 100644
--- a/internal/ui_main_view.go
+++ b/internal/ui_main_view.go
@@ -6,6 +6,7 @@ import (
"path/filepath"
"strings"
+ tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
)
@@ -20,7 +21,7 @@ func (m model) View() string {
titleStyle.MarginLeft(0).Render("Welcome to QuickPassthrough!"),
"\n\n",
"This script is meant to make it easier to setup GPU passthrough for\n",
- "Qemu based systems.\n",
+ "Qemu based systems. WITH 2 GPUS ON THE HOST SYSTEM\n",
"However due to the complexity of GPU passthrough\n",
"This script assumes you know how to do (or have done) the following.\n\n",
"* You have already enabled IOMMU, VT-d, SVM and/or AMD-v\n inside your UEFI/BIOS advanced settings.\n",
@@ -138,9 +139,16 @@ func (m model) View() string {
view = m.authDialog.View()
+ case WORKING:
+ title = titleStyle.Render("Applying configurations!")
+ view = ""
+
+ m.authDialog.Update(tea.KeyEnter)
+ tea.Batch()
+
case DONE:
title = titleStyle.Render("Applying configurations!")
- view = dialogStyle.Render(strings.Join(m.installOutput, "\n"))
+ view = dialogStyle.Render(fmt.Sprintf("%s\n\nPress Enter to Exit.", strings.Join(m.installOutput, "\n")))
}
//return listStyle.SetString(fmt.Sprintf("%s\n\n", title)).Render(m.lists[m.focused].View())
return lipgloss.JoinVertical(lipgloss.Left, fmt.Sprintf("%s\n%s\n", title, view))
diff --git a/internal/ui_model.go b/internal/ui_model.go
index 257019d..f3aea70 100644
--- a/internal/ui_model.go
+++ b/internal/ui_model.go
@@ -49,6 +49,7 @@ const (
USB
USB_GROUP
INSTALL
+ WORKING
DONE
)
@@ -99,14 +100,15 @@ func (m *model) initLists(width, height int) {
defaultList,
choiceList,
choiceList,
+ choiceList,
}
// Configure offsets for sizing
m.offsetx = []int{
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
}
m.offsety = []int{
- 18, 2, 3, 13, 5, 2, 3, 12, 0,
+ 18, 2, 3, 13, 5, 2, 3, 12, 0, 0,
}
// Update the styles with the correct width
@@ -167,6 +169,13 @@ func (m *model) initLists(width, height int) {
m.lists[VIDEO].SetItems(items)
m.lists[VIDEO].SetSize(m.width-m.offsetx[VIDEO], m.height-m.offsety[VIDEO])
+ // Init DONE choises
+ items = []list.Item{
+ item{title: "WAITING"},
+ }
+ m.lists[WORKING].SetItems(items)
+ m.lists[WORKING].SetSize(m.width-m.offsetx[WORKING], m.height-m.offsety[WORKING])
+
// Init DONE choises
items = []list.Item{
item{title: "FINISH"},
From d4b6de43293786636dc3fae85a498f1e22374216 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 12 Apr 2023 01:21:08 +0200
Subject: [PATCH 084/132] add goreleaser file
---
cmd/.goreleaser.yaml | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 cmd/.goreleaser.yaml
diff --git a/cmd/.goreleaser.yaml b/cmd/.goreleaser.yaml
new file mode 100644
index 0000000..f2d4dbc
--- /dev/null
+++ b/cmd/.goreleaser.yaml
@@ -0,0 +1,29 @@
+before:
+ hooks:
+ - go mod tidy
+builds:
+ - env:
+ - CGO_ENABLED=0
+ goos:
+ - linux
+ hooks:
+ post:
+ - upx "{{ .Path }}"
+archives:
+ - replacements:
+ linux: Linux
+ amd64: x86_64
+checksum:
+ name_template: 'checksums.txt'
+snapshot:
+ name_template: "{{ incpatch .Version }}-next"
+changelog:
+ sort: asc
+ filters:
+ exclude:
+ - '^docs:'
+ - '^test:'
+
+# modelines, feel free to remove those if you don't want/use them:
+# yaml-language-server: $schema=https://goreleaser.com/static/schema.json
+# vim: set ts=2 sw=2 tw=0 fo=cnqoj
From 756f974071e7a1d3b55fe9ee96a96bebc7e36636 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 12 Apr 2023 01:22:39 +0200
Subject: [PATCH 085/132] Add the CGO_ENABLED=0 env to the build command
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 03d0f10..0f028c6 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ You can use it by simply downloading the latest release and run it inside a term
git clone https://github.com/HikariKnight/quickpassthrough.git
cd quickpassthrough
go mod download
-go build -o quickpassthrough cmd/main.go
+CGO_ENABLED=0 go build -o quickpassthrough cmd/main.go
```
## Features
From 5a1e4c78ed623ae1833fa5764077092988e9a614 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 12 Apr 2023 14:28:13 +0200
Subject: [PATCH 086/132] Correct some writing and add check for
unknown/unsupported bootloader
---
internal/ui_main_events.go | 2 +-
internal/ui_main_view.go | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/internal/ui_main_events.go b/internal/ui_main_events.go
index b85e1ee..335a86b 100644
--- a/internal/ui_main_events.go
+++ b/internal/ui_main_events.go
@@ -72,7 +72,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
// Blank the password field
m.authDialog.SetValue("")
- fmt.Println("Working... Application frozen until done, check debug.log for progress")
+ fmt.Println(titleStyle.Render("Working... Application frozen until done, check debug.log for progress"))
// Start installation and send the password to the command
m.install()
diff --git a/internal/ui_main_view.go b/internal/ui_main_view.go
index a02e6f7..2b437a2 100644
--- a/internal/ui_main_view.go
+++ b/internal/ui_main_view.go
@@ -6,6 +6,8 @@ import (
"path/filepath"
"strings"
+ "github.com/HikariKnight/quickpassthrough/internal/configs"
+ "github.com/HikariKnight/quickpassthrough/pkg/fileio"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss"
)
@@ -147,8 +149,16 @@ func (m model) View() string {
tea.Batch()
case DONE:
- title = titleStyle.Render("Applying configurations!")
+ title = titleStyle.Render("Applied configurations!")
+
view = dialogStyle.Render(fmt.Sprintf("%s\n\nPress Enter to Exit.", strings.Join(m.installOutput, "\n")))
+
+ // If the bootloader is unknown/unsupported
+ config := configs.GetConfig()
+ if config.Bootloader == "unknown" {
+ // Change the view to reflect that
+ view = dialogStyle.Render(fmt.Sprintf("%s\n\nI do not have a good way to reliably edit your bootloader!\nPlease add: %s\nTo your bootloaders kernel arguments.\nPress Enter to Exit.", strings.Join(m.installOutput, "\n"), fileio.ReadFile(config.Path.CMDLINE)))
+ }
}
//return listStyle.SetString(fmt.Sprintf("%s\n\n", title)).Render(m.lists[m.focused].View())
return lipgloss.JoinVertical(lipgloss.Left, fmt.Sprintf("%s\n%s\n", title, view))
From e83ca7b61cc827533682e1616a0500913e9e27e3 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 12 Apr 2023 16:35:53 +0200
Subject: [PATCH 087/132] Mention the gpus have to be different
---
internal/ui_main_view.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/internal/ui_main_view.go b/internal/ui_main_view.go
index 2b437a2..0269a25 100644
--- a/internal/ui_main_view.go
+++ b/internal/ui_main_view.go
@@ -23,7 +23,7 @@ func (m model) View() string {
titleStyle.MarginLeft(0).Render("Welcome to QuickPassthrough!"),
"\n\n",
"This script is meant to make it easier to setup GPU passthrough for\n",
- "Qemu based systems. WITH 2 GPUS ON THE HOST SYSTEM\n",
+ "Qemu based systems. WITH DIFFERENT 2 GPUS ON THE HOST SYSTEM\n",
"However due to the complexity of GPU passthrough\n",
"This script assumes you know how to do (or have done) the following.\n\n",
"* You have already enabled IOMMU, VT-d, SVM and/or AMD-v\n inside your UEFI/BIOS advanced settings.\n",
From 11ef75d6a030da0de52b1563371a7e57eeaf99e6 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Thu, 13 Apr 2023 02:00:29 +0200
Subject: [PATCH 088/132] Cleanup features
---
README.md | 42 ++++++++++++++++++------------------------
1 file changed, 18 insertions(+), 24 deletions(-)
diff --git a/README.md b/README.md
index 0f028c6..8a087c0 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,27 @@ CGO_ENABLED=0 go build -o quickpassthrough cmd/main.go
```
## Features
-* General warning and info about what you will be needing
-* Enable and configure vfio modules
+* Show general warning to user and inform about making a backup and general expectations
+* Detect if user has an amd or intel CPU and provide the correct IOMMU kernel args based on that
* Configure 2nd GPU for GPU Passthrough (1 for host, 1 for VM)
-* Generate script to use for dumping the vbios rom (as some cards require a romfile for passthrough to work), however no rom patching support planned.
-* Enable and configure the correct kernel modules and load them early (initramfs-tools, dracut and mkinitcpio)
-* Configure kernel arguments for systemd-boot (using kernelstub)
-* Configure kernel arguments for grub2
+* Use [ls-iommu](https://github.com/HikariKnight/ls-iommu) to find PCI devices like graphic cards, usb controllers, etc and see what IOMMU group they are in
+* Enable and configure vfio modules (initramfs-tools, dracut, modprobe and mkinitcpio)
+* Generate the correct kernel arguments for grub and systemd-boot~~
+* Generate script to use for dumping the vbios rom (as some cards require a romfile for passthrough to work), however no rom patching support planned.
+* Configure kernel arguments for systemd-boot (using kernelstub or grubby)
+* Configure kernel arguments for grub2 (editing /etc/default/grub or using grubby)
+* A system you can navigate through, built using [Bubble Tea](https://github.com/charmbracelet/bubbletea) (Help appreciated to make this menu better!)
+* ~~Coloured highlight/text for important information?~~ (not implemented yet)
+* Make sure [vendor-reset](https://github.com/gnif/vendor-reset) module is loaded before vfio, check the repository for the list of cards that require it!
* Provides you with the correct kernel arguments to add to your bootloader entry if a supported bootloader is not found
+## Features now handled by [ls-iommu](https://github.com/HikariKnight/ls-iommu)
+* Automatically handle GPUs where parts of it might be in separate IOMMU groups (ex: RX6600XT)
+* Fetch the ID and PCI Address of devices
+* Locate the vbios rom path on the system
+* Tell the user to enable IOMMU (VT-d/AMD-v) on their motherboard and bootloader
+* Get a list of devices, their IOMMU groups and various other information
+
## Contributing
@@ -33,24 +45,6 @@ Just remember to add comments to document the work and explain it for people who
Also if you know English, you can help by just proof reading. English is not my native language, plus I have dyslexia so I often make spelling mistakes.
Proof reading is still contribution!
-## Features
-* Show general warning to user and inform about making a backup and general expectations
-* Detect if user has an amd or intel CPU and provide the correct IOMMU kernel args based on that
-* Use [ls-iommu](https://github.com/HikariKnight/ls-iommu) to find PCI devices like graphic cards, usb controllers, etc and see what IOMMU group they are in
-* Enable and configure vfio modules
-* Generate the correct kernel arguments for grub and systemd-boot~~
-* Dump the GPU rom, just in case it will be needed for passthrough~~ (no rom patching planned due to complexity)
-* A system you can navigate through, built using [Bubble Tea](https://github.com/charmbracelet/bubbletea) (Help appreciated to make this menu better!)
-* ~~Coloured highlight/text for important information?~~ (not implemented yet)
-* Make sure [vendor-reset](https://github.com/gnif/vendor-reset) module is loaded before vfio, check the repository for the list of cards that require it!
-
-## Features now handled by [ls-iommu](https://github.com/HikariKnight/ls-iommu)
-* Automatically handle GPUs where parts of it might be in separate IOMMU groups (ex: RX6600XT)
-* Fetch the ID and PCI Address of devices
-* Locate the vbios rom path on the system
-* Tell the user to enable IOMMU (VT-d/AMD-v) on their motherboard and bootloader
-* Get a list of devices, their IOMMU groups and various other information
-
----
### Why GO?
From 6456ad64ba54ea8eaa906b308a961bdd58186fe0 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Thu, 13 Apr 2023 04:29:54 +0200
Subject: [PATCH 089/132] add a gif
---
quickpassthrough_preview.gif | Bin 0 -> 9452785 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 quickpassthrough_preview.gif
diff --git a/quickpassthrough_preview.gif b/quickpassthrough_preview.gif
new file mode 100644
index 0000000000000000000000000000000000000000..39ed2e85a4c6ac74503a64062a486e92c934c09a
GIT binary patch
literal 9452785
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