Add POWER10 as a supported cpu model.
Reviewed-by: Andrea Bolognani <abologna@xxxxxxxxxx>
Signed-off-by: Daniel Henrique Barboza <danielhb413@xxxxxxxxx>
---
src/cpu_map/index.xml | 1 +
src/cpu_map/meson.build | 1 +
src/cpu_map/ppc64_POWER10.xml | 6 ++++++
tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 +
tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 4 ++--
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 4 ++--
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 4 ++--
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 4 ++--
11 files changed, 20 insertions(+), 8 deletions(-)
create mode 100644 src/cpu_map/ppc64_POWER10.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index ffe1fa91e5..351c2ae4fa 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -82,6 +82,7 @@
<include filename='ppc64_POWER7.xml'/>
<include filename='ppc64_POWER8.xml'/>
<include filename='ppc64_POWER9.xml'/>
+ <include filename='ppc64_POWER10.xml'/>
<!-- Freescale-based CPU models -->
<include filename='ppc64_POWERPC_e5500.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 013fc62a02..99815981b5 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -14,6 +14,7 @@ cpumap_data = [
'ppc64_POWER7.xml',
'ppc64_POWER8.xml',
'ppc64_POWER9.xml',
+ 'ppc64_POWER10.xml',
'ppc64_POWERPC_e5500.xml',
'ppc64_POWERPC_e6500.xml',
'ppc64_vendors.xml',
diff --git a/src/cpu_map/ppc64_POWER10.xml b/src/cpu_map/ppc64_POWER10.xml
new file mode 100644
index 0000000000..62f3486ae4
--- /dev/null
+++ b/src/cpu_map/ppc64_POWER10.xml
@@ -0,0 +1,6 @@
+<cpus>
+ <model name='POWER10'>
+ <vendor name='IBM'/>
+ <pvr value='0x00800000' mask='0xffff0000'/>
+ </model>
+</cpus>
diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
index 5772045e35..d196676b14 100644
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
@@ -40,6 +40,7 @@
<model fallback='allow'>POWER8</model>
</mode>
<mode name='custom' supported='yes'>
+ <model usable='unknown'>POWER10</model>
<model usable='unknown'>POWER9</model>
<model usable='unknown'>POWER8</model>
<model usable='unknown'>POWER7</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index 051b7d43a8..b2c0577be9 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -40,6 +40,7 @@
<model fallback='allow'>POWER8</model>
</mode>
<mode name='custom' supported='yes'>
+ <model usable='unknown'>POWER10</model>
<model usable='unknown'>POWER9</model>
<model usable='unknown'>POWER8</model>
<model usable='unknown'>POWER7</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
index 8fed9d30b7..b07072778b 100644
--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
@@ -40,6 +40,7 @@
<model fallback='allow'>POWER8</model>
</mode>
<mode name='custom' supported='yes'>
+ <model usable='unknown'>POWER10</model>
<model usable='unknown'>POWER9</model>
<model usable='unknown'>POWER8</model>
<model usable='unknown'>POWER7</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
index 942c721afd..ec171bcdd9 100644
--- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
@@ -40,6 +40,7 @@
<model fallback='allow'>POWER8</model>
</mode>
<mode name='custom' supported='yes'>
+ <model usable='unknown'>POWER10</model>
<model usable='unknown'>POWER9</model>
<model usable='unknown'>POWER8</model>
<model usable='unknown'>POWER7</model>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 868b3b0d0a..1fdec901a6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -189,7 +189,7 @@
<cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
- <cpu type='kvm' name='power10' typename='power10_v1.0-powerpc64-cpu'/>
+ <cpu type='kvm' name='POWER10' typename='power10_v1.0-powerpc64-cpu'/>
<cpu type='kvm' name='POWER9' typename='host-powerpc64-cpu'/>
<cpu type='kvm' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
<cpu type='kvm' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
@@ -661,7 +661,7 @@
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
- <cpu type='tcg' name='power10' typename='power10_v1.0-powerpc64-cpu'/>
+ <cpu type='tcg' name='POWER10' typename='power10_v1.0-powerpc64-cpu'/>
<cpu type='tcg' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
<cpu type='tcg' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
<cpu type='tcg' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index b0b5fe3271..df02e264d7 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -194,7 +194,7 @@
<cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
- <cpu type='kvm' name='power10' typename='power10_v1.0-powerpc64-cpu'/>
+ <cpu type='kvm' name='POWER10' typename='power10_v1.0-powerpc64-cpu'/>
<cpu type='kvm' name='POWER9' typename='host-powerpc64-cpu'/>
<cpu type='kvm' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
<cpu type='kvm' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
@@ -668,7 +668,7 @@
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
- <cpu type='tcg' name='power10' typename='power10_v1.0-powerpc64-cpu'/>
+ <cpu type='tcg' name='POWER10' typename='power10_v1.0-powerpc64-cpu'/>
<cpu type='tcg' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
<cpu type='tcg' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
<cpu type='tcg' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index d5a1663c15..983b54430d 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -205,7 +205,7 @@
<cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
- <cpu type='kvm' name='power10' typename='power10_v2.0-powerpc64-cpu'/>
+ <cpu type='kvm' name='POWER10' typename='power10_v2.0-powerpc64-cpu'/>
<cpu type='kvm' name='POWER9' typename='host-powerpc64-cpu'/>
<cpu type='kvm' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
<cpu type='kvm' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
@@ -685,7 +685,7 @@
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
- <cpu type='tcg' name='power10' typename='power10_v2.0-powerpc64-cpu'/>
+ <cpu type='tcg' name='POWER10' typename='power10_v2.0-powerpc64-cpu'/>
<cpu type='tcg' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
<cpu type='tcg' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
<cpu type='tcg' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 6c51e27f46..83e0f50e3a 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -222,7 +222,7 @@
<cpu type='kvm' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc32' typename='604-powerpc64-cpu'/>
<cpu type='kvm' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
- <cpu type='kvm' name='power10' typename='power10_v2.0-powerpc64-cpu'/>
+ <cpu type='kvm' name='POWER10' typename='power10_v2.0-powerpc64-cpu'/>
<cpu type='kvm' name='POWER9' typename='host-powerpc64-cpu'/>
<cpu type='kvm' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
<cpu type='kvm' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
@@ -682,7 +682,7 @@
<cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
<cpu type='tcg' name='ppc64' typename='970fx_v3.1-powerpc64-cpu'/>
- <cpu type='tcg' name='power10' typename='power10_v2.0-powerpc64-cpu'/>
+ <cpu type='tcg' name='POWER10' typename='power10_v2.0-powerpc64-cpu'/>
<cpu type='tcg' name='POWER9' typename='power9_v2.0-powerpc64-cpu'/>
<cpu type='tcg' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
<cpu type='tcg' name='POWER8' typename='power8_v2.0-powerpc64-cpu'/>
--
2.32.0
