diff options
| author |   Trevor Gamblin <trevor.gamblin@windriver.com> | 2020-05-28 16:06:45 -0700 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-06-01 07:02:44 -1000 |
| commit | e2658a7d73b6f21939e644e533718cd05b288766 (patch) | |
| tree | c7936b465a61fd28fccd94d22a753350e1559be1 | |
| parent | ec58532ab6fc6343144da67789c928c751d36c06 (diff) | |
| download | openembedded-core-e2658a7d73b6f21939e644e533718cd05b288766.tar.gz | |
qemuarm: check serial consoles vs /proc/consoles
Note that this patch affects qemuarm AND qemuarm64.
When booting a VM and during operation, the following message
periodically appears:
INIT: Id "hvc0" respawning too fast: disabled for 5 minutes
This is because hvc0 is specified in SERIAL_CONSOLES in qemuarm.conf
and qemuarm64.conf, but it is not in /proc/consoles and
SERIAL_CONSOLES_CHECK is not specified, leaving getty to attempt to
enable hvc0. Add SERIAL_CONSOLES_CHECK to both conf files so that
hvc0 isn't enabled if it hasn't been set there or in local.conf.
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 982b7f98b8423236cc986346379b1bde3694f131)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/conf/machine/qemuarm.conf | 1 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm64.conf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 367fcef019..4e605d3a92 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -8,6 +8,7 @@ require conf/machine/include/qemu.inc KERNEL_IMAGETYPE = "zImage" SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # For runqemu QB_SYSTEM_NAME = "qemu-system-arm" diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index 1e2d4f018d..2cf1a0206c 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -8,6 +8,7 @@ require conf/machine/include/qemu.inc KERNEL_IMAGETYPE = "Image" SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" +SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" # For runqemu QB_SYSTEM_NAME = "qemu-system-aarch64" |