cpu: split PPC64 map data into separate files

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
index 67d8ddff8222f5c7f999d5d8e61c5c9b42078bd6..5b280b55491cd664685fda9318c5e5fa7f2b4715 100644 (file)
--- a/src/cpu_map/Makefile.inc.am
+++ b/src/cpu_map/Makefile.inc.am
@@ -1,6 +1,13 @@
 cpumapdir = $(pkgdatadir)/cpu_map
 cpumap_DATA = \
        cpu_map/index.xml \
+       cpu_map/ppc64_vendors.xml \
+       cpu_map/ppc64_POWER7.xml \
+       cpu_map/ppc64_POWER9.xml \
+       cpu_map/ppc64_POWERPC_e6500.xml \
+       cpu_map/ppc64_POWER6.xml \
+       cpu_map/ppc64_POWER8.xml \
+       cpu_map/ppc64_POWERPC_e5500.xml \
        $(NULL)
 
 EXTRA_DIST += $(cpumap_DATA)

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index 9af190a5793235974e2b9713e426d0527faa46e2..ce4f0204b08e337282fefab34f2911f6f2744f2e 100644 (file)
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -2340,43 +2340,16 @@
   </arch>
 
   <arch name='ppc64'>
-    <!-- vendor definitions -->
-    <vendor name='IBM'/>
-    <vendor name='Freescale'/>
+    <include filename="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="ppc64_POWER6.xml"/>
+    <include filename="ppc64_POWER7.xml"/>
+    <include filename="ppc64_POWER8.xml"/>
+    <include filename="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="ppc64_POWERPC_e5500.xml"/>
+    <include filename="ppc64_POWERPC_e6500.xml"/>
   </arch>
 </cpus>

diff --git a/src/cpu_map/ppc64_POWER6.xml b/src/cpu_map/ppc64_POWER6.xml
new file mode 100644 (file)
index 0000000..00e2749
--- /dev/null
+++ b/src/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_map/ppc64_POWER7.xml b/src/cpu_map/ppc64_POWER7.xml
new file mode 100644 (file)
index 0000000..a071481
--- /dev/null
+++ b/src/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_map/ppc64_POWER8.xml b/src/cpu_map/ppc64_POWER8.xml
new file mode 100644 (file)
index 0000000..64d96fc
--- /dev/null
+++ b/src/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_map/ppc64_POWER9.xml b/src/cpu_map/ppc64_POWER9.xml
new file mode 100644 (file)
index 0000000..149fcde
--- /dev/null
+++ b/src/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_map/ppc64_POWERPC_e5500.xml b/src/cpu_map/ppc64_POWERPC_e5500.xml
new file mode 100644 (file)
index 0000000..3d64c89
--- /dev/null
+++ b/src/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_map/ppc64_POWERPC_e6500.xml b/src/cpu_map/ppc64_POWERPC_e6500.xml
new file mode 100644 (file)
index 0000000..b0d1006
--- /dev/null
+++ b/src/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_map/ppc64_vendors.xml b/src/cpu_map/ppc64_vendors.xml
new file mode 100644 (file)
index 0000000..52ad45c
--- /dev/null
+++ b/src/cpu_map/ppc64_vendors.xml
@@ -0,0 +1,4 @@
+<cpus>
+  <vendor name='IBM'/>
+  <vendor name='Freescale'/>
+</cpus>