[libvirt] [PATCH v3 38/52] qemu: Move machine type data in capabilities cache

[Jiri Denemark]

In preparation for making machine types dependent on the accelerator,
the <machine> elements are formatted between <cpu type='kvm'> and
<cpu type='tcg'>.

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---

Notes:
    Version 3:
    - new patch

 src/qemu/qemu_capabilities.c                  |  4 +-
 .../caps_1.5.3.x86_64.xml                     | 30 +++---
 .../caps_1.6.0.x86_64.xml                     | 34 +++----
 .../caps_1.7.0.x86_64.xml                     | 38 ++++----
 .../caps_2.1.1.x86_64.xml                     | 46 +++++-----
 .../caps_2.10.0.aarch64.xml                   | 62 ++++++-------
 .../caps_2.10.0.ppc64.xml                     | 42 ++++-----
 .../caps_2.10.0.s390x.xml                     | 14 +--
 .../caps_2.10.0.x86_64.xml                    | 70 +++++++-------
 .../caps_2.11.0.s390x.xml                     | 16 ++--
 .../caps_2.11.0.x86_64.xml                    | 70 +++++++-------
 .../caps_2.12.0.aarch64.xml                   | 68 +++++++-------
 .../caps_2.12.0.ppc64.xml                     | 50 +++++-----
 .../caps_2.12.0.s390x.xml                     | 18 ++--
 .../caps_2.12.0.x86_64.xml                    | 74 +++++++--------
 .../caps_2.4.0.x86_64.xml                     | 56 +++++------
 .../caps_2.5.0.x86_64.xml                     | 56 +++++------
 .../caps_2.6.0.aarch64.xml                    | 60 ++++++------
 .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 30 +++---
 .../caps_2.6.0.x86_64.xml                     | 50 +++++-----
 .../qemucapabilitiesdata/caps_2.7.0.s390x.xml |  2 +-
 .../caps_2.7.0.x86_64.xml                     | 54 +++++------
 .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 10 +-
 .../caps_2.8.0.x86_64.xml                     | 62 ++++++-------
 .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 40 ++++----
 .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 12 +--
 .../caps_2.9.0.x86_64.xml                     | 66 ++++++-------
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 52 +++++------
 .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 20 ++--
 .../caps_3.0.0.x86_64.xml                     | 78 ++++++++--------
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 54 +++++------
 .../caps_3.1.0.x86_64.xml                     | 82 ++++++++---------
 .../caps_4.0.0.aarch64.xml                    | 74 +++++++--------
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 56 +++++------
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 24 ++---
 .../caps_4.0.0.x86_64.xml                     | 82 ++++++++---------
 .../caps_4.1.0.x86_64.xml                     | 88 +++++++++---------
 .../caps_4.2.0.aarch64.xml                    | 74 +++++++--------
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 62 ++++++-------
 .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 28 +++---
 .../caps_4.2.0.x86_64.xml                     | 92 +++++++++----------
 41 files changed, 1000 insertions(+), 1000 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 68ae8be5c3..b21aadf864 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4129,10 +4129,10 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)
                       virArchToString(qemuCaps->arch));
 
     virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM);
-    virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU);
-
     virQEMUCapsFormatMachines(qemuCaps, &buf);
 
+    virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU);
+
     for (i = 0; i < qemuCaps->ngicCapabilities; i++) {
         virGICCapabilityPtr cap;
         bool kernel;
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 8b573070d5..a62a5534b8 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -112,6 +112,21 @@
   <cpu type='kvm' name='core2duo'/>
   <cpu type='kvm' name='phenom'/>
   <cpu type='kvm' name='qemu64'/>
+  <machine name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes'/>
+  <machine name='pc-q35-1.4' maxCpus='255'/>
+  <machine name='pc-q35-1.5' alias='q35' maxCpus='255'/>
+  <machine name='isapc' maxCpus='1'/>
+  <machine name='pc-0.10' maxCpus='255'/>
+  <machine name='pc-0.11' maxCpus='255'/>
+  <machine name='pc-0.12' maxCpus='255'/>
+  <machine name='pc-0.13' maxCpus='255'/>
+  <machine name='pc-0.14' maxCpus='255'/>
+  <machine name='pc-0.15' maxCpus='255'/>
+  <machine name='pc-1.0' maxCpus='255'/>
+  <machine name='pc-1.1' maxCpus='255'/>
+  <machine name='pc-1.2' maxCpus='255'/>
+  <machine name='pc-1.3' maxCpus='255'/>
+  <machine name='pc-i440fx-1.4' maxCpus='255'/>
   <cpu type='tcg' name='Opteron_G5'/>
   <cpu type='tcg' name='Opteron_G4'/>
   <cpu type='tcg' name='Opteron_G3'/>
@@ -136,19 +151,4 @@
   <cpu type='tcg' name='core2duo'/>
   <cpu type='tcg' name='phenom'/>
   <cpu type='tcg' name='qemu64'/>
-  <machine name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes'/>
-  <machine name='pc-q35-1.4' maxCpus='255'/>
-  <machine name='pc-q35-1.5' alias='q35' maxCpus='255'/>
-  <machine name='isapc' maxCpus='1'/>
-  <machine name='pc-0.10' maxCpus='255'/>
-  <machine name='pc-0.11' maxCpus='255'/>
-  <machine name='pc-0.12' maxCpus='255'/>
-  <machine name='pc-0.13' maxCpus='255'/>
-  <machine name='pc-0.14' maxCpus='255'/>
-  <machine name='pc-0.15' maxCpus='255'/>
-  <machine name='pc-1.0' maxCpus='255'/>
-  <machine name='pc-1.1' maxCpus='255'/>
-  <machine name='pc-1.2' maxCpus='255'/>
-  <machine name='pc-1.3' maxCpus='255'/>
-  <machine name='pc-i440fx-1.4' maxCpus='255'/>
 </qemuCaps>
...