From 1e798b96fd4c1b56407dfb344144c8b2fd4eddeb Mon Sep 17 00:00:00 2001 From: Bo Chen Date: Mon, 11 Oct 2021 17:38:45 -0700 Subject: [PATCH] virtcontainers: clh: Turn-off serial and virtio-console by default We will need to have console output from the guest only for debugging purposes. As a result, we can turn-off both the serial and virtio-console devices by default for better boot time. Fixes: #2820 Signed-off-by: Bo Chen (cherry picked from commit 3e24e46c70330f8f98588f973bc775c5506c3c9c) --- src/runtime/virtcontainers/clh.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/runtime/virtcontainers/clh.go b/src/runtime/virtcontainers/clh.go index 630054f85..50f34892d 100644 --- a/src/runtime/virtcontainers/clh.go +++ b/src/runtime/virtcontainers/clh.go @@ -286,11 +286,12 @@ func (clh *cloudHypervisor) createSandbox(ctx context.Context, id string, networ clh.vmconfig.Pmem = &[]chclient.PmemConfig{*pmem} } - // set the serial console to the cloud hypervisor + // Use serial port as the guest console only in debug mode, + // so that we can gather early OS booting log if clh.config.Debug { clh.vmconfig.Serial = chclient.NewConsoleConfig(cctTTY) } else { - clh.vmconfig.Serial = chclient.NewConsoleConfig(cctNULL) + clh.vmconfig.Serial = chclient.NewConsoleConfig(cctOFF) } clh.vmconfig.Console = chclient.NewConsoleConfig(cctOFF) @@ -967,9 +968,8 @@ func (clh *cloudHypervisor) launchClh() (int, error) { //########################################################################### const ( - cctOFF string = "Off" - cctNULL string = "Null" - cctTTY string = "Tty" + cctOFF string = "Off" + cctTTY string = "Tty" ) const (