From 63c7ac5bbeb83d615055b8a0fc012655942363ad Mon Sep 17 00:00:00 2001 From: Bo Chen Date: Tue, 3 Mar 2020 16:13:01 -0800 Subject: [PATCH] clh: add 'APIsocket' to persist HypervisorState The 'apiSocket' member in the CloudHypervisorState struct needs to be kept across different executions of kata-runtime with persist HypervisorState, so that kata-runtime can talk with the same running cloud-hypervisor through HTTP/REST API calls. Fixes: #2506 Signed-off-by: Bo Chen --- virtcontainers/clh.go | 2 ++ virtcontainers/persist/api/hypervisor.go | 3 +++ 2 files changed, 5 insertions(+) diff --git a/virtcontainers/clh.go b/virtcontainers/clh.go index fc390c8500..3bc63068f0 100644 --- a/virtcontainers/clh.go +++ b/virtcontainers/clh.go @@ -435,12 +435,14 @@ func (clh *cloudHypervisor) save() (s persistapi.HypervisorState) { s.Pid = clh.state.PID s.Type = string(ClhHypervisor) s.VirtiofsdPid = clh.state.VirtiofsdPID + s.APISocket = clh.state.apiSocket return } func (clh *cloudHypervisor) load(s persistapi.HypervisorState) { clh.state.PID = s.Pid clh.state.VirtiofsdPID = s.VirtiofsdPid + clh.state.apiSocket = s.APISocket } func (clh *cloudHypervisor) check() error { diff --git a/virtcontainers/persist/api/hypervisor.go b/virtcontainers/persist/api/hypervisor.go index c4262baccf..375fd56b14 100644 --- a/virtcontainers/persist/api/hypervisor.go +++ b/virtcontainers/persist/api/hypervisor.go @@ -42,4 +42,7 @@ type HypervisorState struct { VirtiofsdPid int HotplugVFIOOnRootBus bool PCIeRootPort int + + // clh sepcific: refer to 'virtcontainers/clh.go:CloudHypervisorState' + APISocket string }