cpu_map: add POWER10 cpu model

Add POWER10 as a supported cpu model.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index ffe1fa91e5c6a8e5849e1710907cdb3173972d3e..351c2ae4fa50975886948241fcdfef00a9ddd714 100644 (file)
--- 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 013fc62a02530e2af6e6f13f398f03ad2c4db27c..99815981b50bb8d76e94a6ae3fea124aabf414a8 100644 (file)
--- 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 (file)
index 0000000..62f3486
--- /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 5772045e35176964d831af1a53995e3c93ce835c..d196676b1442a91aa85f8fdc34568e8a40345827 100644 (file)
--- 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 051b7d43a8cd01d827be95fe14a858232ec7042f..b2c0577be95f953637469e507b13c50159939794 100644 (file)
--- 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 8fed9d30b7c32c4d2020eeaa73c3e499c3037f51..b07072778b23d80ff827541d58c4a6f28e756e83 100644 (file)
--- 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 942c721afdf13fb219bfbc6c3840beda981553ff..ec171bcdd935e1e0d7922ff10bcc5037c841487c 100644 (file)
--- 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 868b3b0d0a9888e3e5f5fe183d5c122cbf873592..1fdec901a66ad3494a926024c62274d76a760ceb 100644 (file)
--- 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 b0b5fe3271ae88c3c6be2b3de7503659974d5b8e..df02e264d7ce604b909d45af054e9498ff2e54f0 100644 (file)
--- 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 d5a1663c159d71e4f9d4e8805b87727802e32079..983b54430d7fb92d57b49b36f9d4005dd7046912 100644 (file)
--- 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 6c51e27f460c7c42810efd4f5b32eaa7c202afdf..83e0f50e3af2acf37852fac2aade07d0dd07f394 100644 (file)
--- 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'/>