github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 12:14:48 +00:00
Code Issues Projects Releases Wiki Activity

runtime: using detail propertites instead of function name in log field

Browse Source 
To print the correct value of kernel parameters, the log field
value should not be a function name. And for that qemuArchBase
doesn't contain debug flag, so the log contains debug/non-debug
parameters.

Fixes: #2048

Signed-off-by: bin <bin@hyper.sh>
This commit is contained in:
bin 2021-06-16 18:35:47 +08:00
parent fb318532b9
commit 2022c64f94
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/runtime/virtcontainers/qemu_amd64.go
View File

@ -216,6 +216,12 @@ func (q *qemuAmd64) enableProtection() error {
if err != nil { if err != nil {
return err return err
} }
logger := virtLog.WithFields(logrus.Fields{
"subsystem": "qemuAmd64",
"machine": q.qemuMachine,
"kernel-params-debug": q.kernelParamsDebug,
"kernel-params-non-debug": q.kernelParamsNonDebug,
"kernel-params": q.kernelParams})
switch q.protection { switch q.protection {
case tdxProtection: case tdxProtection:
@ -224,22 +230,14 @@ func (q *qemuAmd64) enableProtection() error {
} }
q.qemuMachine.Options += "kvm-type=tdx,confidential-guest-support=tdx" q.qemuMachine.Options += "kvm-type=tdx,confidential-guest-support=tdx"
q.kernelParams = append(q.kernelParams, Param{"tdx_guest", ""}) q.kernelParams = append(q.kernelParams, Param{"tdx_guest", ""})
virtLog.WithFields(logrus.Fields{ logger.Info("Enabling TDX guest protection")
"subsystem": "qemuAmd64",
"machine": q.qemuMachine,
"kernel-params": q.kernelParameters}).
Info("Enabling TDX guest protection")
return nil return nil
case sevProtection: case sevProtection:
if q.qemuMachine.Options != "" { if q.qemuMachine.Options != "" {
q.qemuMachine.Options += "," q.qemuMachine.Options += ","
} }
q.qemuMachine.Options += "confidential-guest-support=sev" q.qemuMachine.Options += "confidential-guest-support=sev"
virtLog.WithFields(logrus.Fields{ logger.Info("Enabling SEV guest protection")
"subsystem": "qemuAmd64",
"machine": q.qemuMachine,
"kernel-params": q.kernelParameters}).
Info("Enabling SEV guest protection")
return nil return nil
// TODO: Add support for other x86_64 technologies // TODO: Add support for other x86_64 technologies