github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-24 18:27:10 +00:00
Code Issues Projects Releases Wiki Activity

clh: initialize clh pid before using it

Browse Source 
The PID needs to be initialized before calling isClhRunning.
waitVMM() uses isClhRunning and is called by launchClh() just
before returning from function.

Fixes: #9230

Signed-off-by: Alexandru Matei <alexandru.matei@uipath.com>
This commit is contained in:
Alexandru Matei
2024-03-06 13:56:41 +02:00
parent 54e5ce2464
commit 617b0114b3
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/runtime/virtcontainers/clh.go
View File

@@ -708,11 +708,10 @@ func (clh *cloudHypervisor) StartVM(ctx context.Context, timeout int) error {
}
}()
pid, err := clh.launchClh()
err = clh.launchClh()
if err != nil {
return fmt.Errorf("failed to launch cloud-hypervisor: %q", err)
}
clh.state.PID = pid
bootTimeout := clh.getClhAPITimeout()
if bootTimeout < clhCreateAndBootVMMinimumTimeout {
@@ -1344,11 +1343,13 @@ func (clh *cloudHypervisor) clhPath() (string, error) {
return p, err
}
func (clh *cloudHypervisor) launchClh() (int, error) {
func (clh *cloudHypervisor) launchClh() error {
clh.state.PID = -1
clhPath, err := clh.clhPath()
if err != nil {
return -1, err
return err
}
args := []string{cscAPIsocket, clh.state.apiSocket}
@@ -1406,15 +1407,17 @@ func (clh *cloudHypervisor) launchClh() (int, error) {
err = utils.StartCmd(cmdHypervisor)
if err != nil {
return -1, err
return err
}
clh.state.PID = cmdHypervisor.Process.Pid
if err := clh.waitVMM(clhTimeout); err != nil {
clh.Logger().WithError(err).Warn("cloud-hypervisor init failed")
return -1, err
return err
}
return cmdHypervisor.Process.Pid, nil
return nil
}
//###########################################################################