From 2e205f46eeb17de2a3abcf2111b9c33ef5bda4d2 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 30 Sep 2020 09:20:52 +0200 Subject: SPEC-3597: Add video device to qemu arm/arm64 We need to add video device to qemu ARM/ARM64. Both arm and arm64 use the virt qemu machine which dont have any video device. But since they have both a PCI bus, we could add a VGA device. Along with the VGA device, let's add some input peripheral for all qemu. Bug-AGL: SPEC-3597 Change-Id: Ic2cee663145abf0b668ca166f40f46318e526bc7 Signed-off-by: Corentin LABBE --- templates/machines/qemuarm.jinja2 | 2 +- templates/machines/qemuarm64.jinja2 | 2 +- templates/machines/qemux86-64.jinja2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/machines/qemuarm.jinja2 b/templates/machines/qemuarm.jinja2 index 16476ba..624986a 100644 --- a/templates/machines/qemuarm.jinja2 +++ b/templates/machines/qemuarm.jinja2 @@ -9,7 +9,7 @@ {%- set qemu_cpu = "cortex-a15" %} {%- set qemu_machine = "virt-2.11" %} {%- set qemu_memory = "2048" %} -{%- set qemu_args = "-soundhw hda -device usb-ehci -device virtio-rng-pci" %} +{%- set qemu_args = "-soundhw hda -device usb-ehci -device virtio-rng-pci -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd" %} {%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false " %} {%- set guestfs_interface = "virtio" %} {%- set rootfs_type = rootfs_type|default("rootvd") %} diff --git a/templates/machines/qemuarm64.jinja2 b/templates/machines/qemuarm64.jinja2 index eaa6ed2..0e280eb 100644 --- a/templates/machines/qemuarm64.jinja2 +++ b/templates/machines/qemuarm64.jinja2 @@ -9,7 +9,7 @@ {%- set qemu_cpu = "cortex-a57" %} {%- set qemu_machine = "virt" %} {%- set qemu_memory = "2048" %} -{%- set qemu_args = "-smp 2 -soundhw hda -device usb-ehci -device virtio-rng-pci" %} +{%- set qemu_args = "-smp 2 -soundhw hda -device usb-ehci -device virtio-rng-pci -device VGA,vgamem_mb=64,edid=on -device qemu-xhci -device usb-tablet -device usb-kbd " %} {%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false " %} {%- set guestfs_interface = "virtio" %} {%- set rootfs_type = rootfs_type|default("rootvd") %} diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2 index 5641172..fc4609d 100644 --- a/templates/machines/qemux86-64.jinja2 +++ b/templates/machines/qemux86-64.jinja2 @@ -6,7 +6,7 @@ {%- set sdk_arch = "x86-64" %} {%- set device_mach = "x86" %} {%- set qemu_arch = "x86_64" %} -{%- set qemu_args = "-machine q35 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci -device virtio-rng-pci -vga virtio" %} +{%- set qemu_args = "-machine q35 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci -device virtio-rng-pci -vga virtio -device qemu-xhci -device usb-tablet -device usb-kbd " %} {%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/sda verbose systemd.log_color=false rw fstab=no no_timer_check" %} {%- set rootfs_type = rootfs_type|default("rootvd") %} {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %} -- cgit 1.2.3-korg