github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-14 21:39:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1427 from Ace-Tang/fix-qemu-leak

Browse Source 
qemu: fix qemu leak when failed to start container
This commit is contained in:
Fupan Li
2019-04-02 23:32:11 +08:00
committed by GitHub
parent cece49764c 096fa046f8
commit c9a3b933f8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
virtcontainers/api.go
View File

@@ -108,7 +108,7 @@ func createSandboxFromConfig(ctx context.Context, sandboxConfig SandboxConfig, f
}
}()
if err := s.getAndStoreGuestDetails(); err != nil {
if err = s.getAndStoreGuestDetails(); err != nil {
return nil, err
}

8
virtcontainers/sandbox.go
View File

@@ -913,7 +913,7 @@ func (s *Sandbox) ListRoutes() ([]*vcTypes.Route, error) {
}
// startVM starts the VM.
func (s *Sandbox) startVM() error {
func (s *Sandbox) startVM() (err error) {
span, ctx := s.trace("startVM")
defer span.Finish()
@@ -944,6 +944,12 @@ func (s *Sandbox) startVM() error {
return err
}
defer func() {
if err != nil {
s.hypervisor.stopSandbox()
}
}()
// In case of vm factory, network interfaces are hotplugged
// after vm is started.
if s.factory != nil {