From 34c6269457b8075f2951c37ca2a1901bd71379ea Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 8 Jan 2018 14:27:47 +0100 Subject: qemu: Some arch does not have kvm Since some arch does not have kvm, remove kvm usage for qemu. We will reintroduce it later via a flag/autodetect. --- docker-compose.template | 5 +++-- lavalab-gen.py | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker-compose.template b/docker-compose.template index b88ed85..62ed120 100644 --- a/docker-compose.template +++ b/docker-compose.template @@ -7,8 +7,9 @@ services: tty: true build: context: lava-master - devices: - - "/dev/kvm:/dev/kvm" +# TODO handle kvm option +# devices: +# - "/dev/kvm:/dev/kvm" ports: - "10080:80" - "5555:5555" diff --git a/lavalab-gen.py b/lavalab-gen.py index a584a1f..64a4b0b 100755 --- a/lavalab-gen.py +++ b/lavalab-gen.py @@ -78,6 +78,9 @@ def main(args): if not os.path.isdir("lava-slave/conmux/"): os.mkdir("lava-slave/conmux/") + # board specific hacks + if devicetype == "qemu": + device_line += "{% set no_kvm = True %}\n" if not os.path.isdir("lava-master/devices/"): os.mkdir("lava-master/devices/") device_path = "lava-master/devices/%s" % lab_name -- cgit 1.2.3-korg