From f542d21a763011803b92178ea0a60d6484b748b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 2 Sep 2023 01:29:09 +0000 Subject: [PATCH] fix(deps): update github.com/containers/libhvee digest to 2bf7930 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- .../github.com/containers/libhvee/pkg/hypervctl/vm.go | 10 +++++++++- vendor/modules.txt | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 777838230f67..2697654d6593 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/containers/common v0.55.1-0.20230830075933-12405381ff45 github.com/containers/conmon v2.0.20+incompatible github.com/containers/image/v5 v5.26.1-0.20230807184415-3fb422379cfa - github.com/containers/libhvee v0.4.1-0.20230830164110-3777cdaa7db8 + github.com/containers/libhvee v0.4.1-0.20230901141204-2bf793065cfd github.com/containers/ocicrypt v1.1.8 github.com/containers/psgo v1.8.0 github.com/containers/storage v1.49.1-0.20230823084450-6902c2df7cca diff --git a/go.sum b/go.sum index 3dfa9cd2632b..6aced21672df 100644 --- a/go.sum +++ b/go.sum @@ -252,8 +252,8 @@ github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6J github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I= github.com/containers/image/v5 v5.26.1-0.20230807184415-3fb422379cfa h1:wDfVQtc6ik2MvsUmu/YRSyBAE5YUxdjcEDtuT1q2KDo= github.com/containers/image/v5 v5.26.1-0.20230807184415-3fb422379cfa/go.mod h1:apL4qwq31NV0gsSZQJPxYyTH0yzWavmMCjT8vsQaXSk= -github.com/containers/libhvee v0.4.1-0.20230830164110-3777cdaa7db8 h1:PTtzc5IcpcdHp9vLjE1cpT19Qo1GpouFTFE+rL0UO5I= -github.com/containers/libhvee v0.4.1-0.20230830164110-3777cdaa7db8/go.mod h1:I30im5oKCYBJMEa+r0jffZn+Yb5/8CnYeAJy+vb77Mg= +github.com/containers/libhvee v0.4.1-0.20230901141204-2bf793065cfd h1:oQXmHIKT3kuwKjhoeSHyv1K2i1l5KmATdd2nAZODDGc= +github.com/containers/libhvee v0.4.1-0.20230901141204-2bf793065cfd/go.mod h1:I30im5oKCYBJMEa+r0jffZn+Yb5/8CnYeAJy+vb77Mg= 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/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= diff --git a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go index b710582b13cf..4d60f551c640 100644 --- a/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go +++ b/vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go @@ -209,7 +209,15 @@ func waitVMResult(res int32, service *wmiext.Service, job *wmiext.Instance, erro return err } +func (vm *VirtualMachine) StopWithForce() error { + return vm.stop(true) +} + func (vm *VirtualMachine) Stop() error { + return vm.stop(false) +} + +func (vm *VirtualMachine) stop(force bool) error { if !Enabled.equal(vm.EnabledState) { return ErrMachineNotRunning } @@ -228,7 +236,7 @@ func (vm *VirtualMachine) Stop() error { // https://learn.microsoft.com/en-us/windows/win32/hyperv_v2/msvm-shutdowncomponent-initiateshutdown err = wmiInst.BeginInvoke("InitiateShutdown"). In("Reason", "User requested"). - In("Force", false). + In("Force", force). Execute(). Out("ReturnValue", &res).End() if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index 28cbf7c5574e..8b2d4cdfa0d9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -286,7 +286,7 @@ github.com/containers/image/v5/transports github.com/containers/image/v5/transports/alltransports github.com/containers/image/v5/types github.com/containers/image/v5/version -# github.com/containers/libhvee v0.4.1-0.20230830164110-3777cdaa7db8 +# github.com/containers/libhvee v0.4.1-0.20230901141204-2bf793065cfd ## explicit; go 1.18 github.com/containers/libhvee/pkg/hypervctl github.com/containers/libhvee/pkg/kvp/ginsu