diff --git a/go.mod b/go.mod index ae574c8ae48..810d869edbc 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/containers/buildah v1.41.1-0.20250829135344-3367a9bc2c9f github.com/containers/conmon v2.0.20+incompatible github.com/containers/gvisor-tap-vsock v0.8.7 - github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 + github.com/containers/libhvee v1.10.1 github.com/containers/ocicrypt v1.2.1 github.com/containers/psgo v1.9.1-0.20250826150930-4ae76f200c86 github.com/containers/winquit v1.1.0 diff --git a/go.sum b/go.sum index b466075b3a5..c37ec44ed3d 100644 --- a/go.sum +++ b/go.sum @@ -65,6 +65,8 @@ github.com/containers/gvisor-tap-vsock v0.8.7 h1:mFMMU5CIXO9sbtsgECc90loUHx15km3 github.com/containers/gvisor-tap-vsock v0.8.7/go.mod h1:Rf2gm4Lpac0IZbg8wwQDh7UuKCxHmnxar0hEZ08OXY8= github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 h1:YOhl3KCie5f4vLmW3N6nnpucD6Wot0bHj2hSzL8ugU8= github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860/go.mod h1:/A6jL8HXzYB4aUQEjlyYImaQTgSw2jYZunSVCwqgaCI= +github.com/containers/libhvee v1.10.1 h1:mHFI61ZZiJKarv6+kia59QdNm5OtW1kNl10NyyO4n54= +github.com/containers/libhvee v1.10.1/go.mod h1:y83sH4tqNTHOZFMIVp2KJdFZW656lqa7oQM6hAw4FnY= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= github.com/containers/luksy v0.0.0-20250714213221-8fccf784694e h1:nrNp2M6tTNGvLVrJpgqge9GwHgsWBGp2HBKg84BdVd8= diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd.go index 85b7399098e..c7310be9525 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd.go @@ -6,8 +6,8 @@ import ( "strconv" "strings" + "github.com/containers/common/pkg/strongunits" "github.com/containers/libhvee/pkg/wmiext" - "go.podman.io/common/pkg/strongunits" ) // ResizeDisk takes a diskPath and strongly typed new size and uses powershell diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go index 79467958737..7fcae23affa 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go @@ -218,7 +218,7 @@ func waitVMResult(res int32, service *wmiext.Service, job *wmiext.Instance, erro if err != nil { desc, _ := job.GetAsString("ErrorDescription") - desc = strings.ReplaceAll(desc, "\n", " ") + desc = strings.Replace(desc, "\n", " ", -1) return fmt.Errorf("%s: %w (%s)", errorMsg, err, desc) } @@ -430,7 +430,7 @@ func (vmm *VirtualMachineManager) NewVirtualMachine(name string, config *Hardwar return err } - builder := NewDriveSettingsBuilder(systemSettings). + if err := NewDriveSettingsBuilder(systemSettings). AddScsiController(). AddSyntheticDiskDrive(0). DefineVirtualHardDisk(config.DiskPath, func(vhdss *VirtualHardDiskStorageSettings) { @@ -438,24 +438,15 @@ func (vmm *VirtualMachineManager) NewVirtualMachine(name string, config *Hardwar // vhdss.IOPSLimit = 5000 }). Finish(). // disk - Finish() // drive - - if config.DVDDiskPath != "" { - // Add a DVD drive if the DVDDiskPath is set - // This is useful for cloud-init or other bootable media - builder = builder. - AddSyntheticDvdDrive(1). - DefineVirtualDvdDisk(config.DVDDiskPath). - Finish(). // disk - Finish() // drive - } - - if err := builder. + Finish(). // drive + //AddSyntheticDvdDrive(1). + //DefineVirtualDvdDisk(isoFile). + //Finish(). // disk + //Finish(). // drive Finish(). // controller Complete(); err != nil { return err } - // Add default network connection if config.Network { if err := NewNetworkSettingsBuilder(systemSettings). diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm_config.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm_config.go index 7f7c4bbdba6..4ea14d660a1 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm_config.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm_config.go @@ -101,9 +101,6 @@ type HardwareConfig struct { // Network is bool to add a Network Connection to the // default network switch in Microsoft HyperV Network bool - // DVDDiskPath is the path to the disk image - // that will be used as a DVD drive in the VM (e.g. for cloud-init) - DVDDiskPath string } type Statuses struct { diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/array.go b/vendor/github.com/containers/libhvee/pkg/wmiext/array.go index 825d0bb45d0..3f059360cb7 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/array.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/array.go @@ -41,7 +41,7 @@ func safeArrayCreateVector(variantType ole.VT, lowerBound int32, length uint32) if ret == 0 { // NULL return value err = fmt.Errorf("could not create safe array") } - safearray = (*ole.SafeArray)(unsafe.Pointer(ret)) //nolint:govet + safearray = (*ole.SafeArray)(unsafe.Pointer(ret)) return } @@ -148,10 +148,7 @@ func safeArrayGetElement(safearray *ole.SafeArray, index int64, element unsafe.P } func isVariantValConvertible(variant ole.VARIANT) bool { - if variant.VT == ole.VT_RECORD || variant.VT == ole.VT_VARIANT { - return false - } - return true + return !(variant.VT == ole.VT_RECORD || variant.VT == ole.VT_VARIANT) } func safeArrayGetAsVariantVal(safeArray *ole.SafeArray, index int64, variant ole.VARIANT) (int64, error) { diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go b/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go index ad4c595aca1..9dc96906065 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go @@ -347,14 +347,14 @@ func convertTimeToDataTime(time *time.Time) ole.VARIANT { } func convertDurationToDateTime(duration time.Duration) ole.VARIANT { - const dayTime = time.Second * 86400 + const daySeconds = time.Second * 86400 if duration == 0 { return ole.NewVariant(ole.VT_NULL, 0) } - days := duration / dayTime - duration = duration % dayTime + days := duration / daySeconds + duration = duration % daySeconds hours := duration / time.Hour duration = duration % time.Hour @@ -435,7 +435,7 @@ func parseIntervalTime(interval string) (time.Time, error) { return time.Time{}, err } - var stamp = secs + var stamp uint64 = secs stamp += days * 86400 stamp += hours * 3600 stamp += mins * 60 diff --git a/vendor/modules.txt b/vendor/modules.txt index 59007f2534e..fa7604b6c62 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -120,8 +120,8 @@ github.com/containers/conmon/runner/config # github.com/containers/gvisor-tap-vsock v0.8.7 ## explicit; go 1.23.0 github.com/containers/gvisor-tap-vsock/pkg/types -# github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 -## explicit; go 1.23.3 +# github.com/containers/libhvee v1.10.1 +## explicit; go 1.22.8 github.com/containers/libhvee/pkg/hypervctl github.com/containers/libhvee/pkg/kvp/ginsu github.com/containers/libhvee/pkg/wmiext