summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-08-30 14:49:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-01 22:33:07 +0100
commit58e85c60cd15cf4c0b47cddcf507543461c1a328 (patch)
tree53845c5922cf2e8bceaccf34240844ebd48410e3 /scripts
parent6883a667962c130b3d130671dabf47f1554922af (diff)
downloadpoky-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 'scripts')
-rwxr-xr-xscripts/runqemu6
1 files changed, 0 insertions, 6 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 7705b2b60e..b520010624 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -145,8 +145,6 @@ class BaseConfig(object):
145 # to be added with -drive if=pflash. 145 # to be added with -drive if=pflash.
146 # Found in the same places as the rootfs, with or without one of 146 # Found in the same places as the rootfs, with or without one of
147 # these suffices: qcow2, bin. 147 # these suffices: qcow2, bin.
148 # Setting one also adds "-vga std" because that is all that
149 # OVMF supports.
150 self.ovmf_bios = [] 148 self.ovmf_bios = []
151 # When enrolling default Secure Boot keys, the hypervisor 149 # When enrolling default Secure Boot keys, the hypervisor
152 # must provide the Platform Key and the first Key Exchange Key 150 # must provide the Platform Key and the first Key Exchange Key
@@ -1283,10 +1281,6 @@ class BaseConfig(object):
1283 for ovmf in self.ovmf_bios: 1281 for ovmf in self.ovmf_bios:
1284 format = ovmf.rsplit('.', 1)[-1] 1282 format = ovmf.rsplit('.', 1)[-1]
1285 self.qemu_opt += ' -drive if=pflash,format=%s,file=%s' % (format, ovmf) 1283 self.qemu_opt += ' -drive if=pflash,format=%s,file=%s' % (format, ovmf)
1286 if self.ovmf_bios:
1287 # OVMF only supports normal VGA, i.e. we need to override a -vga vmware
1288 # that gets added for example for normal qemux86.
1289 self.qemu_opt += ' -vga std'
1290 1284
1291 self.qemu_opt += ' ' + self.qemu_opt_script 1285 self.qemu_opt += ' ' + self.qemu_opt_script
1292 1286