From 2022c64f941273423a9763c48758051ce5180ff2 Mon Sep 17 00:00:00 2001 From: bin Date: Wed, 16 Jun 2021 18:35:47 +0800 Subject: [PATCH] runtime: using detail propertites instead of function name in log field 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 --- src/runtime/virtcontainers/qemu_amd64.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/runtime/virtcontainers/qemu_amd64.go b/src/runtime/virtcontainers/qemu_amd64.go index 534196bf90..ed57de7c18 100644 --- a/src/runtime/virtcontainers/qemu_amd64.go +++ b/src/runtime/virtcontainers/qemu_amd64.go @@ -216,6 +216,12 @@ func (q *qemuAmd64) enableProtection() error { if err != nil { 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 { case tdxProtection: @@ -224,22 +230,14 @@ func (q *qemuAmd64) enableProtection() error { } q.qemuMachine.Options += "kvm-type=tdx,confidential-guest-support=tdx" q.kernelParams = append(q.kernelParams, Param{"tdx_guest", ""}) - virtLog.WithFields(logrus.Fields{ - "subsystem": "qemuAmd64", - "machine": q.qemuMachine, - "kernel-params": q.kernelParameters}). - Info("Enabling TDX guest protection") + logger.Info("Enabling TDX guest protection") return nil case sevProtection: if q.qemuMachine.Options != "" { q.qemuMachine.Options += "," } q.qemuMachine.Options += "confidential-guest-support=sev" - virtLog.WithFields(logrus.Fields{ - "subsystem": "qemuAmd64", - "machine": q.qemuMachine, - "kernel-params": q.kernelParameters}). - Info("Enabling SEV guest protection") + logger.Info("Enabling SEV guest protection") return nil // TODO: Add support for other x86_64 technologies