Switch to new libvirt package

eikendev · eikendev · commit 38b48a025695 · 2025-02-16T22:55:40.000+01:00
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/melbahja/goph v1.4.0
 	github.com/schollz/progressbar/v3 v3.18.0
 	github.com/sirupsen/logrus v1.9.3
-	libvirt.org/libvirt-go v7.4.0+incompatible
+	libvirt.org/go/libvirt v1.11001.0
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -103,5 +103,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-libvirt.org/libvirt-go v7.4.0+incompatible h1:1gFJevSrEoxx/5nZPB6GaTDdoc902NP2KyVPwQ07Ji4=
-libvirt.org/libvirt-go v7.4.0+incompatible/go.mod h1:CPoljLoiC2aEw+62g1rZXl2oXAJaNsrq4YCSmJOELek=
+libvirt.org/go/libvirt v1.11001.0 h1:QJgpslxY7qkpXZIDxdMHpkDl7FfhgQJwqRTGBbg/S8E=
+libvirt.org/go/libvirt v1.11001.0/go.mod h1:1WiFE8EjZfq+FCVog+rvr1yatKbKZ9FaFMZgEqxEJqQ=
diff --git a/internal/commands/up.go b/internal/commands/up.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/melbahja/goph"
 	log "github.com/sirupsen/logrus"
-	rawLibvirt "libvirt.org/libvirt-go"
+	rawLibvirt "libvirt.org/go/libvirt"
 
 	"github.com/eikendev/hackenv/internal/banner"
 	"github.com/eikendev/hackenv/internal/constants"
diff --git a/internal/handling/handling.go b/internal/handling/handling.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	log "github.com/sirupsen/logrus"
-	rawLibvirt "libvirt.org/libvirt-go"
+	rawLibvirt "libvirt.org/go/libvirt"
 )
 
 // Close closes an io resource and prints a warning if that fails.
diff --git a/internal/images/generic.go b/internal/images/generic.go
@@ -7,7 +7,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	rawLibvirt "libvirt.org/libvirt-go"
+	rawLibvirt "libvirt.org/go/libvirt"
 )
 
 type genericVersionComparer struct{}
@@ -61,16 +61,13 @@ func genericBootInitializer(dom *rawLibvirt.Domain) {
 }
 
 func switchToTTY(dom *rawLibvirt.Domain) {
-	// Includes two dummy keys. See [0].
-	// [0] https://gitlab.com/libvirt/libvirt-go/-/issues/10
-	sendKeys(dom, []uint{KEY_LEFTCTRL, KEY_LEFTALT, KEY_F1, KEY_RESERVED, KEY_RESERVED})
+	sendKeys(dom, []uint{KEY_LEFTCTRL, KEY_LEFTALT, KEY_F1})
 
 	time.Sleep(500 * time.Millisecond)
 }
 
 func switchFromTTY(dom *rawLibvirt.Domain) {
-	// Includes two dummy keys as above.
-	sendKeys(dom, []uint{KEY_LEFTCTRL, KEY_LEFTALT, KEY_F7, KEY_RESERVED, KEY_RESERVED})
+	sendKeys(dom, []uint{KEY_LEFTCTRL, KEY_LEFTALT, KEY_F7})
 
 	time.Sleep(500 * time.Millisecond)
 }
diff --git a/internal/images/images.go b/internal/images/images.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/adrg/xdg"
 	"github.com/eikendev/hackenv/internal/constants"
-	rawLibvirt "libvirt.org/libvirt-go"
+	rawLibvirt "libvirt.org/go/libvirt"
 )
 
 type infoRetriever func(string, *regexp.Regexp) (*DownloadInfo, error)
diff --git a/internal/images/kali.go b/internal/images/kali.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
-	rawLibvirt "libvirt.org/libvirt-go"
+	rawLibvirt "libvirt.org/go/libvirt"
 
 	"github.com/eikendev/hackenv/internal/network"
 )
