|
 |
7a3408 |
From 21dd3b6c09f3777e3859e74757372b59ebf4535e Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <21dd3b6c09f3777e3859e74757372b59ebf4535e@dist-git>
|
|
|
7a3408 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Date: Tue, 11 Aug 2015 17:16:06 +0200
|
|
|
7a3408 |
Subject: [PATCH] cpu: Simplify ppc64 part of CPU map XML
|
|
|
7a3408 |
|
|
|
7a3408 |
Use multiple PVRs per CPU model to reduce the number of models we
|
|
|
7a3408 |
need to keep track of.
|
|
|
7a3408 |
|
|
|
7a3408 |
Remove specific CPU models (eg. POWER7+_v2.1): the corresponding
|
|
|
7a3408 |
generic CPU model (eg. POWER7) should be used instead to ensure
|
|
|
7a3408 |
the guest can be booted on any compatible host.
|
|
|
7a3408 |
|
|
|
7a3408 |
Get rid of all the entries that did not match any of the CPU
|
|
|
7a3408 |
models supported by QEMU, like power8 and power8e.
|
|
|
7a3408 |
|
|
|
7a3408 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1250977
|
|
|
7a3408 |
(cherry picked from commit d87359af5eb5b21848da1906f8e34f107bbea151)
|
|
|
7a3408 |
|
|
|
7a3408 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1250977
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/cpu/cpu_map.xml | 39 +++------------------------------------
|
|
|
7a3408 |
1 file changed, 3 insertions(+), 36 deletions(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
|
|
|
7a3408 |
index 50516e3..9474a1b 100644
|
|
|
7a3408 |
--- a/src/cpu/cpu_map.xml
|
|
|
7a3408 |
+++ b/src/cpu/cpu_map.xml
|
|
|
7a3408 |
@@ -628,53 +628,20 @@
|
|
|
7a3408 |
<vendor name='Freescale'/>
|
|
|
7a3408 |
|
|
|
7a3408 |
|
|
|
7a3408 |
- <model name='POWER7'>
|
|
|
7a3408 |
- <vendor name='IBM'/>
|
|
|
7a3408 |
- <pvr value='0x003f0200'/>
|
|
|
7a3408 |
- </model>
|
|
|
7a3408 |
-
|
|
|
7a3408 |
- <model name='POWER7_v2.1'>
|
|
|
7a3408 |
- <vendor name='IBM'/>
|
|
|
7a3408 |
- <pvr value='0x003f0201'/>
|
|
|
7a3408 |
- </model>
|
|
|
7a3408 |
-
|
|
|
7a3408 |
- <model name='POWER7_v2.3'>
|
|
|
7a3408 |
- <vendor name='IBM'/>
|
|
|
7a3408 |
- <pvr value='0x003f0203'/>
|
|
|
7a3408 |
- </model>
|
|
|
7a3408 |
-
|
|
|
7a3408 |
- <model name='POWER7+_v2.1'>
|
|
|
7a3408 |
- <vendor name='IBM'/>
|
|
|
7a3408 |
- <pvr value='0x004a0201'/>
|
|
|
7a3408 |
- </model>
|
|
|
7a3408 |
-
|
|
|
7a3408 |
- <model name='POWER8_v1.0'>
|
|
|
7a3408 |
- <vendor name='IBM'/>
|
|
|
7a3408 |
- <pvr value='0x004b0100'/>
|
|
|
7a3408 |
- </model>
|
|
|
7a3408 |
-
|
|
|
7a3408 |
- <model name='power6'>
|
|
|
7a3408 |
+ <model name='POWER6'>
|
|
|
7a3408 |
<vendor name='IBM'/>
|
|
|
7a3408 |
<pvr value='0x003e0000'/>
|
|
|
7a3408 |
</model>
|
|
|
7a3408 |
|
|
|
7a3408 |
- <model name='power7'>
|
|
|
7a3408 |
+ <model name='POWER7'>
|
|
|
7a3408 |
<vendor name='IBM'/>
|
|
|
7a3408 |
<pvr value='0x003f0000'/>
|
|
|
7a3408 |
- </model>
|
|
|
7a3408 |
-
|
|
|
7a3408 |
- <model name='power7+'>
|
|
|
7a3408 |
- <vendor name='IBM'/>
|
|
|
7a3408 |
<pvr value='0x004a0000'/>
|
|
|
7a3408 |
</model>
|
|
|
7a3408 |
|
|
|
7a3408 |
- <model name='power8e'>
|
|
|
7a3408 |
+ <model name='POWER8'>
|
|
|
7a3408 |
<vendor name='IBM'/>
|
|
|
7a3408 |
<pvr value='0x004b0000'/>
|
|
|
7a3408 |
- </model>
|
|
|
7a3408 |
-
|
|
|
7a3408 |
- <model name='power8'>
|
|
|
7a3408 |
- <vendor name='IBM'/>
|
|
|
7a3408 |
<pvr value='0x004d0000'/>
|
|
|
7a3408 |
</model>
|
|
|
7a3408 |
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.5.0
|
|
|
7a3408 |
|