[virt-tools-list] [virt-manager PATCH 1/4] tests: update kvm-x86_64-rhel7 capabilities

Pavel Hrdina phrdina at redhat.com
Thu Apr 11 13:36:49 UTC 2019


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 tests/capabilities-xml/kvm-x86_64-rhel7.xml | 107 +++++++++++---------
 1 file changed, 61 insertions(+), 46 deletions(-)

diff --git a/tests/capabilities-xml/kvm-x86_64-rhel7.xml b/tests/capabilities-xml/kvm-x86_64-rhel7.xml
index f9592b80..d1c72fa0 100644
--- a/tests/capabilities-xml/kvm-x86_64-rhel7.xml
+++ b/tests/capabilities-xml/kvm-x86_64-rhel7.xml
@@ -1,47 +1,50 @@
 <capabilities>
-  <!-- From libvirt-1.1.1-29 -->
 
   <host>
-    <uuid>b1517723-d556-41ee-8f77-ef18afe127d1</uuid>
+    <uuid>159a491e-8d68-439e-8d3f-7f7b3d417e4d</uuid>
     <cpu>
       <arch>x86_64</arch>
-      <model>qemu64</model>
-      <vendor>AMD</vendor>
+      <model>Skylake-Client-IBRS</model>
+      <vendor>Intel</vendor>
+      <microcode version='1'/>
       <topology sockets='8' cores='1' threads='1'/>
-      <feature name='fma4'/>
-      <feature name='xop'/>
-      <feature name='3dnowprefetch'/>
-      <feature name='misalignsse'/>
-      <feature name='sse4a'/>
-      <feature name='abm'/>
-      <feature name='lahf_lm'/>
-      <feature name='pdpe1gb'/>
-      <feature name='hypervisor'/>
-      <feature name='avx'/>
+      <feature name='ss'/>
+      <feature name='vmx'/>
       <feature name='osxsave'/>
-      <feature name='xsave'/>
-      <feature name='aes'/>
-      <feature name='popcnt'/>
-      <feature name='sse4.2'/>
-      <feature name='sse4.1'/>
-      <feature name='ssse3'/>
-      <feature name='pclmuldq'/>
+      <feature name='hypervisor'/>
+      <feature name='tsc_adjust'/>
+      <feature name='clflushopt'/>
+      <feature name='stibp'/>
+      <feature name='ssbd'/>
+      <feature name='xsaves'/>
+      <feature name='pdpe1gb'/>
+      <pages unit='KiB' size='4'/>
+      <pages unit='KiB' size='2048'/>
+      <pages unit='KiB' size='1048576'/>
     </cpu>
     <power_management>
       <suspend_mem/>
       <suspend_disk/>
       <suspend_hybrid/>
     </power_management>
+    <iommu support='no'/>
     <migration_features>
       <live/>
       <uri_transports>
         <uri_transport>tcp</uri_transport>
+        <uri_transport>rdma</uri_transport>
       </uri_transports>
     </migration_features>
     <topology>
       <cells num='1'>
         <cell id='0'>
-          <memory unit='KiB'>4193900</memory>
+          <memory unit='KiB'>4193772</memory>
+          <pages unit='KiB' size='4'>1048443</pages>
+          <pages unit='KiB' size='2048'>0</pages>
+          <pages unit='KiB' size='1048576'>0</pages>
+          <distances>
+            <sibling id='0' value='10'/>
+          </distances>
           <cpus num='8'>
             <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
             <cpu id='1' socket_id='1' core_id='0' siblings='1'/>
@@ -55,13 +58,27 @@
         </cell>
       </cells>
     </topology>
+    <cache>
+      <bank id='0' level='3' type='both' size='16' unit='MiB' cpus='0'/>
+      <bank id='1' level='3' type='both' size='16' unit='MiB' cpus='1'/>
+      <bank id='2' level='3' type='both' size='16' unit='MiB' cpus='2'/>
+      <bank id='3' level='3' type='both' size='16' unit='MiB' cpus='3'/>
+      <bank id='4' level='3' type='both' size='16' unit='MiB' cpus='4'/>
+      <bank id='5' level='3' type='both' size='16' unit='MiB' cpus='5'/>
+      <bank id='6' level='3' type='both' size='16' unit='MiB' cpus='6'/>
+      <bank id='7' level='3' type='both' size='16' unit='MiB' cpus='7'/>
+    </cache>
     <secmodel>
       <model>selinux</model>
       <doi>0</doi>
