From 8a38fa735933071af2f1986784783a90e61af998 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Wed, 9 Aug 2017 21:43:35 -0700 Subject: [PATCH] qemu: Move from pc-lite to pc machine type This patch modifies the default configuration provided through the Makefile so that our runtime will use "pc" machine type for our Qemu hypervisor. This change implies that we have to use vmlinuz which is the compressed kernel expected by the BIOS run by "pc" machine type. Fixes #329 Signed-off-by: Sebastien Boeuf --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b803486b..a77e2036 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ PKGLIBDIR := $(LOCALSTATEDIR)/lib/$(CCDIR) PKGRUNDIR := $(LOCALSTATEDIR)/run/$(CCDIR) PKGLIBEXECDIR := $(LIBEXECDIR)/$(CCDIR) -KERNELPATH := $(PKGDATADIR)/vmlinux.container +KERNELPATH := $(PKGDATADIR)/vmlinuz.container IMAGEPATH := $(PKGDATADIR)/clear-containers.img KERNELPARAMS := @@ -81,7 +81,7 @@ QEMUCMD := qemu-lite-system-x86_64 endif QEMUPATH := $(QEMUBINDIR)/$(QEMUCMD) -MACHINETYPE := pc-lite +MACHINETYPE := pc SHIMCMD := cc-shim SHIMPATH := $(PKGLIBEXECDIR)/$(SHIMCMD)