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

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 .../qemu_2.6.0.x86_64.xml                     |   4 +-
 tests/domaincapstest.c                        |   2 +-
 .../caps_2.6.0.x86_64.replies                 | 100 +++++++++++++++++-
 .../caps_2.6.0.x86_64.xml                     |  30 +++++-
 4 files changed, 130 insertions(+), 6 deletions(-)

diff --git a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
index 33c6eda78e..a8975e8e53 100644
--- a/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml
@@ -1,6 +1,6 @@
 <domainCapabilities>
   <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
+  <domain>kvm</domain>
   <machine>pc-i440fx-2.6</machine>
   <arch>x86_64</arch>
   <vcpu max='255'/>
@@ -19,7 +19,7 @@
     </loader>
   </os>
   <cpu>
-    <mode name='host-passthrough' supported='no'/>
+    <mode name='host-passthrough' supported='yes'/>
     <mode name='host-model' supported='yes'>
       <model fallback='allow'>Broadwell</model>
     </mode>
diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index 2ff489c904..9a55d55571 100644
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -417,7 +417,7 @@ mymain(void)
 
     DO_TEST_QEMU("2.6.0", "caps_2.6.0",
                  "/usr/bin/qemu-system-x86_64", NULL,
-                 "x86_64", VIR_DOMAIN_VIRT_QEMU);
+                 "x86_64", VIR_DOMAIN_VIRT_KVM);
 
     DO_TEST_QEMU("2.6.0", "caps_2.6.0-gicv2",
                  "/usr/bin/qemu-system-aarch64", NULL,
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 89a87073df..0c285cd951 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -457,7 +457,7 @@
 
 {
   "return": {
-    "fd": 14,
+    "fd": 15,
     "fdset-id": 0
   },
   "id": "libvirt-5"
@@ -473,7 +473,7 @@
 
 {
   "return": {
-    "enabled": false,
+    "enabled": true,
     "present": true
   },
   "id": "libvirt-7"
@@ -12714,3 +12714,99 @@
   ],
   "id": "libvirt-47"
 }
+
+{
+  "return": {
+  },
+  "id": "libvirt-1"
+}
+
+{
+  "return": [
+    {
+      "name": "Opteron_G5"
+    },
+    {
+      "name": "Opteron_G4"
+    },
+    {
+      "name": "Opteron_G3"
+    },
+    {
+      "name": "Opteron_G2"
+    },
+    {
+      "name": "Opteron_G1"
+    },
+    {
+      "name": "Broadwell"
+    },
+    {
+      "name": "Broadwell-noTSX"
+    },
+    {
+      "name": "Haswell"
+    },
+    {
+      "name": "Haswell-noTSX"
+    },
+    {
+      "name": "IvyBridge"
+    },
+    {
+      "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_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index ae69ef68f4..71ffa0083c 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.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'/>
@@ -201,6 +201,34 @@
   <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='Broadwell'/>
+  <cpu type='kvm' name='Broadwell-noTSX'/>
+  <cpu type='kvm' name='Haswell'/>
+  <cpu type='kvm' name='Haswell-noTSX'/>
+  <cpu type='kvm' name='IvyBridge'/>
+  <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'/>