From b200163de9f54a60298859609eaa0686de064bcb Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Fri, 27 Jul 2018 10:51:38 +0800 Subject: [PATCH] kata_agent: send sandbox id in CreateSandbox request And do not append sandbox id to kernel arguments since that would fail qemu args comparison in vm factory. Fixes: #523 Signed-off-by: Peng Tao --- virtcontainers/kata_agent.go | 1 + virtcontainers/qemu.go | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go index 65c56a128..0ffbbc379 100644 --- a/virtcontainers/kata_agent.go +++ b/virtcontainers/kata_agent.go @@ -584,6 +584,7 @@ func (k *kataAgent) startSandbox(sandbox *Sandbox) error { Hostname: hostname, Storages: storages, SandboxPidns: sandbox.sharePidNs, + SandboxId: sandbox.id, } _, err = k.sendReq(req) diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go index 143a5922c..649442760 100644 --- a/virtcontainers/qemu.go +++ b/virtcontainers/qemu.go @@ -400,14 +400,10 @@ func (q *qemu) createSandbox() error { return err } - // Pass the sandbox name to the agent via the kernel command-line to - // allow the agent to use it in log messages. - params := q.kernelParameters() + " " + "agent.sandbox=" + q.id - kernel := govmmQemu.Kernel{ Path: kernelPath, InitrdPath: initrdPath, - Params: params, + Params: q.kernelParameters(), } incoming := q.setupTemplate(&knobs, &memory)