[libvirt] [PATCH 3/3] qemu: Update x86_64 QEMU 3.1.0 capabilities

Regenerate the output from the QEMU v3.1.0 tag using ./configure --target-list=x86_64-softmmu \ --disable-strip \ --disable-fdt \ --disable-xen \ --disable-werror \ --enable-debug \ --enable-system \ --enable-user \ --enable-linux-user \ --with-pkgversion=v3.1.0 NB: I had to fudge in the qemu-sev-capabilities output from commit d4005609f3 (not sure if there's a specific package to allow it just from build). Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- .../caps_3.1.0.x86_64.replies | 93 +++++++++---------- .../caps_3.1.0.x86_64.xml | 28 +++--- 2 files changed, 62 insertions(+), 59 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies index 8c537cc763..21738552bd 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 92, - "minor": 0, + "micro": 0, + "minor": 1, "major": 3 }, - "package": "v3.1.0-rc2-48-g039d4e3df0" + "package": "v3.1.0" }, "id": "libvirt-2" } @@ -5686,7 +5686,6 @@ "avx512-vpopcntdq", "la57", "pconfig", - "ssbd", "wbnoinvd", "avx512f", "avx512f", @@ -5711,7 +5710,6 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "ssbd", "wbnoinvd", "pku" ], @@ -5803,7 +5801,6 @@ "pku", "", "avx512vnni", - "ssbd", "avx512f", "avx512f", "avx512f", @@ -19526,12 +19523,12 @@ "svm": false, "invtsc": false, "sse2": true, - "ssbd": false, + "ssbd": true, "est": false, "avx512ifma": false, "tm2": false, "kvm-pv-eoi": true, - "kvm-pv-ipi": false, + "kvm-pv-ipi": true, "cx8": true, "cldemote": false, "kvm-mmu": false, @@ -19539,7 +19536,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 94, + "model": 142, "movbe": true, "nrip-save": false, "ssse3": true, @@ -19552,7 +19549,7 @@ "cx16": true, "de": true, "pconfig": false, - "stepping": 3, + "stepping": 10, "xsave": true, "clflush": true, "skinit": false, @@ -19620,7 +19617,7 @@ "rdseed": true, "avx512-4vnniw": false, "vme": true, - "vmx": true, + "vmx": false, "dtes64": false, "mtrr": true, "rdtscp": true, @@ -19628,7 +19625,7 @@ "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -19730,12 +19727,12 @@ "svm": false, "invtsc": false, "sse2": true, - "ssbd": false, + "ssbd": true, "est": false, "avx512ifma": false, "tm2": false, "kvm-pv-eoi": true, - "kvm-pv-ipi": false, + "kvm-pv-ipi": true, "cx8": true, "cldemote": false, "kvm-mmu": false, @@ -19743,7 +19740,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 94, + "model": 142, "movbe": true, "nrip-save": false, "ssse3": true, @@ -19756,7 +19753,7 @@ "cx16": true, "de": true, "pconfig": false, - "stepping": 3, + "stepping": 10, "xsave": true, "clflush": true, "skinit": false, @@ -19824,7 +19821,7 @@ "rdseed": true, "avx512-4vnniw": false, "vme": true, - "vmx": true, + "vmx": false, "dtes64": false, "mtrr": true, "rdtscp": true, @@ -19832,7 +19829,7 @@ "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -19969,11 +19966,11 @@ "invtsc": false, "sse3": true, "sse2": true, - "ssbd": false, + "ssbd": true, "est": false, "avx512ifma": false, "tm2": false, - "kvm-pv-ipi": false, + "kvm-pv-ipi": true, "kvm-pv-eoi": true, "cx8": true, "cldemote": false, @@ -19989,7 +19986,7 @@ "nodeid_msr": false, "pdcm": false, "movbe": true, - "model": 94, + "model": 142, "nrip_save": false, "nrip-save": false, "kvm_pv_unhalt": true, @@ -20004,7 +20001,7 @@ "de": true, "pconfig": false, "enforce": false, - "stepping": 3, + "stepping": 10, "xsave": true, "clflush": true, "skinit": false, @@ -20097,7 +20094,7 @@ "rdrand": true, "rdseed": true, "avx512-4vnniw": false, - "vmx": true, + "vmx": false, "vme": true, "dtes64": false, "mtrr": true, @@ -20108,7 +20105,7 @@ "wdt": false, "pause_filter": false, "sha-ni": false, - "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", "abm": true, "avx512pf": false, "xstore-en": false @@ -20221,12 +20218,12 @@ "svm": false, "invtsc": true, "sse2": true, - "ssbd": false, + "ssbd": true, "est": false, "avx512ifma": false, "tm2": false, "kvm-pv-eoi": true, - "kvm-pv-ipi": false, + "kvm-pv-ipi": true, "cx8": true, "cldemote": false, "kvm-mmu": false, @@ -20234,7 +20231,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 94, + "model": 142, "movbe": true, "nrip-save": false, "ssse3": true, @@ -20247,7 +20244,7 @@ "cx16": true, "de": true, "pconfig": false, - "stepping": 3, + "stepping": 10, "xsave": true, "clflush": true, "skinit": false, @@ -20315,7 +20312,7 @@ "rdseed": true, "avx512-4vnniw": false, "vme": true, - "vmx": true, + "vmx": false, "dtes64": false, "mtrr": true, "rdtscp": true, @@ -20323,7 +20320,7 @@ "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -20425,12 +20422,12 @@ "svm": false, "invtsc": true, "sse2": true, - "ssbd": false, + "ssbd": true, "est": false, "avx512ifma": false, "tm2": false, "kvm-pv-eoi": true, - "kvm-pv-ipi": false, + "kvm-pv-ipi": true, "cx8": true, "cldemote": false, "kvm-mmu": false, @@ -20438,7 +20435,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 94, + "model": 142, "movbe": true, "nrip-save": false, "ssse3": true, @@ -20451,7 +20448,7 @@ "cx16": true, "de": true, "pconfig": false, - "stepping": 3, + "stepping": 10, "xsave": true, "clflush": true, "skinit": false, @@ -20519,7 +20516,7 @@ "rdseed": true, "avx512-4vnniw": false, "vme": true, - "vmx": true, + "vmx": false, "dtes64": false, "mtrr": true, "rdtscp": true, @@ -20527,7 +20524,7 @@ "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -20664,11 +20661,11 @@ "invtsc": true, "sse3": true, "sse2": true, - "ssbd": false, + "ssbd": true, "est": false, "avx512ifma": false, "tm2": false, - "kvm-pv-ipi": false, + "kvm-pv-ipi": true, "kvm-pv-eoi": true, "cx8": true, "cldemote": false, @@ -20684,7 +20681,7 @@ "nodeid_msr": false, "pdcm": false, "movbe": true, - "model": 94, + "model": 142, "nrip_save": false, "nrip-save": false, "kvm_pv_unhalt": true, @@ -20699,7 +20696,7 @@ "de": true, "pconfig": false, "enforce": false, - "stepping": 3, + "stepping": 10, "xsave": true, "clflush": true, "skinit": false, @@ -20792,7 +20789,7 @@ "rdrand": true, "rdseed": true, "avx512-4vnniw": false, - "vmx": true, + "vmx": false, "vme": true, "dtes64": false, "mtrr": true, @@ -20803,7 +20800,7 @@ "wdt": false, "pause_filter": false, "sha-ni": false, - "model-id": "Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz", + "model-id": "Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz", "abm": true, "avx512pf": false, "xstore-en": false @@ -20819,11 +20816,13 @@ } { - "id": "libvirt-50", - "error": { - "class": "GenericError", - "desc": "SEV feature is not available" - } + "return": { + "reduced-phys-bits": 1, + "cbitpos": 47, + "cert-chain": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA", + "pdh": "AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA" + }, + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 58395cff2f..25d9091e41 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -202,6 +202,7 @@ <flag name='tpm-emulator'/> <flag name='mch'/> <flag name='mch.extended-tseg-mbytes'/> + <flag name='sev-guest'/> <flag name='usb-storage.werror'/> <flag name='egl-headless'/> <flag name='vfio-pci.display'/> @@ -212,10 +213,10 @@ <flag name='memory-backend-file.align'/> <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> - <version>3000092</version> + <version>3001000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>440976</microcodeVersion> - <package>v3.1.0-rc2-48-g039d4e3df0</package> + <microcodeVersion>441048</microcodeVersion> + <package>v3.1.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> @@ -339,11 +340,11 @@ <property name='invtsc' type='boolean' value='true' migratable='no'/> <property name='sse3' type='boolean' value='true' migratable='yes'/> <property name='sse2' type='boolean' value='true' migratable='yes'/> - <property name='ssbd' type='boolean' value='false'/> + <property name='ssbd' type='boolean' value='true' migratable='yes'/> <property name='est' type='boolean' value='false'/> <property name='avx512ifma' type='boolean' value='false'/> <property name='tm2' type='boolean' value='false'/> - <property name='kvm-pv-ipi' type='boolean' value='false'/> + <property name='kvm-pv-ipi' type='boolean' value='true' migratable='yes'/> <property name='kvm-pv-eoi' type='boolean' value='true' migratable='yes'/> <property name='cx8' type='boolean' value='true' migratable='yes'/> <property name='cldemote' type='boolean' value='false'/> @@ -359,7 +360,7 @@ <property name='nodeid_msr' type='boolean' value='false'/> <property name='pdcm' type='boolean' value='false'/> <property name='movbe' type='boolean' value='true' migratable='yes'/> - <property name='model' type='number' value='94'/> + <property name='model' type='number' value='142'/> <property name='nrip_save' type='boolean' value='false'/> <property name='nrip-save' type='boolean' value='false'/> <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/> @@ -374,7 +375,7 @@ <property name='de' type='boolean' value='true' migratable='yes'/> <property name='pconfig' type='boolean' value='false'/> <property name='enforce' type='boolean' value='false'/> - <property name='stepping' type='number' value='3'/> + <property name='stepping' type='number' value='10'/> <property name='xsave' type='boolean' value='true' migratable='yes'/> <property name='clflush' type='boolean' value='true' migratable='yes'/> <property name='skinit' type='boolean' value='false'/> @@ -467,7 +468,7 @@ <property name='rdrand' type='boolean' value='true' migratable='yes'/> <property name='rdseed' type='boolean' value='true' migratable='yes'/> <property name='avx512-4vnniw' type='boolean' value='false'/> - <property name='vmx' type='boolean' value='true' migratable='yes'/> + <property name='vmx' type='boolean' value='false'/> <property name='vme' type='boolean' value='true' migratable='yes'/> <property name='dtes64' type='boolean' value='false'/> <property name='mtrr' type='boolean' value='true' migratable='yes'/> @@ -478,7 +479,7 @@ <property name='wdt' type='boolean' value='false'/> <property name='pause_filter' type='boolean' value='false'/> <property name='sha-ni' type='boolean' value='false'/> - <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E3-1245 v5 @ 3.50GHz'/> + <property name='model-id' type='string' value='Intel(R) Core(TM) i7-8650U CPU @ 1.90GHz'/> <property name='abm' type='boolean' value='true' migratable='yes'/> <property name='avx512pf' type='boolean' value='false'/> <property name='xstore-en' type='boolean' value='false'/> @@ -863,7 +864,6 @@ <blocker name='avx512-vpopcntdq'/> <blocker name='la57'/> <blocker name='pconfig'/> - <blocker name='ssbd'/> <blocker name='wbnoinvd'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -882,7 +882,6 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='ssbd'/> <blocker name='wbnoinvd'/> <blocker name='pku'/> </cpu> @@ -921,7 +920,6 @@ <blocker name='pku'/> <blocker name=''/> <blocker name='avx512vnni'/> - <blocker name='ssbd'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -1376,4 +1374,10 @@ <machine name='pc-0.11' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-0.10' hotplugCpus='yes' maxCpus='255'/> + <sev> + <cbitpos>47</cbitpos> + <reducedPhysBits>1</reducedPhysBits> + <pdh>AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA</pdh> + <certChain>AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA</certChain> + </sev> </qemuCaps> -- 2.20.1