From a73686120db341b8a6c675e4d1ddff6305e75ed1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Apr 2026 04:41:48 +0000 Subject: [PATCH] Update module github.com/containers/libhvee to v0.11.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- .../pkg/hypervctl/diskdrive_settings.go | 1 - .../pkg/hypervctl/drive_settings_builder.go | 1 - .../pkg/hypervctl/dvddrive_settings.go | 1 - .../containers/libhvee/pkg/hypervctl/error.go | 1 - .../pkg/hypervctl/ethernet_alloc_settings.go | 1 - .../pkg/hypervctl/ethernet_port_settings.go | 1 - .../containers/libhvee/pkg/hypervctl/kvp.go | 1 - .../libhvee/pkg/hypervctl/memory_settings.go | 1 - .../pkg/hypervctl/network_settings_builder.go | 1 - .../pkg/hypervctl/processor_settings.go | 1 - .../pkg/hypervctl/resources_settings.go | 1 - .../libhvee/pkg/hypervctl/scsi_controller.go | 1 - .../pkg/hypervctl/storage_alloc_settings.go | 1 - .../libhvee/pkg/hypervctl/summary.go | 1 - .../libhvee/pkg/hypervctl/system_settings.go | 1 - .../pkg/hypervctl/system_settings_builder.go | 1 - .../pkg/hypervctl/vdvd_storage_settings.go | 1 - .../libhvee/pkg/hypervctl/vhd_settings.go | 1 - .../pkg/hypervctl/vhd_storage_settings.go | 1 - .../containers/libhvee/pkg/hypervctl/vm.go | 11 +++++----- .../libhvee/pkg/hypervctl/vm_config.go | 1 - .../containers/libhvee/pkg/hypervctl/vmm.go | 1 - .../containers/libhvee/pkg/wmiext/array.go | 1 - .../libhvee/pkg/wmiext/conversion.go | 3 +-- .../containers/libhvee/pkg/wmiext/enum.go | 1 - .../containers/libhvee/pkg/wmiext/init.go | 1 - .../containers/libhvee/pkg/wmiext/instance.go | 1 - .../containers/libhvee/pkg/wmiext/invoke.go | 1 - .../containers/libhvee/pkg/wmiext/job.go | 20 ++++++++++++++++--- .../containers/libhvee/pkg/wmiext/service.go | 3 +-- vendor/modules.txt | 4 ++-- 33 files changed, 30 insertions(+), 43 deletions(-) diff --git a/go.mod b/go.mod index 8f872e9368..631db5fd2a 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/checkpoint-restore/go-criu/v7 v7.2.0 github.com/containers/buildah v1.42.1-0.20260318164928-eb9c9b9d2fc8 github.com/containers/gvisor-tap-vsock v0.8.8 - github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 + github.com/containers/libhvee v0.11.0 github.com/containers/ocicrypt v1.2.1 github.com/containers/psgo v1.10.0 github.com/containers/winquit v1.1.0 diff --git a/go.sum b/go.sum index de14dad12c..4a1f29d0fb 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/containers/common v0.64.2 h1:1xepE7QwQggUXxmyQ1Dbh6Cn0yd7ktk14sN3McSW github.com/containers/common v0.64.2/go.mod h1:o29GfYy4tefUuShm8mOn2AiL5Mpzdio+viHI7n24KJ4= github.com/containers/gvisor-tap-vsock v0.8.8 h1:5FznbOYMIuaCv8B6zQ7M6wjqP63Lasy0A6GpViEnjTg= github.com/containers/gvisor-tap-vsock v0.8.8/go.mod h1:m/PzhZWAS6T9pCRH1fLkq2OqbEd6QEUZWjm3FS5F+CE= -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 v0.11.0 h1:lh9sN2vl0pWrozAjvudsJaKLN1H6YXaohSn/cCxSSLI= +github.com/containers/libhvee v0.11.0/go.mod h1:4eTPJpxhHsXWaKXF5KI3/IuN1U/wbTvupLzKfSB8p0E= 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-20251208191447-ca096313c38f h1:DWGVgZ9ToKBOMiBMv//ilrKPKEy4tQG752XtTJXYUQ0= diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/diskdrive_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/diskdrive_settings.go index 5e669302d6..ba22259d0b 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/diskdrive_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/diskdrive_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/drive_settings_builder.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/drive_settings_builder.go index 21d67478c3..6f7fc8e008 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/drive_settings_builder.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/drive_settings_builder.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/dvddrive_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/dvddrive_settings.go index 2f66163a27..ec609f7854 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/dvddrive_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/dvddrive_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/error.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/error.go index 2f169712aa..74986cc511 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/error.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/error.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/ethernet_alloc_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/ethernet_alloc_settings.go index 9cdb644954..649bc8564c 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/ethernet_alloc_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/ethernet_alloc_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/ethernet_port_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/ethernet_port_settings.go index 294d87e5ee..990e37af51 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/ethernet_port_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/ethernet_port_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/kvp.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/kvp.go index 04bed34298..593a1aeabd 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/kvp.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/kvp.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/memory_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/memory_settings.go index 960694eb70..aaccc3fea6 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/memory_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/memory_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/network_settings_builder.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/network_settings_builder.go index ed5abd6371..3f43b03c24 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/network_settings_builder.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/network_settings_builder.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/processor_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/processor_settings.go index 9c0d6d95e8..bca4720867 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/processor_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/processor_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/resources_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/resources_settings.go index eda4b25238..bf8e8c5fc7 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/resources_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/resources_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/scsi_controller.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/scsi_controller.go index d38bfacb60..82091a2383 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/scsi_controller.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/scsi_controller.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/storage_alloc_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/storage_alloc_settings.go index e6baa54301..4151f92268 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/storage_alloc_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/storage_alloc_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/summary.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/summary.go index c8abcef1b0..2f1f096510 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/summary.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/summary.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/system_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/system_settings.go index cfb4207dc5..6c4ef51c0d 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/system_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/system_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/system_settings_builder.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/system_settings_builder.go index 76b5995367..2a51b944a9 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/system_settings_builder.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/system_settings_builder.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vdvd_storage_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vdvd_storage_settings.go index ad5eceabe2..a340045843 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vdvd_storage_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vdvd_storage_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd_settings.go index e6bd8b4bff..8e563eeb9b 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd_storage_settings.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd_storage_settings.go index 0384408cec..b830544268 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd_storage_settings.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vhd_storage_settings.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go index 7946795873..f8719f93d2 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl @@ -8,7 +7,6 @@ import ( "errors" "fmt" "os" - "strings" "time" "github.com/containers/libhvee/pkg/kvp/ginsu" @@ -196,6 +194,9 @@ func (vm *VirtualMachine) kvpOperation(op string, key string, value string, nowa err = &wmiext.JobError{ErrorCode: int(ret)} } + if jobErr, ok := err.(*wmiext.JobError); ok && jobErr.Description != "" { + return errors.New(jobErr.Error()) + } return translateKvpError(err, illegalSuggestion) } @@ -217,9 +218,9 @@ func waitVMResult(res int32, service *wmiext.Service, job *wmiext.Instance, erro } if err != nil { - desc, _ := job.GetAsString("ErrorDescription") - desc = strings.ReplaceAll(desc, "\n", " ") - return fmt.Errorf("%s: %w (%s)", errorMsg, err, desc) + if jobErr, ok := err.(*wmiext.JobError); ok && jobErr.Description != "" { + return errors.New(jobErr.Error()) + } } return err 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 7f7c4bbdba..9986693846 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm_config.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm_config.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vmm.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vmm.go index ea7f239488..12b8517c84 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vmm.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vmm.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package hypervctl diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/array.go b/vendor/github.com/containers/libhvee/pkg/wmiext/array.go index 825d0bb45d..9598deca14 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/array.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/array.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wmiext diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go b/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go index ad4c595aca..88b76fe3ac 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/conversion.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wmiext @@ -341,7 +340,7 @@ func convertTimeToDataTime(time *time.Time) ole.VARIANT { _, offset := time.Zone() // convert to minutes offset /= 60 - //yyyymmddHHMMSS.mmmmmmsUUU + // yyyymmddHHMMSS.mmmmmmsUUU s := fmt.Sprintf("%s%+04d", time.Format("20060102150405.000000"), offset) return ole.NewVariant(ole.VT_BSTR, int64(uintptr(unsafe.Pointer(ole.SysAllocStringLen(s))))) } diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/enum.go b/vendor/github.com/containers/libhvee/pkg/wmiext/enum.go index 2b6fd690b3..69e74a5489 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/enum.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/enum.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wmiext diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/init.go b/vendor/github.com/containers/libhvee/pkg/wmiext/init.go index 35c5b82971..ba194bb0f4 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/init.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/init.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wmiext diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/instance.go b/vendor/github.com/containers/libhvee/pkg/wmiext/instance.go index b60d636fe2..b5c4731aa6 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/instance.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/instance.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wmiext diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/invoke.go b/vendor/github.com/containers/libhvee/pkg/wmiext/invoke.go index 6875e2de69..da7ac1ebb7 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/invoke.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/invoke.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wmiext diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/job.go b/vendor/github.com/containers/libhvee/pkg/wmiext/job.go index 180c1e515f..7cc3681581 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/job.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/job.go @@ -1,18 +1,22 @@ //go:build windows -// +build windows package wmiext import ( "fmt" + "strings" "time" ) type JobError struct { - ErrorCode int + ErrorCode int + Description string } func (err *JobError) Error() string { + if err.Description != "" { + return fmt.Sprintf("Job failed with error code: %d. Description: %s", err.ErrorCode, err.Description) + } return fmt.Sprintf("Job failed with error code: %d", err.ErrorCode) } @@ -46,7 +50,17 @@ func WaitJob(service *Service, job *Instance) error { } if result.(int32) != 0 { - return &JobError{ErrorCode: int(result.(int32))} + desc := "" + + if desc, err = job.GetAsString("ErrorDescription"); err == nil { + desc = strings.ReplaceAll(desc, "\n", " ") + desc = strings.TrimSpace(desc) + } + + return &JobError{ + ErrorCode: int(result.(int32)), + Description: desc, + } } return nil diff --git a/vendor/github.com/containers/libhvee/pkg/wmiext/service.go b/vendor/github.com/containers/libhvee/pkg/wmiext/service.go index c58d06c1aa..05fe9084f1 100644 --- a/vendor/github.com/containers/libhvee/pkg/wmiext/service.go +++ b/vendor/github.com/containers/libhvee/pkg/wmiext/service.go @@ -1,5 +1,4 @@ //go:build windows -// +build windows package wmiext @@ -112,7 +111,7 @@ const ( ) func CoSetProxyBlanket(service *ole.IUnknown) (err error) { - res, _, _ := procCoSetProxyBlanket.Call( //CoSetProxyBlanket( + res, _, _ := procCoSetProxyBlanket.Call( // CoSetProxyBlanket( uintptr(unsafe.Pointer(service)), // [in] IUnknown *pProxy, uintptr(RPC_C_AUTHN_WINNT), // [in] DWORD dwAuthnSvc, uintptr(RPC_C_AUTHZ_NONE), // [in] DWORD dwAuthzSvc, diff --git a/vendor/modules.txt b/vendor/modules.txt index e6dcf45796..8ea7f62101 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -121,8 +121,8 @@ github.com/containers/common/pkg/strongunits # github.com/containers/gvisor-tap-vsock v0.8.8 ## explicit; go 1.24.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 v0.11.0 +## explicit; go 1.25.0 github.com/containers/libhvee/pkg/hypervctl github.com/containers/libhvee/pkg/kvp/ginsu github.com/containers/libhvee/pkg/wmiext