diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2020-03-05 11:16:59 +0100 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2020-03-05 11:16:59 +0100 |
| commit | 81ddb3e9232628a722a4eb6ef45ca1fd8002dfc5 (patch) | |
| tree | 3d4397ffc64fd3a8c4424179f8662d53c6a8587e | |
| parent | d7b7365934013d0a43367987012e08bed2970d9a (diff) | |
SPEC-3210: Set the interface for the test device
By default LAVA set the test device on IDE.
Stretch version of qemu doesnt care about this setting and was always
using virtio.
But buster qemu care now about this and fail with:
machine type does not support if=ide,bus=0,unit=0
This patch adds the necessary to restore the use of virtio.
Change-Id: If34194d82b6104b9b5be7118a5194bd3b61fc090
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
| -rw-r--r-- | templates/boot/generic-qemu-tmpfs.jinja2 | 3 | ||||
| -rw-r--r-- | templates/machines/qemuarm.jinja2 | 1 | ||||
| -rw-r--r-- | templates/machines/qemuarm64.jinja2 | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/templates/boot/generic-qemu-tmpfs.jinja2 b/templates/boot/generic-qemu-tmpfs.jinja2 index f8cbd7d..e39802d 100644 --- a/templates/boot/generic-qemu-tmpfs.jinja2 +++ b/templates/boot/generic-qemu-tmpfs.jinja2 @@ -21,6 +21,9 @@ context: {%- if qemu_memory is defined %} memory: {{ qemu_memory }} {%- endif %} +{%- if guestfs_interface is defined %} + guestfs_interface: {{ guestfs_interface }} +{%- endif %} extra_options: ["{{ qemu_args }}"] {% endblock %} {%- block deploy -%} diff --git a/templates/machines/qemuarm.jinja2 b/templates/machines/qemuarm.jinja2 index b04915e..3949f48 100644 --- a/templates/machines/qemuarm.jinja2 +++ b/templates/machines/qemuarm.jinja2 @@ -11,6 +11,7 @@ {%- set qemu_memory = "2048" %} {%- set qemu_args = "-soundhw hda -device usb-ehci -device virtio-rng-pci" %} {%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false " %} +{%- set guestfs_interface = "virtio" %} {%- set rootfs_type = rootfs_type|default("ramdisk") %} {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %} {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemuarm.ext4.xz") %} diff --git a/templates/machines/qemuarm64.jinja2 b/templates/machines/qemuarm64.jinja2 index 60e9a6c..0ef5a78 100644 --- a/templates/machines/qemuarm64.jinja2 +++ b/templates/machines/qemuarm64.jinja2 @@ -11,6 +11,7 @@ {%- set qemu_memory = "2048" %} {%- set qemu_args = "-smp 2 -soundhw hda -device usb-ehci -device virtio-rng-pci" %} {%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false " %} +{%- set guestfs_interface = "virtio" %} {%- set rootfs_type = rootfs_type|default("ramdisk") %} {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %} {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemuarm64.ext4.xz") %} |