From d23d057ac74aa3344862c362d140f88fd639c997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 25 Oct 2024 10:52:18 +0200 Subject: [PATCH] runtime: Enable measured rootfs for qemu-coco-dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's make sure we are prepared to test this with non-TEE environments as well. Signed-off-by: Fabiano Fidêncio --- src/runtime/Makefile | 2 ++ src/runtime/config/configuration-qemu-coco-dev.toml.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/runtime/Makefile b/src/runtime/Makefile index c941272c3f..afe0ea0ab6 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -152,6 +152,7 @@ SNPCERTSPATH := /opt/snp/cert_chain.cert ROOTMEASURECONFIG ?= "" KERNELTDXPARAMS += $(ROOTMEASURECONFIG) +KERNELQEMUCOCODEVPARAMS += $(ROOTMEASURECONFIG) # Name of default configuration file the runtime will use. CONFIG_FILE = configuration.toml @@ -645,6 +646,7 @@ USER_VARS += DEFMACHINETYPE_CLH USER_VARS += DEFMACHINETYPE_STRATOVIRT USER_VARS += KERNELPARAMS USER_VARS += KERNELTDXPARAMS +USER_VARS += KERNELQEMUCOCODEVPARAMS USER_VARS += LIBEXECDIR USER_VARS += LOCALSTATEDIR USER_VARS += PKGDATADIR diff --git a/src/runtime/config/configuration-qemu-coco-dev.toml.in b/src/runtime/config/configuration-qemu-coco-dev.toml.in index 2373aabaa6..4b94ed61d4 100644 --- a/src/runtime/config/configuration-qemu-coco-dev.toml.in +++ b/src/runtime/config/configuration-qemu-coco-dev.toml.in @@ -73,7 +73,7 @@ valid_hypervisor_paths = @QEMUVALIDHYPERVISORPATHS@ # may stop the virtual machine from booting. # To see the list of default parameters, enable hypervisor debug, create a # container and look for 'default-kernel-parameters' log entries. -kernel_params = "@KERNELPARAMS@" +kernel_params = "@KERNELQEMUCOCODEVPARAMS@" # Path to the firmware. # If you want that qemu uses the default firmware leave this option empty