+      <baselabel type='kvm'>system_u:system_r:svirt_t:s0</baselabel>
+      <baselabel type='qemu'>system_u:system_r:svirt_tcg_t:s0</baselabel>
     </secmodel>
     <secmodel>
       <model>dac</model>
       <doi>0</doi>
+      <baselabel type='kvm'>+107:+107</baselabel>
+      <baselabel type='qemu'>+107:+107</baselabel>
     </secmodel>
   </host>
 
@@ -70,17 +87,16 @@
     <arch name='i686'>
       <wordsize>32</wordsize>
       <emulator>/usr/libexec/qemu-kvm</emulator>
-      <machine canonical='pc-i440fx-rhel7.0.0' maxCpus='255'>pc</machine>
-      <machine canonical='pc-q35-rhel7.0.0' maxCpus='255'>q35</machine>
-      <machine maxCpus='255'>rhel6.0.0</machine>
-      <machine maxCpus='255'>rhel6.1.0</machine>
-      <machine maxCpus='255'>rhel6.2.0</machine>
-      <machine maxCpus='255'>rhel6.3.0</machine>
-      <machine maxCpus='255'>rhel6.4.0</machine>
-      <machine maxCpus='255'>rhel6.5.0</machine>
-      <machine maxCpus='1'>none</machine>
-      <domain type='qemu'>
-      </domain>
+      <machine maxCpus='240'>pc-i440fx-rhel7.0.0</machine>
+      <machine canonical='pc-i440fx-rhel7.0.0' maxCpus='240'>pc</machine>
+      <machine maxCpus='240'>rhel6.0.0</machine>
+      <machine maxCpus='240'>rhel6.1.0</machine>
+      <machine maxCpus='240'>rhel6.2.0</machine>
+      <machine maxCpus='240'>rhel6.3.0</machine>
+      <machine maxCpus='240'>rhel6.4.0</machine>
+      <machine maxCpus='240'>rhel6.5.0</machine>
+      <machine maxCpus='240'>rhel6.6.0</machine>
+      <domain type='qemu'/>
       <domain type='kvm'>
         <emulator>/usr/libexec/qemu-kvm</emulator>
       </domain>
@@ -88,6 +104,7 @@
     <features>
       <cpuselection/>
       <deviceboot/>
+      <disksnapshot default='off' toggle='no'/>
       <acpi default='on' toggle='yes'/>
       <apic default='on' toggle='no'/>
       <pae/>
@@ -100,17 +117,16 @@
     <arch name='x86_64'>
       <wordsize>64</wordsize>
       <emulator>/usr/libexec/qemu-kvm</emulator>
-      <machine canonical='pc-i440fx-rhel7.0.0' maxCpus='255'>pc</machine>
-      <machine canonical='pc-q35-rhel7.0.0' maxCpus='255'>q35</machine>
-      <machine maxCpus='255'>rhel6.0.0</machine>
-      <machine maxCpus='255'>rhel6.1.0</machine>
-      <machine maxCpus='255'>rhel6.2.0</machine>
-      <machine maxCpus='255'>rhel6.3.0</machine>
-      <machine maxCpus='255'>rhel6.4.0</machine>
-      <machine maxCpus='255'>rhel6.5.0</machine>
-      <machine maxCpus='1'>none</machine>
-      <domain type='qemu'>
-      </domain>
+      <machine maxCpus='240'>pc-i440fx-rhel7.0.0</machine>
+      <machine canonical='pc-i440fx-rhel7.0.0' maxCpus='240'>pc</machine>
+      <machine maxCpus='240'>rhel6.0.0</machine>
+      <machine maxCpus='240'>rhel6.1.0</machine>
+      <machine maxCpus='240'>rhel6.2.0</machine>
+      <machine maxCpus='240'>rhel6.3.0</machine>
+      <machine maxCpus='240'>rhel6.4.0</machine>
+      <machine maxCpus='240'>rhel6.5.0</machine>
+      <machine maxCpus='240'>rhel6.6.0</machine>
+      <domain type='qemu'/>
       <domain type='kvm'>
         <emulator>/usr/libexec/qemu-kvm</emulator>
       </domain>
@@ -118,11 +134,10 @@
     <features>
       <cpuselection/>
       <deviceboot/>
+      <disksnapshot default='off' toggle='no'/>
       <acpi default='on' toggle='yes'/>
       <apic default='on' toggle='no'/>
     </features>
   </guest>
 
 </capabilities>
-
-
-- 
2.20.1




More information about the virt-tools-list mailing list