opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 12:12:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

update libhvee

Browse Source 
this version of libhvee contains fixes related to machine stop required
for windows hyperv

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2023-08-25 13:19:14 -05:00
parent dd2ec7c613
commit fe3c4562f1
4 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
vendor/github.com/containers/libhvee/pkg/hypervctl/vm.go generated vendored
View File

@ -544,17 +544,6 @@ func (vm *VirtualMachine) remove() (int32, error) {
return -1, err
}
wmiInst, err := vm.fetchSystemSettingsInstance(srv)
if err != nil {
return -1, err
}
defer wmiInst.Close()
path, err := wmiInst.Path()
if err != nil {
return -1, err
}
vsms, err := srv.GetSingletonInstance("Msvm_VirtualSystemManagementService")
if err != nil {
return -1, err
@ -562,15 +551,14 @@ func (vm *VirtualMachine) remove() (int32, error) {
defer vsms.Close()
var (
job *wmiext.Instance
resultingSystem string
job *wmiext.Instance
)
// https://learn.microsoft.com/en-us/windows/win32/hyperv_v2/cim-virtualsystemmanagementservice-destroysystem
if err := vsms.BeginInvoke("DestroySystem").
In("AffectedSystem", path).
In("AffectedSystem", vm.Path()).
Execute().
Out("Job", &job).
Out("ResultingSystem", &resultingSystem).
Out("ReturnValue", &res).End(); err != nil {
return -1, err
}
@ -583,21 +571,17 @@ func (vm *VirtualMachine) remove() (int32, error) {
}
func (vm *VirtualMachine) Remove(diskPath string) error {
res, err := vm.remove()
if err != nil {
if _, err := vm.remove(); err != nil {
return err
}
if DestroySystemResult(res) == VMDestroyCompletedwithNoError {
// Remove disk only if we were given one
if len(diskPath) > 0 {
if err := os.Remove(diskPath); err != nil {
return err
}
}
return nil
}
return fmt.Errorf("failed to destroy system %s: %s", vm.Name, DestroySystemResult(res).Reason())
// Remove disk only if we were given one
if len(diskPath) > 0 {
if err := os.Remove(diskPath); err != nil {
return err
}
}
return nil
}
func (vm *VirtualMachine) State() EnabledState {