Add POWER11 as a supported cpu model for ppc64.
Signed-off-by: Narayana Murty N <nnmlinux@xxxxxxxxxxxxx>
---
src/cpu_map/index.xml | 1 +
src/cpu_map/meson.build | 1 +
src/cpu_map/ppc64_POWER11.xml | 6 ++++++
tests/domaincapsdata/qemu_9.2.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_9.2.0_ppc64.xml | 4 ++--
...memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args | 2 +-
.../memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.xml | 2 +-
.../memory-hotplug-ppc64-nonuma.ppc64-latest.args | 2 +-
.../memory-hotplug-ppc64-nonuma.ppc64-latest.xml | 2 +-
.../ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args | 2 +-
.../ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml | 2 +-
.../ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args | 2 +-
.../ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml | 2 +-
tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args | 2 +-
tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.xml | 2 +-
15 files changed, 21 insertions(+), 12 deletions(-)
create mode 100644 src/cpu_map/ppc64_POWER11.xml
diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 87db338cee..790c3b2f83 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -181,6 +181,7 @@
<include filename='ppc64_POWER8.xml'/>
<include filename='ppc64_POWER9.xml'/>
<include filename='ppc64_POWER10.xml'/>
+ <include filename='ppc64_POWER11.xml'/>
</group>
<group name='Freescale-based CPU models'>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index 9a1c048620..1dabf09040 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -15,6 +15,7 @@ cpumap_data = [
'arm_vendors.xml',
'index.xml',
'ppc64_POWER10.xml',
+ 'ppc64_POWER11.xml',
'ppc64_POWER6.xml',
'ppc64_POWER7.xml',
'ppc64_POWER8.xml',
diff --git a/src/cpu_map/ppc64_POWER11.xml b/src/cpu_map/ppc64_POWER11.xml
new file mode 100644
index 0000000000..6e8ae715c6
--- /dev/null
+++ b/src/cpu_map/ppc64_POWER11.xml
@@ -0,0 +1,6 @@
+<cpus>
+ <model name='POWER11'>
+ <vendor name='IBM'/>
+ <pvr value='0x00820000' mask='0xffff0000'/>
+ </model>
+</cpus>
diff --git a/tests/domaincapsdata/qemu_9.2.0.ppc64.xml b/tests/domaincapsdata/qemu_9.2.0.ppc64.xml
index 31bef280a9..e5a223c571 100644
--- a/tests/domaincapsdata/qemu_9.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.ppc64.xml
@@ -36,6 +36,7 @@
</mode>
<mode name='custom' supported='yes'>
<model usable='unknown' vendor='IBM'>POWER10</model>
+ <model usable='unknown' vendor='IBM'>POWER11</model>
<model usable='unknown' vendor='IBM'>POWER7</model>
<model usable='unknown' vendor='IBM'>POWER8</model>
<model usable='unknown' vendor='IBM'>POWER9</model>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_ppc64.xml
index 951f5fd383..1cf1d47566 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_ppc64.xml
@@ -182,7 +182,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='power11' typename='host-powerpc64-cpu'/>
+ <cpu type='kvm' name='POWER11' typename='host-powerpc64-cpu'/>
<cpu type='kvm' name='POWER10' typename='power10_v2.0-powerpc64-cpu'/>
<cpu type='kvm' name='POWER9' typename='power9_v2.2-powerpc64-cpu'/>
<cpu type='kvm' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
@@ -639,7 +639,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='power11' typename='power11_v2.0-powerpc64-cpu'/>
+ <cpu type='tcg' name='POWER11' typename='power11_v2.0-powerpc64-cpu'/>
<cpu type='tcg' name='POWER10' typename='power10_v2.0-powerpc64-cpu'/>
<cpu type='tcg' name='POWER9' typename='power9_v2.2-powerpc64-cpu'/>
<cpu type='tcg' name='power8nvl' typename='power8nvl_v1.0-powerpc64-cpu'/>
diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args
index 4691595916..d163bdc378 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pseries,usb=off,dump-guest-core=off \
-accel kvm \
--cpu power11 \
+-cpu POWER11 \
-m size=1310720k,slots=16,maxmem=4194304k \
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.xml b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.xml
index 886cfe0316..104409a46e 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.xml
+++ b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.xml
@@ -10,7 +10,7 @@
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>power11</model>
+ <model fallback='forbid'>POWER11</model>
<numa>
<cell id='0' cpus='0' memory='1049601' unit='KiB'/>
</numa>
diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args
index 509e43e61c..2615657f5a 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \
-accel kvm \
--cpu power11 \
+-cpu POWER11 \
-m size=1310720k,slots=16,maxmem=4194304k \
-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":1342177280}' \
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml
index b7dbb25d3e..841d21d4cd 100644
--- a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.ppc64-latest.xml
@@ -10,7 +10,7 @@
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>power11</model>
+ <model fallback='forbid'>POWER11</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
index a98dd05b5b..6390322e8c 100644
--- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
-machine pseries-3.1,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \
-accel kvm \
--cpu power11 \
+-cpu POWER11 \
-m size=4194304k \
-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294967296}' \
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
index b4d23bbe57..a751a64e11 100644
--- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
@@ -9,7 +9,7 @@
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>power11</model>
+ <model fallback='forbid'>POWER11</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
index 21b51e76f6..130c801fa6 100644
--- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \
-machine pseries-4.2,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \
-accel kvm \
--cpu power11 \
+-cpu POWER11 \
-m size=4194304k \
-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294967296}' \
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
index ff3ad5f9d4..168006a3dc 100644
--- a/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
@@ -9,7 +9,7 @@
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>power11</model>
+ <model fallback='forbid'>POWER11</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args b/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args
index 351702dcfd..7dbdc20359 100644
--- a/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args
+++ b/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
-machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \
-accel kvm \
--cpu power11 \
+-cpu POWER11 \
-m size=524288k \
-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":536870912}' \
-overcommit mem-lock=off \
diff --git a/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.xml b/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.xml
index 1e67592876..c6f4f95690 100644
--- a/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.xml
+++ b/tests/qemuxmlconfdata/pseries-cpu-le.ppc64-latest.xml
@@ -9,7 +9,7 @@
<boot dev='hd'/>
</os>
<cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>power11</model>
+ <model fallback='forbid'>POWER11</model>
</cpu>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
--
2.48.1
