From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 27 Oct 2021 20:18:29 +0000 (+0200)
Subject: runqemu: unbreak non-gl displays
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~6269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6d5fe44510d2087b735758ac85e804533a1778c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/scripts/runqemu b/scripts/runqemu
index 54f2336ba97..1143509975d 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'