diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-08-30 14:49:48 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-01 22:33:07 +0100 |
| commit | 58e85c60cd15cf4c0b47cddcf507543461c1a328 (patch) | |
| tree | 53845c5922cf2e8bceaccf34240844ebd48410e3 /meta/conf/machine/include | |
| parent | 6883a667962c130b3d130671dabf47f1554922af (diff) | |
| download | poky-58e85c60cd15cf4c0b47cddcf507543461c1a328.tar.gz | |
qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
This is the qemu default since qemu 2.2, is generally supported better,
and is recommended by upstream. It also has already been in use for arm/risc
and ovmf.
Additional information:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13466
https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
'-vga virtio' emulated hardware remains in use when virgl is enabled via a runqemu override.
Also, adjust the error whitelist, as there is a number of new messages
coming from the drivers that are not actual errors.
(From OE-Core rev: 73cb104f3307736f4922f2e0c9648f9b2d3b3b6b)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include')
| -rw-r--r-- | meta/conf/machine/include/qemuboot-mips.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index 1c2b532b48..978820a2e0 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc | |||
| @@ -2,6 +2,6 @@ | |||
| 2 | IMAGE_CLASSES += "qemuboot" | 2 | IMAGE_CLASSES += "qemuboot" |
| 3 | QB_MACHINE = "-machine malta" | 3 | QB_MACHINE = "-machine malta" |
| 4 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" | 4 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" |
| 5 | QB_OPT_APPEND = "-vga cirrus -show-cursor -usb -device usb-tablet" | 5 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" |
| 6 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 6 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
| 7 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 7 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 3931b0f0fb..495418fa04 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc | |||
| @@ -9,7 +9,7 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" | |||
| 9 | QB_AUDIO_DRV = "alsa" | 9 | QB_AUDIO_DRV = "alsa" |
| 10 | QB_AUDIO_OPT = "-soundhw ac97,es1370" | 10 | QB_AUDIO_OPT = "-soundhw ac97,es1370" |
| 11 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" | 11 | QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} oprofile.timer=1 uvesafb.task_timeout=-1" |
| 12 | QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet" | 12 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" |
| 13 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 13 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
| 14 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 14 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
| 15 | 15 | ||