From 59233221e1b23bd270bd9cc78f21635bb6ea7d9e Mon Sep 17 00:00:00 2001
From: Jeremy Linton <jeremy.linton@arm.com>
Date: Fri, 11 Sep 2020 11:32:26 -0500
Subject: [PATCH 2/2] aarch64: Less strict CPU checking for armv7 guests on
 aarch64

Current versions of qemu/libvirt on f33 don't appear to allow armv7
guests to start with strict cpu checking on armv8/aarch64 host
OSs. Lossen up the host-passthrough checking.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
 oz/Guest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oz/Guest.py b/oz/Guest.py
index a648e9a..701d2c4 100644
--- a/oz/Guest.py
+++ b/oz/Guest.py
@@ -483,7 +483,7 @@ class Guest(object):
         # CPU
         if self.tdl.arch in ["aarch64", "armv7l"] and self.libvirt_type == "kvm":
             # Possibly related to RHBZ 1171501 - need host passthrough for aarch64 and arm with kvm
-            cpu = oz.ozutil.lxml_subelement(domain, "cpu", None, {'mode': 'custom', 'match': 'exact'})
+            cpu = oz.ozutil.lxml_subelement(domain, "cpu", None, {'mode': 'host-passthrough', 'check': 'none'})
             oz.ozutil.lxml_subelement(cpu, "model", "host", {'fallback': 'allow'})
         # os
         osNode = oz.ozutil.lxml_subelement(domain, "os")
-- 
2.26.2