From 7abcd94a7b0bab49568caacf8912435097657050 Mon Sep 17 00:00:00 2001
From: Michel Thebeau <michel.thebeau@windriver.com>
Date: Thu, 6 Sep 2018 17:23:32 -0400
Subject: [PATCH] deployment: libvirt: update machine type and model

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: #1790716

Change-Id: Ib338501b4805532a9d1ebaf55735f9084bfa8e96
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
---
 deployment/libvirt/compute.xml    | 8 ++++----
 deployment/libvirt/controller.xml | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deployment/libvirt/compute.xml b/deployment/libvirt/compute.xml
index 19e052ad..d1f92913 100644
--- a/deployment/libvirt/compute.xml
+++ b/deployment/libvirt/compute.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'/>
diff --git a/deployment/libvirt/controller.xml b/deployment/libvirt/controller.xml
index ed54d36d..bf056d32 100644
--- a/deployment/libvirt/controller.xml
+++ b/deployment/libvirt/controller.xml
@@ -7,15 +7,15 @@
     <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='optional' name='svm'/>