From 96b8aa4226544131cb37e55053daf8c20ba096ad Mon Sep 17 00:00:00 2001
From: Michel Thebeau <michel.thebeau@windriver.com>
Date: Tue, 18 Sep 2018 16:00:18 -0400
Subject: [PATCH] deployment: libvirt: update machine type/model for all-in-one

Refer also to commit 7abcd94a, which applies the change to
controller.xml

Tests should run on a comparably newer model of CPU and should be fixed
for all tests under virtualization.

Nehalem cpu model is recommended as one that has been used for this
purpose for a few years.

Specifying 'forbid' for fallback and 'exact' for mode will ensure that
hosts the Qemu emulator is up-to-date on the host, capable of emulating
the expect model.  The consistency will make test results reliable
across host machines.

The newer machine type supports ACPI for example.

The feature "vmx" is required on computes to support nesting.

Related-Bug: #1793214

Change-Id: Ib3e72d8c9fc528978358a7054b337672284f2908
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
---
 deployment/libvirt/controller_allinone.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployment/libvirt/controller_allinone.xml b/deployment/libvirt/controller_allinone.xml
index fd0ff0a3..da9e9761 100644
--- a/deployment/libvirt/controller_allinone.xml
+++ b/deployment/libvirt/controller_allinone.xml
@@ -7,17 +7,17 @@
     <partition>/machine</partition>
   </resource>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-xenial'>hvm</type>
+    <type arch='x86_64' machine='pc-q35-xenial'>hvm</type>
   </os>
   <features>
     <acpi/>
     <apic/>
     <pae/>
   </features>
-  <cpu mode='host-model'>
-    <model fallback='allow'/>
+  <cpu match='exact'>
+    <model fallback='forbid'>Nehalem</model>
     <topology sockets='1' cores='4' threads='1'/>
-    <feature policy='optional' name='vmx'/>
+    <feature policy='require' name='vmx'/>
     <feature policy='optional' name='svm'/>
   </cpu>
   <clock offset='utc'/>