NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Adapt to changed ppc64 CPU model names

Browse Source 
QEMU 2.11 for ppc64 changed all CPU model names to lower case. Since
libvirt can't change the model names for compatibility reasons, we need
to translate the matching lower case models to the names known by
libvirt.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark
2018-05-17 17:08:42 +02:00
parent b979ec355d
commit db873ab3bc
8 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml
View File

@@ -29,7 +29,11 @@
<mode name='host-model' supported='yes'>
<model fallback='allow'>POWER8</model>
</mode>
<mode name='custom' supported='no'/>
<mode name='custom' supported='yes'>
<model usable='unknown'>POWER9</model>
<model usable='unknown'>POWER8</model>
<model usable='unknown'>POWER7</model>
</mode>
</cpu>
<devices>
<disk supported='yes'>

12
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@@ -163,12 +163,12 @@
<cpu type='kvm' name='970mp'/>
<cpu type='kvm' name='970fx'/>
<cpu type='kvm' name='970'/>
<cpu type='kvm' name='power9'/>
<cpu type='kvm' name='POWER9'/>
<cpu type='kvm' name='power8nvl'/>
<cpu type='kvm' name='power8'/>
<cpu type='kvm' name='POWER8'/>
<cpu type='kvm' name='power8e'/>
<cpu type='kvm' name='power7+'/>
<cpu type='kvm' name='power7'/>
<cpu type='kvm' name='POWER7'/>
<cpu type='kvm' name='power5gs'/>
<cpu type='kvm' name='power5+'/>
<cpu type='kvm' name='apollo7pm'/>
@@ -601,12 +601,12 @@
<cpu type='tcg' name='970mp'/>
<cpu type='tcg' name='970fx'/>
<cpu type='tcg' name='970'/>
<cpu type='tcg' name='power9'/>
<cpu type='tcg' name='POWER9'/>
<cpu type='tcg' name='power8nvl'/>
<cpu type='tcg' name='power8'/>
<cpu type='tcg' name='POWER8'/>
<cpu type='tcg' name='power8e'/>
<cpu type='tcg' name='power7+'/>
<cpu type='tcg' name='power7'/>
<cpu type='tcg' name='POWER7'/>
<cpu type='tcg' name='power5gs'/>
<cpu type='tcg' name='power5+'/>
<cpu type='tcg' name='apollo7pm'/>

12
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@@ -164,12 +164,12 @@
<cpu type='kvm' name='970mp'/>
<cpu type='kvm' name='970fx'/>
<cpu type='kvm' name='970'/>
<cpu type='kvm' name='power9'/>
<cpu type='kvm' name='POWER9'/>
<cpu type='kvm' name='power8nvl'/>
<cpu type='kvm' name='power8'/>
<cpu type='kvm' name='POWER8'/>
<cpu type='kvm' name='power8e'/>
<cpu type='kvm' name='power7+'/>
<cpu type='kvm' name='power7'/>
<cpu type='kvm' name='POWER7'/>
<cpu type='kvm' name='power5gs'/>
<cpu type='kvm' name='power5+'/>
<cpu type='kvm' name='apollo7pm'/>
@@ -602,12 +602,12 @@
<cpu type='tcg' name='970mp'/>
<cpu type='tcg' name='970fx'/>
<cpu type='tcg' name='970'/>
<cpu type='tcg' name='power9'/>
<cpu type='tcg' name='POWER9'/>
<cpu type='tcg' name='power8nvl'/>
<cpu type='tcg' name='power8'/>
<cpu type='tcg' name='POWER8'/>
<cpu type='tcg' name='power8e'/>
<cpu type='tcg' name='power7+'/>
<cpu type='tcg' name='power7'/>
<cpu type='tcg' name='POWER7'/>
<cpu type='tcg' name='power5gs'/>
<cpu type='tcg' name='power5+'/>
<cpu type='tcg' name='apollo7pm'/>

12
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
View File

@@ -166,12 +166,12 @@
<cpu type='kvm' name='ppc'/>
<cpu type='kvm' name='ppc32'/>
<cpu type='kvm' name='ppc64'/>
<cpu type='kvm' name='power9'/>
<cpu type='kvm' name='POWER9'/>
<cpu type='kvm' name='power8nvl'/>
<cpu type='kvm' name='power8'/>
<cpu type='kvm' name='POWER8'/>
<cpu type='kvm' name='power8e'/>
<cpu type='kvm' name='power7+'/>
<cpu type='kvm' name='power7'/>
<cpu type='kvm' name='POWER7'/>
<cpu type='kvm' name='power5gs'/>
<cpu type='kvm' name='power5+'/>
<cpu type='kvm' name='970mp'/>
@@ -604,12 +604,12 @@
<cpu type='tcg' name='ppc'/>
<cpu type='tcg' name='ppc32'/>
<cpu type='tcg' name='ppc64'/>
<cpu type='tcg' name='power9'/>
<cpu type='tcg' name='POWER9'/>
<cpu type='tcg' name='power8nvl'/>
<cpu type='tcg' name='power8'/>
<cpu type='tcg' name='POWER8'/>
<cpu type='tcg' name='power8e'/>
<cpu type='tcg' name='power7+'/>
<cpu type='tcg' name='power7'/>
<cpu type='tcg' name='POWER7'/>
<cpu type='tcg' name='power5gs'/>
<cpu type='tcg' name='power5+'/>
<cpu type='tcg' name='970mp'/>

12
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
View File

@@ -179,12 +179,12 @@
<cpu type='kvm' name='ppc'/>
<cpu type='kvm' name='ppc32'/>
<cpu type='kvm' name='ppc64'/>
<cpu type='kvm' name='power9'/>
<cpu type='kvm' name='POWER9'/>
<cpu type='kvm' name='power8nvl'/>
<cpu type='kvm' name='power8'/>
<cpu type='kvm' name='POWER8'/>
<cpu type='kvm' name='power8e'/>
<cpu type='kvm' name='power7+'/>
<cpu type='kvm' name='power7'/>
<cpu type='kvm' name='POWER7'/>
<cpu type='kvm' name='power5gs'/>
<cpu type='kvm' name='power5+'/>
<cpu type='kvm' name='970mp'/>
@@ -617,12 +617,12 @@
<cpu type='tcg' name='ppc'/>
<cpu type='tcg' name='ppc32'/>
<cpu type='tcg' name='ppc64'/>
<cpu type='tcg' name='power9'/>
<cpu type='tcg' name='POWER9'/>
<cpu type='tcg' name='power8nvl'/>
<cpu type='tcg' name='power8'/>
<cpu type='tcg' name='POWER8'/>
<cpu type='tcg' name='power8e'/>
<cpu type='tcg' name='power7+'/>
<cpu type='tcg' name='power7'/>
<cpu type='tcg' name='POWER7'/>
<cpu type='tcg' name='power5gs'/>
<cpu type='tcg' name='power5+'/>
<cpu type='tcg' name='970mp'/>