mantle/qemu: default to -serial mon:stdio if not redirecting

jlebon · openshift-merge-robot · commit dbf3e60b92dd · 2020-09-23T23:05:06.000Z
This restores access to the monitor via `Ctrl-A C` and allows passing through `Ctrl-C` to the guest as before. This used to be what QEMU did by default, but when we added an explicit QMP socket in #1705 it disabled that sugar. Closes: #1725
diff --git a/mantle/platform/qemu.go b/mantle/platform/qemu.go
@@ -1307,6 +1307,8 @@ func (builder *QemuBuilder) Exec() (*QemuInstance, error) {
 
 	if builder.ConsoleFile != "" {
 		builder.Append("-display", "none", "-chardev", "file,id=log,path="+builder.ConsoleFile, "-serial", "chardev:log")
+	} else {
+		builder.Append("-serial", "mon:stdio")
 	}
 
 	// And the custom arguments

Original file line number	Diff line number	Diff line change
`@@ -1307,6 +1307,8 @@ func (builder QemuBuilder) Exec() (QemuInstance, error) {`
`1307`	`1307`
`1308`	`1308`	`if builder.ConsoleFile != "" {`
`1309`	`1309`	`builder.Append("-display", "none", "-chardev", "file,id=log,path="+builder.ConsoleFile, "-serial", "chardev:log")`
	`1310`	`+ } else {`
	`1311`	`+ builder.Append("-serial", "mon:stdio")`
`1310`	`1312`	`}`
`1311`	`1313`
`1312`	`1314`	`// And the custom arguments`