aboutsummaryrefslogtreecommitdiffstats
path: root/templates/boot
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2019-05-23 10:32:17 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-05-24 15:45:03 +0000
commit0ce02f3d03318c9260d545682ab40dc381fbf614 (patch)
tree664437dd6d800331d37ca7a6143b80d770dd0101 /templates/boot
parent1bff41e945dccf2a7e52f7c776fbee5c6e4085b9 (diff)
generic-qemu-tmpfs: add qemu_cpu and qemu_machine
LAVA expect machine, memory and cpu to be passed as argument in context and not via extra args. This patchs introduce qemu_cpu, qemu_memory and qemu_machine as jinja variables. Change-Id: I8893943947a046f90be388febccfc29c7923d5b4 Bug-AGL: SPEC-2376 Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
Diffstat (limited to 'templates/boot')
-rw-r--r--templates/boot/generic-qemu-tmpfs.jinja29
1 files changed, 9 insertions, 0 deletions
diff --git a/templates/boot/generic-qemu-tmpfs.jinja2 b/templates/boot/generic-qemu-tmpfs.jinja2
index d981f46..f8cbd7d 100644
--- a/templates/boot/generic-qemu-tmpfs.jinja2
+++ b/templates/boot/generic-qemu-tmpfs.jinja2
@@ -12,6 +12,15 @@
context:
no_kvm: false
arch: {{ qemu_arch }}
+{%- if qemu_cpu is defined %}
+ cpu: {{ qemu_cpu }}
+{%- endif %}
+{%- if qemu_machine is defined %}
+ machine: {{ qemu_machine }}
+{%- endif %}
+{%- if qemu_memory is defined %}
+ memory: {{ qemu_memory }}
+{%- endif %}
extra_options: ["{{ qemu_args }}"]
{% endblock %}
{%- block deploy -%}