From 58ed524966759fcf5058872fdc65401618f4ed85 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Fri, 18 Nov 2016 10:12:50 +0100
Subject: [PATCH] tests: Update capabilities for QEMU 1.4.2

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 .../caps_1.4.2.x86_64.replies                 | 88 ++++++++++++++++++-
 .../caps_1.4.2.x86_64.xml                     | 26 +++++-
 2 files changed, 111 insertions(+), 3 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
index f9eff8e90b..01c75f0d1e 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
@@ -313,7 +313,7 @@
 
 {
   "return": {
-    "fd": 12,
+    "fd": 14,
     "fdset-id": 0
   },
   "id": "libvirt-5"
@@ -329,7 +329,7 @@
 
 {
   "return": {
-    "enabled": false,
+    "enabled": true,
     "present": true
   },
   "id": "libvirt-7"
@@ -2137,3 +2137,87 @@
   ],
   "id": "libvirt-46"
 }
+
+{
+  "return": {
+  },
+  "id": "libvirt-1"
+}
+
+{
+  "return": [
+    {
+      "name": "Opteron_G5"
+    },
+    {
+      "name": "Opteron_G4"
+    },
+    {
+      "name": "Opteron_G3"
+    },
+    {
+      "name": "Opteron_G2"
+    },
+    {
+      "name": "Opteron_G1"
+    },
+    {
+      "name": "Haswell"
+    },
+    {
+      "name": "SandyBridge"
+    },
+    {
+      "name": "Westmere"
+    },
+    {
+      "name": "Nehalem"
+    },
+    {
+      "name": "Penryn"
+    },
+    {
+      "name": "Conroe"
+    },
+    {
+      "name": "n270"
+    },
+    {
+      "name": "athlon"
+    },
+    {
+      "name": "pentium3"
+    },
+    {
+      "name": "pentium2"
+    },
+    {
+      "name": "pentium"
+    },
+    {
+      "name": "486"
+    },
+    {
+      "name": "coreduo"
+    },
+    {
+      "name": "kvm32"
+    },
+    {
+      "name": "qemu32"
+    },
+    {
+      "name": "kvm64"
+    },
+    {
+      "name": "core2duo"
+    },
+    {
+      "name": "phenom"
+    },
+    {
+      "name": "qemu64"
+    }
+  ],
+  "id": "libvirt-2"
+}
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index 14b0a934b1..5b41244298 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
@@ -3,10 +3,10 @@
   <selfctime>0</selfctime>
   <selfvers>0</selfvers>
   <usedQMP/>
+  <flag name='kvm'/>
   <flag name='mem-path'/>
   <flag name='drive-serial'/>
   <flag name='chardev'/>
-  <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
   <flag name='netdev'/>
@@ -133,6 +133,30 @@
   <kvmVersion>0</kvmVersion>
   <package></package>
   <arch>x86_64</arch>
+  <cpu type='kvm' name='Opteron_G5'/>
+  <cpu type='kvm' name='Opteron_G4'/>
+  <cpu type='kvm' name='Opteron_G3'/>
+  <cpu type='kvm' name='Opteron_G2'/>
+  <cpu type='kvm' name='Opteron_G1'/>
+  <cpu type='kvm' name='Haswell'/>
+  <cpu type='kvm' name='SandyBridge'/>
+  <cpu type='kvm' name='Westmere'/>
+  <cpu type='kvm' name='Nehalem'/>
+  <cpu type='kvm' name='Penryn'/>
+  <cpu type='kvm' name='Conroe'/>
+  <cpu type='kvm' name='n270'/>
+  <cpu type='kvm' name='athlon'/>
+  <cpu type='kvm' name='pentium3'/>
+  <cpu type='kvm' name='pentium2'/>
+  <cpu type='kvm' name='pentium'/>
+  <cpu type='kvm' name='486'/>
+  <cpu type='kvm' name='coreduo'/>
+  <cpu type='kvm' name='kvm32'/>
+  <cpu type='kvm' name='qemu32'/>
+  <cpu type='kvm' name='kvm64'/>
+  <cpu type='kvm' name='core2duo'/>
+  <cpu type='kvm' name='phenom'/>
+  <cpu type='kvm' name='qemu64'/>
   <cpu type='tcg' name='Opteron_G5'/>
   <cpu type='tcg' name='Opteron_G4'/>
   <cpu type='tcg' name='Opteron_G3'/>
-- 
GitLab