From 1382662c1b655388bc65f7cb45c682eebcbf7f1c Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Wed, 16 May 2018 10:59:20 -0700 Subject: [PATCH] build: default to using qemu-lite-x86_64 Update the runtime to use qemu-lite by default. After a build this will be observed as the default in configuration.toml Fixes: #293 Depends-on: github.com/kata-containers/tests#308 Signed-off-by: Eric Ernst --- arch/amd64-options.mk | 2 +- versions.yaml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/amd64-options.mk b/arch/amd64-options.mk index 56126f248e..c2eb254c20 100644 --- a/arch/amd64-options.mk +++ b/arch/amd64-options.mk @@ -9,4 +9,4 @@ MACHINETYPE := pc KERNELPARAMS := MACHINEACCELERATORS := -QEMUCMD := qemu-system-x86_64 +QEMUCMD := qemu-lite-system-x86_64 diff --git a/versions.yaml b/versions.yaml index ab173d8633..7ff8085184 100644 --- a/versions.yaml +++ b/versions.yaml @@ -25,6 +25,7 @@ format: | commit: "" version: "" release: "" + branch: "" meta: : "" : "" @@ -45,7 +46,8 @@ format: | - A section MAY define a "meta" section to store additional information about a project or group. - - Each entry MUST specify ATLEAST one of "commit", "version" and "release". + - Each entry MUST specify ATLEAST one of "commit", "version", "release" + and "branch". - WARNING: Gotcha alert! Remember to double-quote all strings (except multi-line strings)! This avoids the possibility of a @@ -58,6 +60,12 @@ assets: hypervisor: description: "Component used to create virtual machines" + qemu-lite: + description: "lightweight VMM that uses KVM" + url: "https://github.com/kata-containers/qemu" + branch: "qemu-lite-2.11.0" + commit: "6ba2bfbee9a80bfd03605c5eb2ca743c8b68389e" + qemu: description: "VMM that uses KVM" url: "https://github.com/qemu/qemu"