diff --git a/internal/images/parrot.go b/internal/images/parrot.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
-	rawLibvirt "libvirt.org/libvirt-go"
+	rawLibvirt "libvirt.org/go/libvirt"
 
 	"github.com/eikendev/hackenv/internal/network"
 )
diff --git a/internal/libvirt/libvirt.go b/internal/libvirt/libvirt.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/eikendev/hackenv/internal/constants"
 	"github.com/eikendev/hackenv/internal/images"
-	"libvirt.org/libvirt-go"
+	"libvirt.org/go/libvirt"
 )
 
 var domainStates = map[libvirt.DomainState]string{

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ require (`
`9`	`9`	`github.com/melbahja/goph v1.4.0`
`10`	`10`	`github.com/schollz/progressbar/v3 v3.18.0`
`11`	`11`	`github.com/sirupsen/logrus v1.9.3`
`12`		`- libvirt.org/libvirt-go v7.4.0+incompatible`
	`12`	`+ libvirt.org/go/libvirt v1.11001.0`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"os"`
`7`	`7`
`8`	`8`	`log "github.com/sirupsen/logrus"`
`9`		`- rawLibvirt "libvirt.org/libvirt-go"`
	`9`	`+ rawLibvirt "libvirt.org/go/libvirt"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// Close closes an io resource and prints a warning if that fails.`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`log "github.com/sirupsen/logrus"`
`9`	`9`
`10`		`- rawLibvirt "libvirt.org/libvirt-go"`
	`10`	`+ rawLibvirt "libvirt.org/go/libvirt"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type genericVersionComparer struct{}`
`@@ -61,16 +61,13 @@ func genericBootInitializer(dom *rawLibvirt.Domain) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`func switchToTTY(dom *rawLibvirt.Domain) {`
`64`		`- // Includes two dummy keys. See [0].`
`65`		`- // [0] https://gitlab.com/libvirt/libvirt-go/-/issues/10`
`66`		`- sendKeys(dom, []uint{KEY_LEFTCTRL, KEY_LEFTALT, KEY_F1, KEY_RESERVED, KEY_RESERVED})`
	`64`	`+ sendKeys(dom, []uint{KEY_LEFTCTRL, KEY_LEFTALT, KEY_F1})`
`67`	`65`
`68`	`66`	`time.Sleep(500 * time.Millisecond)`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`func switchFromTTY(dom *rawLibvirt.Domain) {`
`72`		`- // Includes two dummy keys as above.`
`73`		`- sendKeys(dom, []uint{KEY_LEFTCTRL, KEY_LEFTALT, KEY_F7, KEY_RESERVED, KEY_RESERVED})`
	`70`	`+ sendKeys(dom, []uint{KEY_LEFTCTRL, KEY_LEFTALT, KEY_F7})`
`74`	`71`
`75`	`72`	`time.Sleep(500 * time.Millisecond)`
`76`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/adrg/xdg"`
`13`	`13`	`"github.com/eikendev/hackenv/internal/constants"`
`14`		`- rawLibvirt "libvirt.org/libvirt-go"`
	`14`	`+ rawLibvirt "libvirt.org/go/libvirt"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`type infoRetriever func(string, regexp.Regexp) (DownloadInfo, error)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"time"`
`11`	`11`
`12`	`12`	`log "github.com/sirupsen/logrus"`
`13`		`- rawLibvirt "libvirt.org/libvirt-go"`
	`13`	`+ rawLibvirt "libvirt.org/go/libvirt"`
`14`	`14`
`15`	`15`	`"github.com/eikendev/hackenv/internal/network"`
`16`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/eikendev/hackenv/internal/constants"`
`10`	`10`	`"github.com/eikendev/hackenv/internal/images"`
`11`		`- "libvirt.org/libvirt-go"`
	`11`	`+ "libvirt.org/go/libvirt"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var domainStates = map[libvirt.DomainState]string{`