From 2fe79675ed9af06daf8ccd62e97d687264dfdf12 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@burtonini.com>
Date: Thu, 7 Apr 2022 17:09:21 +0100
Subject: [PATCH] qemuarm64-secureboot: disable the use of KVM

When using -machine=virt,secure=on KVM cannot be used and will cause an
error, so forcibly disable the use of KVM.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/conf/machine/qemuarm64-secureboot.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-arm/conf/machine/qemuarm64-secureboot.conf b/meta-arm/conf/machine/qemuarm64-secureboot.conf
index 99d92e07..22fb1d3e 100644
--- a/meta-arm/conf/machine/qemuarm64-secureboot.conf
+++ b/meta-arm/conf/machine/qemuarm64-secureboot.conf
@@ -4,6 +4,9 @@ require ${COREBASE}/meta/conf/machine/qemuarm64.conf
 
 KMACHINE = "qemuarm64"
 
+# secure=on can't ever use KVM, so force it off
+QEMU_USE_KVM = ""
+
 QB_MACHINE = "-machine virt,secure=on"
 QB_OPT_APPEND += "-no-acpi"
 QB_MEM = "-m 1024"