github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-17 17:02:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2821 from likebreath/1011/clh_console

Browse Source 
clh: Refine the usage of guest console and kernel parameters with Cloud Hypervisor
This commit is contained in:
GabyCT 2021-10-13 13:36:32 -05:00 committed by GitHub
commit 5c7e1b457c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/runtime/virtcontainers/clh.go
View File

@ -257,6 +257,9 @@ func (clh *cloudHypervisor) createSandbox(ctx context.Context, id string, networ
// Followed by extra debug parameters if debug enabled in configuration file // Followed by extra debug parameters if debug enabled in configuration file
if clh.config.Debug { if clh.config.Debug {
params = append(params, clhDebugKernelParams...) params = append(params, clhDebugKernelParams...)
} else {
// start the guest kernel with 'quiet' in non-debug mode
params = append(params, Param{"quiet", ""})
} }
// Followed by extra kernel parameters defined in the configuration file // Followed by extra kernel parameters defined in the configuration file
@ -285,11 +288,12 @@ func (clh *cloudHypervisor) createSandbox(ctx context.Context, id string, networ
clh.vmconfig.Pmem = &[]chclient.PmemConfig{*pmem} 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 { if clh.config.Debug {
clh.vmconfig.Serial = chclient.NewConsoleConfig(cctTTY) clh.vmconfig.Serial = chclient.NewConsoleConfig(cctTTY)
} else { } else {
clh.vmconfig.Serial = chclient.NewConsoleConfig(cctNULL) clh.vmconfig.Serial = chclient.NewConsoleConfig(cctOFF)
} }
clh.vmconfig.Console = chclient.NewConsoleConfig(cctOFF) clh.vmconfig.Console = chclient.NewConsoleConfig(cctOFF)
@ -988,9 +992,8 @@ func (clh *cloudHypervisor) launchClh() (int, error) {
//########################################################################### //###########################################################################
const ( const (
cctOFF string = "Off" cctOFF string = "Off"
cctNULL string = "Null" cctTTY string = "Tty"
cctTTY string = "Tty"
) )
const ( const (