opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-01 22:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21517 from jakecorrenti/fix-qemu-todos

Browse Source 
machine: Address some QEMU TODOs
This commit is contained in:
openshift-merge-bot[bot]
2024-02-22 21:21:50 +00:00
committed by GitHub
parent 2882b74d4f d7f7f07c9b
commit 36d8e27601
8 changed files with 38 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/machine/qemu/machine.go
View File

@ -16,6 +16,7 @@ import (
"time"
"github.com/containers/common/pkg/config"
"github.com/containers/podman/v5/pkg/errorhandling"
"github.com/containers/podman/v5/pkg/machine/define"
"github.com/containers/podman/v5/pkg/machine/vmconfigs"
"github.com/digitalocean/go-qemu/qmp"
@ -237,7 +238,15 @@ func (q *QEMUStubber) Remove(mc *vmconfigs.MachineConfig) ([]string, func() erro
}
return qemuRmFiles, func() error {
return nil
var errs []error
if err := mc.QEMUHypervisor.QEMUPidPath.Delete(); err != nil {
errs = append(errs, err)
}
if err := mc.QEMUHypervisor.QMPMonitor.Address.Delete(); err != nil {
errs = append(errs, err)
}
return errorhandling.JoinErrors(errs)
}, nil
}