Merge pull request #393 from Microsoft/no_serial

jterry75 · web-flow · commit 113ee11be1e5 · 2018-11-28T15:36:09.000-08:00
Skip uart enumeration on production boot
diff --git a/internal/uvm/create.go b/internal/uvm/create.go
@@ -394,9 +394,11 @@ func Create(opts *UVMOptions) (_ *UtilityVM, err error) {
 			vm.Devices.VideoMonitor = &hcsschema.VideoMonitor{}
 		}
 
-		if !vmDebugging {
+		if vmDebugging {
+			kernelArgs += " 8250_core.nr_uarts=1 8250_core.skip_txen_test=1"
+		} else {
 			// Terminate the VM if there is a kernel panic.
-			kernelArgs += " panic=-1"
+			kernelArgs += " panic=-1 8250_core.nr_uarts=0"
 		}
 
 		if opts.KernelBootOptions != "" {

Original file line number	Diff line number	Diff line change
`@@ -394,9 +394,11 @@ func Create(opts UVMOptions) (_ UtilityVM, err error) {`
`394`	`394`	`vm.Devices.VideoMonitor = &hcsschema.VideoMonitor{}`
`395`	`395`	`}`
`396`	`396`
`397`		`- if !vmDebugging {`
	`397`	`+ if vmDebugging {`
	`398`	`+ kernelArgs += " 8250_core.nr_uarts=1 8250_core.skip_txen_test=1"`
	`399`	`+ } else {`
`398`	`400`	`// Terminate the VM if there is a kernel panic.`
`399`		`- kernelArgs += " panic=-1"`
	`401`	`+ kernelArgs += " panic=-1 8250_core.nr_uarts=0"`
`400`	`402`	`}`
`401`	`403`
`402`	`404`	`if opts.KernelBootOptions != "" {`