[libvirt] [PATCH 3/4] cpu: split PPC64 map data into separate files

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/cpu/cpu_map.xml | 41 +++++-------------------- src/cpu/cpu_map_ppc64_POWER6.xml | 6 ++++ src/cpu/cpu_map_ppc64_POWER7.xml | 7 +++++ src/cpu/cpu_map_ppc64_POWER8.xml | 8 +++++ src/cpu/cpu_map_ppc64_POWER9.xml | 6 ++++ src/cpu/cpu_map_ppc64_POWERPC_e5500.xml | 6 ++++ src/cpu/cpu_map_ppc64_POWERPC_e6500.xml | 6 ++++ src/cpu/cpu_map_ppc64_vendors.xml | 4 +++ 8 files changed, 50 insertions(+), 34 deletions(-) create mode 100644 src/cpu/cpu_map_ppc64_POWER6.xml create mode 100644 src/cpu/cpu_map_ppc64_POWER7.xml create mode 100644 src/cpu/cpu_map_ppc64_POWER8.xml create mode 100644 src/cpu/cpu_map_ppc64_POWER9.xml create mode 100644 src/cpu/cpu_map_ppc64_POWERPC_e5500.xml create mode 100644 src/cpu/cpu_map_ppc64_POWERPC_e6500.xml create mode 100644 src/cpu/cpu_map_ppc64_vendors.xml diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 9af190a579..e236c41733 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -2340,43 +2340,16 @@ </arch> <arch name='ppc64'> - <!-- vendor definitions --> - <vendor name='IBM'/> - <vendor name='Freescale'/> + <include filename="cpu_map_ppc64_vendors.xml"/> <!-- IBM-based CPU models --> - <model name='POWER6'> - <vendor name='IBM'/> - <pvr value='0x003e0000' mask='0xffff0000'/> - </model> - - <model name='POWER7'> - <vendor name='IBM'/> - <pvr value='0x003f0000' mask='0xffff0000'/> - <pvr value='0x004a0000' mask='0xffff0000'/> - </model> - - <model name='POWER8'> - <vendor name='IBM'/> - <pvr value='0x004b0000' mask='0xffff0000'/> - <pvr value='0x004c0000' mask='0xffff0000'/> - <pvr value='0x004d0000' mask='0xffff0000'/> - </model> - - <model name='POWER9'> - <vendor name='IBM'/> - <pvr value='0x004e0000' mask='0xffff0000'/> - </model> + <include filename="cpu_map_ppc64_POWER6.xml"/> + <include filename="cpu_map_ppc64_POWER7.xml"/> + <include filename="cpu_map_ppc64_POWER8.xml"/> + <include filename="cpu_map_ppc64_POWER9.xml"/> <!-- Freescale-based CPU models --> - <model name='POWERPC_e5500'> - <vendor name='Freescale'/> - <pvr value='0x80240000' mask='0xffff0000'/> - </model> - - <model name='POWERPC_e6500'> - <vendor name='Freescale'/> - <pvr value='0x80400000' mask='0xffff0000'/> - </model> + <include filename="cpu_map_ppc64_POWERPC_e5500.xml"/> + <include filename="cpu_map_ppc64_POWERPC_e6500.xml"/> </arch> </cpus> diff --git a/src/cpu/cpu_map_ppc64_POWER6.xml b/src/cpu/cpu_map_ppc64_POWER6.xml new file mode 100644 index 0000000000..00e27495f4 --- /dev/null +++ b/src/cpu/cpu_map_ppc64_POWER6.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='POWER6'> + <vendor name='IBM'/> + <pvr value='0x003e0000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu/cpu_map_ppc64_POWER7.xml b/src/cpu/cpu_map_ppc64_POWER7.xml new file mode 100644 index 0000000000..a071481805 --- /dev/null +++ b/src/cpu/cpu_map_ppc64_POWER7.xml @@ -0,0 +1,7 @@ +<cpus> + <model name='POWER7'> + <vendor name='IBM'/> + <pvr value='0x003f0000' mask='0xffff0000'/> + <pvr value='0x004a0000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu/cpu_map_ppc64_POWER8.xml b/src/cpu/cpu_map_ppc64_POWER8.xml new file mode 100644 index 0000000000..64d96fc4c4 --- /dev/null +++ b/src/cpu/cpu_map_ppc64_POWER8.xml @@ -0,0 +1,8 @@ +<cpus> + <model name='POWER8'> + <vendor name='IBM'/> + <pvr value='0x004b0000' mask='0xffff0000'/> + <pvr value='0x004c0000' mask='0xffff0000'/> + <pvr value='0x004d0000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu/cpu_map_ppc64_POWER9.xml b/src/cpu/cpu_map_ppc64_POWER9.xml new file mode 100644 index 0000000000..149fcde924 --- /dev/null +++ b/src/cpu/cpu_map_ppc64_POWER9.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='POWER9'> + <vendor name='IBM'/> + <pvr value='0x004e0000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu/cpu_map_ppc64_POWERPC_e5500.xml b/src/cpu/cpu_map_ppc64_POWERPC_e5500.xml new file mode 100644 index 0000000000..3d64c8926c --- /dev/null +++ b/src/cpu/cpu_map_ppc64_POWERPC_e5500.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='POWERPC_e5500'> + <vendor name='Freescale'/> + <pvr value='0x80240000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu/cpu_map_ppc64_POWERPC_e6500.xml b/src/cpu/cpu_map_ppc64_POWERPC_e6500.xml new file mode 100644 index 0000000000..b0d1006076 --- /dev/null +++ b/src/cpu/cpu_map_ppc64_POWERPC_e6500.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='POWERPC_e6500'> + <vendor name='Freescale'/> + <pvr value='0x80400000' mask='0xffff0000'/> + </model> +</cpus> diff --git a/src/cpu/cpu_map_ppc64_vendors.xml b/src/cpu/cpu_map_ppc64_vendors.xml new file mode 100644 index 0000000000..52ad45c0bd --- /dev/null +++ b/src/cpu/cpu_map_ppc64_vendors.xml @@ -0,0 +1,4 @@ +<cpus> + <vendor name='IBM'/> + <vendor name='Freescale'/> +</cpus> -- 2.17.1