Merge pull request #2482 from jcvenegas/fix-2481

clh: Do not find vsock context ID
This commit is contained in:
Julio Montes 2020-02-20 08:20:39 -06:00 committed by GitHub
commit feac6648fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -592,14 +592,10 @@ func (clh *cloudHypervisor) generateSocket(id string, useVsock bool) (interface{
clh.Logger().Info("Can't generate socket path for cloud-hypervisor") clh.Logger().Info("Can't generate socket path for cloud-hypervisor")
return types.HybridVSock{}, err return types.HybridVSock{}, err
} }
_, cid, err := utils.FindContextID()
if err != nil {
return nil, err
}
return types.HybridVSock{ return types.HybridVSock{
UdsPath: udsPath, UdsPath: udsPath,
ContextID: cid, Port: uint32(vSockPort),
Port: uint32(vSockPort),
}, nil }, nil
} }