You're duplicating nographic elif On Mon, Jan 14, 2019 at 4:06 PM Alexander Kanavin <alex.kana...@gmail.com> wrote:
> Also, do not hardcode -vga option to qemu, set it according to command > line parameters. > > Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> > --- > meta/conf/machine/include/qemuboot-x86.inc | 2 +- > scripts/runqemu | 11 +++++++++++ > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/meta/conf/machine/include/qemuboot-x86.inc > b/meta/conf/machine/include/qemuboot-x86.inc > index 5fdbe4df50e..574b7bbfc7d 100644 > --- a/meta/conf/machine/include/qemuboot-x86.inc > +++ b/meta/conf/machine/include/qemuboot-x86.inc > @@ -11,7 +11,7 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" > QB_AUDIO_DRV = "alsa" > QB_AUDIO_OPT = "-soundhw ac97,es1370" > QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=${UVESA_MODE} > oprofile.timer=1 uvesafb.task_timeout=-1" > -QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet" > +QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" > # Add the 'virtio-rng-pci' device otherwise the guest may run out of > entropy > QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 > -device virtio-rng-pci,rng=rng0" > > diff --git a/scripts/runqemu b/scripts/runqemu > index c4a0ca811d9..fa88dc4583c 100755 > --- a/scripts/runqemu > +++ b/scripts/runqemu > @@ -74,6 +74,8 @@ of the following environment variables (in any order): > MACHINE - the machine name (optional, autodetected from KERNEL filename > if unspecified) > Simplified QEMU command-line options can be passed with: > nographic - disable video console > + gl - enable virgl-based GL acceleration > + gl-es - enable virgl-based GL acceleration, using OpenGL ES > serial - enable a serial console on /dev/ttyS0 > serialstdio - enable a serial console on the console (regardless of > graphics mode) > slirp - enable user networking, no root privileges is required > @@ -427,12 +429,21 @@ class BaseConfig(object): > sys.argv.remove(quiet) > > unknown_arg = "" > + if 'gl' not in sys.argv[1:] and 'gl-es' not in sys.argv[1:]: > + self.qemu_opt_script += ' -vga vmware' > for arg in sys.argv[1:]: > if arg in self.fstypes + self.vmtypes: > self.check_arg_fstype(arg) > elif arg == 'nographic': > self.qemu_opt_script += ' -nographic' > self.kernel_cmdline_script += ' console=ttyS0' > + elif arg == 'gl': > + self.qemu_opt_script += ' -vga virtio -display gtk,gl=on' > + elif arg == 'gl-es': > + self.qemu_opt_script += ' -vga virtio -display gtk,gl=es' > + elif arg == 'nographic': > + self.qemu_opt_script += ' -nographic' > + self.kernel_cmdline_script += ' console=ttyS0' > elif arg == 'serial': > self.kernel_cmdline_script += ' console=ttyS0' > self.serialconsole = True > -- > 2.17.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core >
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core