Regenerate the output from the QEMU v3.0.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.0.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>
---
.../caps_3.0.0.x86_64.replies | 73 ++++++++++---------
.../caps_3.0.0.x86_64.xml | 19 +++--
2 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
index 16f021c879..bf0e6fb9c0 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@@ -4909,7 +4909,6 @@
"id": "libvirt-35"
}
-
{
"execute": "qom-list-properties",
"arguments": {
@@ -19083,7 +19082,7 @@
"svm": false,
"invtsc": false,
"sse2": true,
- "ssbd": false,
+ "ssbd": true,
"est": false,
"avx512ifma": false,
"tm2": false,
@@ -19095,7 +19094,7 @@
"pge": true,
"avx512bitalg": false,
"pdcm": false,
- "model": 94,
+ "model": 142,
"movbe": true,
"nrip-save": false,
"ssse3": true,
@@ -19106,7 +19105,7 @@
"fma": true,
"cx16": true,
"de": true,
- "stepping": 3,
+ "stepping": 10,
"xsave": true,
"clflush": true,
"skinit": false,
@@ -19173,7 +19172,7 @@
"rdseed": true,
"avx512-4vnniw": false,
"vme": true,
- "vmx": true,
+ "vmx": false,
"dtes64": false,
"mtrr": true,
"rdtscp": true,
@@ -19181,7 +19180,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,
@@ -19278,7 +19277,7 @@
"svm": false,
"invtsc": false,
"sse2": true,
- "ssbd": false,
+ "ssbd": true,
"est": false,
"avx512ifma": false,
"tm2": false,
@@ -19290,7 +19289,7 @@
"pge": true,
"avx512bitalg": false,
"pdcm": false,
- "model": 94,
+ "model": 142,
"movbe": true,
"nrip-save": false,
"ssse3": true,
@@ -19301,7 +19300,7 @@
"fma": true,
"cx16": true,
"de": true,
- "stepping": 3,
+ "stepping": 10,
"xsave": true,
"clflush": true,
"skinit": false,
@@ -19368,7 +19367,7 @@
"rdseed": true,
"avx512-4vnniw": false,
"vme": true,
- "vmx": true,
+ "vmx": false,
"dtes64": false,
"mtrr": true,
"rdtscp": true,
@@ -19376,7 +19375,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,
@@ -19505,7 +19504,7 @@
"invtsc": false,
"sse3": true,
"sse2": true,
- "ssbd": false,
+ "ssbd": true,
"est": false,
"avx512ifma": false,
"tm2": false,
@@ -19524,7 +19523,7 @@
"nodeid_msr": false,
"pdcm": false,
"movbe": true,
- "model": 94,
+ "model": 142,
"nrip_save": false,
"nrip-save": false,
"kvm_pv_unhalt": true,
@@ -19537,7 +19536,7 @@
"cx16": true,
"de": true,
"enforce": false,
- "stepping": 3,
+ "stepping": 10,
"xsave": true,
"clflush": true,
"skinit": false,
@@ -19629,7 +19628,7 @@
"rdrand": true,
"rdseed": true,
"avx512-4vnniw": false,
- "vmx": true,
+ "vmx": false,
"vme": true,
"dtes64": false,
"mtrr": true,
@@ -19640,7 +19639,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
@@ -19748,7 +19747,7 @@
"svm": false,
"invtsc": true,
"sse2": true,
- "ssbd": false,
+ "ssbd": true,
"est": false,
"avx512ifma": false,
"tm2": false,
@@ -19760,7 +19759,7 @@
"pge": true,
"avx512bitalg": false,
"pdcm": false,
- "model": 94,
+ "model": 142,
"movbe": true,
"nrip-save": false,
"ssse3": true,
@@ -19771,7 +19770,7 @@
"fma": true,
"cx16": true,
"de": true,
- "stepping": 3,
+ "stepping": 10,
"xsave": true,
"clflush": true,
"skinit": false,
@@ -19838,7 +19837,7 @@
"rdseed": true,
"avx512-4vnniw": false,
"vme": true,
- "vmx": true,
+ "vmx": false,
"dtes64": false,
"mtrr": true,
"rdtscp": true,
@@ -19846,7 +19845,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,
@@ -19943,7 +19942,7 @@
"svm": false,
"invtsc": true,
"sse2": true,
- "ssbd": false,
+ "ssbd": true,
"est": false,
"avx512ifma": false,
"tm2": false,
@@ -19955,7 +19954,7 @@
"pge": true,
"avx512bitalg": false,
"pdcm": false,
- "model": 94,
+ "model": 142,
"movbe": true,
"nrip-save": false,
"ssse3": true,
@@ -19966,7 +19965,7 @@
"fma": true,
"cx16": true,
"de": true,
- "stepping": 3,
+ "stepping": 10,
"xsave": true,
"clflush": true,
"skinit": false,
@@ -20033,7 +20032,7 @@
"rdseed": true,
"avx512-4vnniw": false,
"vme": true,
- "vmx": true,
+ "vmx": false,
"dtes64": false,
"mtrr": true,
"rdtscp": true,
@@ -20041,7 +20040,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,
@@ -20170,7 +20169,7 @@
"invtsc": true,
"sse3": true,
"sse2": true,
- "ssbd": false,
+ "ssbd": true,
"est": false,
"avx512ifma": false,
"tm2": false,
@@ -20189,7 +20188,7 @@
"nodeid_msr": false,
"pdcm": false,
"movbe": true,
- "model": 94,
+ "model": 142,
"nrip_save": false,
"nrip-save": false,
"kvm_pv_unhalt": true,
@@ -20202,7 +20201,7 @@
"cx16": true,
"de": true,
"enforce": false,
- "stepping": 3,
+ "stepping": 10,
"xsave": true,
"clflush": true,
"skinit": false,
@@ -20294,7 +20293,7 @@
"rdrand": true,
"rdseed": true,
"avx512-4vnniw": false,
- "vmx": true,
+ "vmx": false,
"vme": true,
"dtes64": false,
"mtrr": true,
@@ -20305,7 +20304,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
@@ -20321,11 +20320,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.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 77d1f2770d..08025d8cac 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.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,7 +213,7 @@
<flag name='nvdimm.unarmed'/>
<version>3000000</version>
<kvmVersion>0</kvmVersion>
- <microcodeVersion>426554</microcodeVersion>
+ <microcodeVersion>426699</microcodeVersion>
<package>v3.0.0</package>
<arch>x86_64</arch>
<hostCPU type='kvm' model='base' migratability='yes'>
@@ -329,7 +330,7 @@
<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'/>
@@ -348,7 +349,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'/>
@@ -361,7 +362,7 @@
<property name='cx16' type='boolean' value='true'
migratable='yes'/>
<property name='de' type='boolean' value='true'
migratable='yes'/>
<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'/>
@@ -453,7 +454,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'/>
@@ -464,7 +465,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'/>
@@ -1192,4 +1193,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