From d6d5fe44510d2087b735758ac85e804533a1778c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 27 Oct 2021 22:18:29 +0200 Subject: runqemu: unbreak non-gl displays Correct two issues: 1. Looking for dri.pc is only needed when gl is enabled. 2. virtio-vga-gl works only when gl is enabled via -display, otherwise virtio-vga needs to be selected. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni --- scripts/runqemu | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 54f2336ba9..1143509975 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1349,9 +1349,14 @@ class BaseConfig(object): raise RunQemuError('Option gl/gl-es needs gtk or sdl option.') if self.sdl == True or self.gtk == True or self.egl_headless == True: - self.set_dri_path() - self.qemu_opt += ' -device virtio-vga-gl -display ' + if self.gl or self.gl_es or self.egl_headless: + self.qemu_opt += ' -device virtio-vga-gl ' + else: + self.qemu_opt += ' -device virtio-vga ' + + self.qemu_opt += '-display ' if self.egl_headless == True: + self.set_dri_path() self.qemu_opt += 'egl-headless,' else: if self.sdl == True: @@ -1360,8 +1365,10 @@ class BaseConfig(object): self.qemu_opt += 'gtk,' if self.gl == True: + self.set_dri_path() self.qemu_opt += 'gl=on,' elif self.gl_es == True: + self.set_dri_path() self.qemu_opt += 'gl=es,' self.qemu_opt += 'show-cursor=on' -- cgit 1.2.3-korg