mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 00:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

runqemu: add QB_GRAPHICS

Browse Source 
Add a new runqemu field for VGA devices.  Currently, these are being set
in QB_OPT_APPEND, which can make them difficult to override if importing
the config file into another one.

(From OE-Core rev: 695c98b6522be4373806c154a2999eaeef205556)

Signed-off-by: Jon Mason <jon.mason@arm.com>
Change-Id: I8cb9527954c5b06c083c42fe2466cb3338584b7d
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jon Mason
2021-03-10 18:05:31 -05:00
committed by Richard Purdie
parent f4adaac783
commit bd0ada8994
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/qemuboot.bbclass
View File

@@ -72,6 +72,9 @@
# Can be used to automatically determine the image from the other variables # Can be used to automatically determine the image from the other variables
# but define things link 'bootindex' when booting from EFI or 'readonly' when using squashfs # but define things link 'bootindex' when booting from EFI or 'readonly' when using squashfs
# without the need to specify a dedicated qemu configuration # without the need to specify a dedicated qemu configuration
#
# QB_GRAPHICS: QEMU video card type (e.g. "-vga std")
#
# Usage: # Usage:
# IMAGE_CLASSES += "qemuboot" # IMAGE_CLASSES += "qemuboot"
# See "runqemu help" for more info # See "runqemu help" for more info
@@ -86,6 +89,7 @@ QB_NETWORK_DEVICE ?= "-device virtio-net-pci,netdev=net0,mac=@MAC@"
QB_CMDLINE_IP_SLIRP ?= "ip=dhcp" QB_CMDLINE_IP_SLIRP ?= "ip=dhcp"
QB_CMDLINE_IP_TAP ?= "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0" QB_CMDLINE_IP_TAP ?= "ip=192.168.7.@CLIENT@::192.168.7.@GATEWAY@:255.255.255.0"
QB_ROOTFS_EXTRA_OPT ?= "" QB_ROOTFS_EXTRA_OPT ?= ""
QB_GRAPHICS ?= ""
# This should be kept align with ROOT_VM # This should be kept align with ROOT_VM
QB_DRIVE_TYPE ?= "/dev/sd" QB_DRIVE_TYPE ?= "/dev/sd"

2
meta/conf/machine/include/qemuboot-mips.inc
View File

@@ -5,4 +5,4 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty"
QB_OPT_APPEND = "-usb -device usb-tablet" QB_OPT_APPEND = "-usb -device usb-tablet"
# For graphics to work we need to define the VGA device as well as the necessary USB devices # For graphics to work we need to define the VGA device as well as the necessary USB devices
QB_OPT_APPEND += "-vga std" QB_GRAPHICS = "-vga std"

4
meta/conf/machine/qemuarm.conf
View File

@@ -19,8 +19,8 @@ QB_CPU = "-cpu cortex-a15"
# Standard Serial console # Standard Serial console
QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0 vmalloc=256" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0 vmalloc=256"
# For graphics to work we need to define the VGA device as well as the necessary USB devices # For graphics to work we need to define the VGA device as well as the necessary USB devices
QB_OPT_APPEND = "-device VGA,edid=on" QB_GRAPHICS = "-device VGA,edid=on"
QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
# Virtio Networking support # Virtio Networking support
QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"

4
meta/conf/machine/qemuarm64.conf
View File

@@ -20,8 +20,8 @@ QB_CPU_KVM = "-cpu host -machine gic-version=3"
# Standard Serial console # Standard Serial console
QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0"
# For graphics to work we need to define the VGA device as well as the necessary USB devices # For graphics to work we need to define the VGA device as well as the necessary USB devices
QB_OPT_APPEND = "-device VGA,edid=on" QB_GRAPHICS = "-device VGA,edid=on"
QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd"
# Virtio Networking support # Virtio Networking support
QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@" QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"

2
scripts/runqemu
View File

@@ -1341,7 +1341,7 @@ class BaseConfig(object):
if not os.access(qemu_bin, os.X_OK): if not os.access(qemu_bin, os.X_OK):
raise OEPathError("No QEMU binary '%s' could be found" % qemu_bin) raise OEPathError("No QEMU binary '%s' could be found" % qemu_bin)
self.qemu_opt = "%s %s %s %s %s" % (qemu_bin, self.get('NETWORK_CMD'), self.get('QB_RNG'), self.get('ROOTFS_OPTIONS'), self.get('QB_OPT_APPEND')) self.qemu_opt = "%s %s %s %s %s %s" % (qemu_bin, self.get('NETWORK_CMD'), self.get('QB_RNG'), self.get('QB_GRAPHICS'), self.get('ROOTFS_OPTIONS'), self.get('QB_OPT_APPEND'))
for ovmf in self.ovmf_bios: for ovmf in self.ovmf_bios:
format = ovmf.rsplit('.', 1)[-1] format = ovmf.rsplit('.', 1)[-1]